1
0
370774330@qq.com 5 лет назад
Родитель
Сommit
fd95f80532

+ 3 - 2
web/src/main/java/seecoder/devcloud/web/dao/project/CommitMapper.java

@@ -16,14 +16,15 @@ import java.util.List;
 public interface CommitMapper {
 
     @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
+    @Options(useGeneratedKeys = true, keyProperty = "param1.id", keyColumn = "id")
     int insert(CommitPO commitPO, String... ignoredCols);
 
     @UpdateProvider(type= GeneralInsertUpdateSqlProvider.class, method="updateById")
     int update(CommitPO commitPO);
 
-    @Select("select * from commit where project_id = #{projectId} and type = #{type}")
+    @Select("select * from commit where project_id = #{projectId} and related_type = #{type}")
     List<CommitPO> selectByProjectIdAndType(@Param("projectId") int projectId,@Param("type") CommitRelatedType type);
 
-    @Select("select * from commit where id = #{id")
+    @Select("select count(*) from commit where id = #{id}")
     int isExist(String id);
 }

+ 6 - 0
web/src/main/java/seecoder/devcloud/web/model/po/project/CommitPO.java

@@ -1,6 +1,9 @@
 package seecoder.devcloud.web.model.po.project;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import seecoder.devcloud.web.model.enums.CommitRelatedType;
 import seecoder.devcloud.web.model.vo.GitWebHookVO;
@@ -11,6 +14,9 @@ import seecoder.devcloud.web.model.vo.GitWebHookVO;
  * @description:
  */
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class CommitPO {
 
     private String id;

+ 19 - 0
web/src/main/resources/sql/bug_list.sql

@@ -0,0 +1,19 @@
+create table if not exists devcloud.bug_list
+(
+    id                 int auto_increment
+        primary key,
+    title              varchar(31)                         null,
+    description        text                                null,
+    expected_time_cost mediumtext                          null,
+    start_time         timestamp default CURRENT_TIMESTAMP not null,
+    end_time           timestamp                           null,
+    priority           varchar(10)                         null,
+    state              varchar(10)                         null,
+    project_id         int                                 null,
+    processor_id       int                                 null,
+    constraint bug_list_project_id_fk
+        foreign key (project_id) references devcloud.project (id),
+    constraint bug_list_user_id_fk
+        foreign key (processor_id) references devcloud.user (id)
+);
+

+ 15 - 0
web/src/main/resources/sql/commit.sql

@@ -0,0 +1,15 @@
+create table if not exists devcloud.commit
+(
+    id              varchar(127) not null
+        primary key,
+    message         text         null,
+    title           text         null,
+    timestamp       varchar(31)  null,
+    gitlab_username varchar(31)  null,
+    related_id      int          null,
+    project_id      int          null,
+    related_type    varchar(11)  null,
+    constraint commit_project_id_fk
+        foreign key (project_id) references devcloud.project (id)
+);
+

+ 70 - 0
web/src/test/java/seecoder/devcloud/web/dao/project/CommitMapperTest.java

@@ -0,0 +1,70 @@
+package seecoder.devcloud.web.dao.project;
+
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import seecoder.devcloud.web.model.enums.CommitRelatedType;
+import seecoder.devcloud.web.model.po.project.CommitPO;
+
+/**
+ * @author PuHong Weng
+ * @date 2021/3/24
+ * @description:
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@MapperScan(basePackages = {"seecoder.devcloud.web.dao"})
+class CommitMapperTest {
+
+    private final CommitMapper commitMapper;
+
+    @Autowired
+    CommitMapperTest(CommitMapper commitMapper) {
+        this.commitMapper = commitMapper;
+    }
+
+
+    @Test
+    void insert() {
+        CommitPO commitPO = CommitPO.builder()
+                .id("esdadafs")
+                .gitlabUsername("cool")
+                .message("fefefefeat")
+                .title("feat: nononono")
+                .projectId(2)
+                .relatedId(3)
+                .relatedType(CommitRelatedType.BUG_ID)
+                .timestamp("2012-01-03T23:36:29+02:00")
+                .build();
+        commitMapper.insert(commitPO);
+    }
+
+    @Test
+    void update() {
+        CommitPO commitPO = CommitPO.builder()
+                .id("esdadafs")
+                .gitlabUsername("not cool")
+                .build();
+        commitMapper.update(commitPO);
+    }
+
+    @Test
+    void selectByProjectIdAndType() {
+        System.out.println(commitMapper.selectByProjectIdAndType(2,CommitRelatedType.BUG_ID));
+
+    }
+
+    @Test
+    void isExist() {
+        System.out.println(commitMapper.isExist("esdadafs"));
+        System.out.println(commitMapper.isExist("12"));
+    }
+
+    @Test
+    void timestamp() {
+        String t = "2012-01-03T23:36:29+02:00";
+    }
+}