@@ -116,13 +116,11 @@ export class StateService {
116
116
stateLockRequest : StateLockRequest ,
117
117
) : Promise < void > => {
118
118
const lockedBy = crypto . createHash ( 'sha256' ) . update ( identity . token , 'utf8' ) . digest ( 'base64' ) ;
119
+ const path = stateLockRequest . Path || '' ;
119
120
120
121
let stateLock = await this . stateLockModel . model . get (
121
122
StateLockModel . prefix ( 'pk' , identity . ownerId ) ,
122
- StateLockModel . prefix (
123
- 'sk' ,
124
- `${ identity . repoId } _${ identity . workspace } _${ stateLockRequest . Path } ` ,
125
- ) ,
123
+ StateLockModel . prefix ( 'sk' , `${ identity . repoId } _${ identity . workspace } _${ path } ` ) ,
126
124
) ;
127
125
128
126
if ( stateLock && stateLock . attrs . lockedBy !== lockedBy ) {
@@ -135,17 +133,14 @@ export class StateService {
135
133
// TODO Catch overwrite exception
136
134
stateLock = await this . stateLockModel . model . create ( {
137
135
pk : StateLockModel . prefix ( 'pk' , identity . ownerId ) ,
138
- sk : StateLockModel . prefix (
139
- 'sk' ,
140
- `${ identity . repoId } _${ identity . workspace } _${ stateLockRequest . Path } ` ,
141
- ) ,
136
+ sk : StateLockModel . prefix ( 'sk' , `${ identity . repoId } _${ identity . workspace } _${ path } ` ) ,
142
137
ownerId : identity . ownerId ,
143
138
owner : identity . owner ,
144
139
repoId : identity . repoId ,
145
140
repo : identity . repo ,
146
141
workspace : identity . workspace ,
147
142
id : stateLockRequest . ID ,
148
- path : stateLockRequest . Path ,
143
+ path,
149
144
lockedBy,
150
145
} ) ;
151
146
0 commit comments