feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
05b6c75a19
commit
2d4e667009
|
@ -113,15 +113,6 @@ module.exports = Self => {
|
||||||
message: vMessage,
|
message: vMessage,
|
||||||
serialNumber,
|
serialNumber,
|
||||||
};
|
};
|
||||||
|
|
||||||
const combinedResult2 = {
|
|
||||||
...getDataOperator.__data,
|
|
||||||
...getDataUser.__data,
|
|
||||||
...getVersion,
|
|
||||||
message: vMessage,
|
|
||||||
serialNumber,
|
|
||||||
};
|
|
||||||
console.log('conbinedResult2', combinedResult2);
|
|
||||||
return combinedResult;
|
return combinedResult;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@ const {models} = require('vn-loopback/server/server');
|
||||||
describe('Device handleUser()', () => {
|
describe('Device handleUser()', () => {
|
||||||
const ctx = {req: {accessToken: {userId: 9}}};
|
const ctx = {req: {accessToken: {userId: 9}}};
|
||||||
|
|
||||||
it('should return data from user', async() => {
|
fit('should return data from user', async() => {
|
||||||
const androidId = 'androidid11234567890';
|
const androidId = 'androidid11234567890';
|
||||||
const deviceId = 1;
|
const deviceId = 1;
|
||||||
const nameApp = 'warehouse';
|
const nameApp = 'warehouse';
|
||||||
|
|
Loading…
Reference in New Issue