Skip to content

Commit ad703f8

Browse files
committed
add deployinfo adaptor [email protected]
1 parent ecd5140 commit ad703f8

File tree

3 files changed

+38
-8
lines changed

3 files changed

+38
-8
lines changed

core/app-error.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var NotFoundError = function(msg) {
2020
util.inherits(NotFoundError, AppError)
2121

2222
var UnauthorizedError = function(msg) {
23-
NotFoundError.super_.call(this, msg, this.constructor)
23+
UnauthorizedError.super_.call(this, msg, this.constructor)
2424
this.message = msg || `401 Unauthorized`;
2525
this.name = 'UnauthorizedError'
2626
this.status = 401

core/services/deployments.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,22 @@ proto.listDeloyments = function (appId) {
164164
return [];
165165
}
166166
return Promise.map(deploymentsInfos, (v) => {
167-
return Promise.props({
168-
createdTime: parseInt(moment(v.created_at).format('x')),
169-
id: `${v.id}`,
170-
key: v.deployment_key,
171-
name: v.name,
172-
package: self.findDeloymentsPackages([v.last_deployment_version_id]).then(self.formatPackage)
173-
});
167+
return self.listDeloyment(v);
174168
})
175169
});
176170
};
177171

172+
proto.listDeloyment = function (deploymentInfo) {
173+
const self = this;
174+
return Promise.props({
175+
createdTime: parseInt(moment(deploymentInfo.created_at).format('x')),
176+
id: `${deploymentInfo.id}`,
177+
key: deploymentInfo.deployment_key,
178+
name: deploymentInfo.name,
179+
package: self.findDeloymentsPackages([deploymentInfo.last_deployment_version_id]).then(self.formatPackage)
180+
});
181+
}
182+
178183
proto.getDeploymentHistory = function (deploymentId) {
179184
var self = this;
180185
return models.DeploymentsHistory.findAll({where: {deployment_id: deploymentId}, order: [['id','desc']], limit: 15})

routes/apps.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,31 @@ router.get('/:appName/deployments',
5858
});
5959
});
6060

61+
router.get('/:appName/deployments/:deploymentName',
62+
middleware.checkToken, (req, res, next) => {
63+
var uid = req.users.id;
64+
var appName = _.trim(req.params.appName);
65+
var deploymentName = _.trim(req.params.deploymentName);
66+
var deployments = new Deployments();
67+
accountManager.collaboratorCan(uid, appName)
68+
.then((col) => {
69+
return deployments.findDeloymentByName(deploymentName, col.appid)
70+
})
71+
.then((deploymentInfo) => {
72+
if (_.isEmpty(deploymentInfo)) {
73+
throw new AppError.AppError("does not find the deployment");
74+
}
75+
res.send({deployment: deployments.listDeloyment(deploymentInfo)});
76+
})
77+
.catch((e) => {
78+
if (e instanceof AppError.AppError) {
79+
res.status(406).send(e.message);
80+
} else {
81+
next(e);
82+
}
83+
});
84+
});
85+
6186
router.post('/:appName/deployments',
6287
middleware.checkToken, (req, res, next) => {
6388
var uid = req.users.id;

0 commit comments

Comments
 (0)