Skip to content

Commit f09c3ec

Browse files
committed
fix deployment search bug
1 parent 0475b9d commit f09c3ec

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

app-packer.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ class AppPacker {
2424
version: crypto.createHash('sha256').update(JSON.stringify(Object.keys(fileHashes).map(k => `${k}:${fileHashes[k]}`, []).sort())).digest('hex')
2525
};
2626
resolve(manifest)
27-
})
27+
});
28+
29+
walker.on('error', err => reject(err))
2830
})
2931
}
3032

models/deployment.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class Deployment extends AV.Object {
77
static byAppNameAndUserId(name, userId) {
88
const innerQuery = new AV.Query(App);
99
innerQuery.equalTo('name', name);
10-
innerQuery.equalTo('user', User.createWithoutData(userId));
10+
innerQuery.matchesQuery('user', AV.Object.createWithoutData('User', userId));
1111
const query = new AV.Query(Deployment);
1212
query.matchesQuery('app', innerQuery);
1313

@@ -17,7 +17,7 @@ class Deployment extends AV.Object {
1717
static findBy(appName, deploymentName, userId) {
1818
const innerQuery = new AV.Query(App);
1919
innerQuery.equalTo('name', appName);
20-
innerQuery.equalTo('user', User.createWithoutData(userId));
20+
innerQuery.matchesQuery('user', AV.Object.createWithoutData('User', userId));
2121
const query = new AV.Query(Deployment);
2222
query.matchesQuery('app', innerQuery);
2323
query.equalTo('name', deploymentName);

routes/deployments.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ router.get('/', function (req, res, next) {
4343
const unzipPackage = (zipFilePath, zipName) => new Promise((resolve, reject) => {
4444
const localPackagePath = `${os.tmpdir()}/${zipName}.unzipped`;
4545
fs.createReadStream(zipFilePath).pipe(unzip.Extract({path: localPackagePath}))
46-
.on('close', () => resolve({baseDir: localPackagePath, originalFilePath: zipFilePath, originalFileName: zipName}));
46+
.on('close', () => resolve({baseDir: localPackagePath, originalFilePath: zipFilePath, originalFileName: zipName}))
47+
.on('error', reject);
4748
});
4849

4950
const generateManifest = options => new Promise((resolve, reject) => {
@@ -67,7 +68,7 @@ const deploymentFullPackage = (packageInfo, deployment, user) => options => new
6768
resolve(Object.assign({}, options, {packageInfo, fullPackage: savedFullPackage}))
6869
).catch(err => console.log('error: ', err));
6970
}).catch(err => {
70-
throw err;
71+
reject(err);
7172
})
7273
});
7374

@@ -78,11 +79,15 @@ router.post('/:deploymentName/release', multipartMiddleware, function (req, res,
7879
unzipPackage(req.files.package.path, req.files.package.name)
7980
.then(generateManifest)
8081
.then(deploymentFullPackage(JSON.parse(req.body.packageInfo), deployments[0], AV.Object.createWithoutData('User', req.user.id)))
81-
.then(result => res.json({ok: true}))
82+
.then(result => res.json({ok: true})).catch(err => {
83+
throw err
84+
})
8285
} else {
8386
res.json({error: 'no deployment found'})
8487
}
85-
});
88+
}).catch(err => {
89+
throw err;
90+
});
8691
});
8792

8893
router.get('/:depoymentName/metrics', function (req, res, next) {

0 commit comments

Comments
 (0)