Fix remove the repo api.

Author: jaywcjlove

api-doc/repos.http

@@ -86,6 +86,16 @@ Content-Type: {{contentType}}
 
 GET {{baseUrl}}/{{username}}/{{repo2}}/raw/{{ref}}/{{filepath}}
 
+### Add Repo
+
+POST {{baseUrl}}/api/user/repos
+Content-Type: {{contentType}}
+
+{
+	"name": "test",
+	"description": ""
+}
+
 ### Remove Repo
 
 @repoTest = test

conf/sequelize.js

@@ -43,4 +43,4 @@ Models.namespaces.belongsTo(Models.users, { as: 'owner', foreignKey: 'owner_id'
 Models.projects.belongsTo(Models.namespaces, { as: 'namespace', foreignKey: 'namespace_id' });
 Models.projects.belongsTo(Models.users, { as: 'owner', foreignKey: 'creator_id' });
 
-module.exports = Models;
+module.exports = Models;

src/controller/git/repos/index.js

@@ -149,7 +149,6 @@ module.exports = {
       blob.free();
       tree.free();
     } catch (err) {
-      console.log('err:', err);
       ctx.response.status = err.statusCode || err.status || 500;
       ctx.body = { message: err.message, ...err }
     }
@@ -160,18 +159,17 @@ module.exports = {
     const { reposPath } = ctx.state.conf;
     repo = repo.replace(/.git$/, '');
     let transaction;
-
     try {
       // 托管事务
       transaction = await Models.sequelize.transaction();
       const namespaces = await Models.namespaces.findOne({ where: { name: owner }, transaction });
       if (!namespaces || !namespaces.id) ctx.throw(404, 'Owner does not exist!');
       const projects = await Models.projects.findOne({ where: { name: repo, namespace_id: namespaces.id }, transaction });
       if (!projects || !projects.id) ctx.throw(404, 'Repo does not exist!');
-      // await Models.projects.destroy({ where: { id: 1 }});
-      await Models.projects.destroy({ where: { namespace_id: namespaces.id, name: repo }, force: true, transaction });
       // 删除用户创建仓库的记录
       await Models.user_interacted_projects.destroy({ where: { project_id: projects.id, creator_id: namespaces.owner_id }, transaction });
+      // 删除仓库信息
+      await Models.projects.destroy({ where: { name: repo }, transaction });
       // remove repo
       await removeDir(PATH.join(reposPath, owner, `${repo}.git`));
       // transaction commit 事务提交
@@ -206,11 +204,9 @@ module.exports = {
         where: { id },
         include: [{ model: Models.users, as: 'owner', attributes: { exclude: ['password'] } }]
       });
-
       const { reposPath } = ctx.state.conf;
       const currentRepoPath = PATH.join(reposPath, projects.namespace.name, `${projects.name}.git`);
       const gitRepo = await Git.Repository.open(currentRepoPath);
-
       // 空仓库返回 README.md 说明内容
       let emptyRepoReadme = await readFile(PATH.join(__dirname, 'EmptyRepo.md'));
       if (gitRepo.isEmpty() === 1) {

src/model/namespaces.js

@@ -18,7 +18,8 @@ module.exports = function (sequelize, DataTypes) {
       type: DataTypes.STRING,
       allowNull: false,
       references: {
-        model: 'users'
+        model: 'users',
+        key: 'id'
       },
       comment: '创建者id'
     },
@@ -60,6 +61,7 @@ module.exports = function (sequelize, DataTypes) {
     comment: '项目表',
     updatedAt: 'updated_at',
     createdAt: 'created_at',
+    underscored: true,
     freezeTableName: true
   });
 };

src/model/projects.js

@@ -20,15 +20,17 @@ module.exports = function (sequelize, DataTypes) {
     namespace_id: {
       type: DataTypes.INTEGER,
       references: {
-        model: 'namespaces'
+        model: 'namespaces',
+        key: 'id'
       },
       allowNull: false,
       comment: '命名空间，每个项目创建一个单独的ID，组织或者用户'
     },
     creator_id: {
       type: DataTypes.INTEGER,
       references: {
-        model: 'users'
+        model: 'users',
+        key: 'id'
       },
       allowNull: false,
       comment: '创建的用户ID'

src/model/user_interacted_projects.js

@@ -17,7 +17,8 @@ module.exports = function (sequelize, DataTypes) {
       comment: '用户ID'
     },
   }, {
-    comment: '用户对应的项目隐射表'
+    comment: '用户对应的项目隐射表',
+    underscored: true,
   });
   // http://docs.sequelizejs.com/class/lib/model.js~Model.html#static-method-removeAttribute
   // Sequelize does not create id primary key

src/model/users.js

@@ -143,6 +143,9 @@ module.exports = function (sequelize, DataTypes) {
     comment: '用户表',
     updatedAt: 'updated_at',
     createdAt: 'created_at',
+    // 不允许逻辑删除
+    // paranoid: true,
+    underscored: true,
     freezeTableName: true
   });
 };