Merge pull request #55 from ZhouYixun/dev

修复删除用例时出错的Bug
SonicCloudOrg · Oct 22, 2021 · 6cd5b6c · 6cd5b6c
2 parents d9d6098 + fa9e94a
commit 6cd5b6c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     ports:
       - "8094:8094"
   sonic-server-controller:
-    image: "zhouyixun/sonic-server-controller:v1.0.0"
+    image: "zhouyixun/sonic-server-controller:v1.0.1"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/

diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-controller</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <!-- 依赖列表   -->

diff --git a/sonic-server-controller/src/main/java/com/sonic/controller/models/TestCases.java b/sonic-server-controller/src/main/java/com/sonic/controller/models/TestCases.java
@@ -12,6 +12,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
 import java.util.Date;
+import java.util.List;
 import java.util.Set;
 
 @Entity
@@ -48,10 +49,10 @@ public class TestCases {
     @LastModifiedDate
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     Date editTime;
-    @ManyToMany(mappedBy = "testCases")
+    @ManyToMany(mappedBy = "testCases", fetch = FetchType.EAGER)
     @JsonIgnore
     @JSONField(serialize = false)
-    Set<TestSuites> testSuites;
+    List<TestSuites> testSuites;
 
     public TestCases() {
     }
@@ -128,11 +129,11 @@ public void setEditTime(Date editTime) {
         this.editTime = editTime;
     }
 
-    public Set<TestSuites> getTestSuites() {
+    public List<TestSuites> getTestSuites() {
         return testSuites;
     }
 
-    public void setTestSuites(Set<TestSuites> testSuites) {
+    public void setTestSuites(List<TestSuites> testSuites) {
         this.testSuites = testSuites;
     }
 

diff --git a/...ver-controller/src/main/java/com/sonic/controller/services/impl/TestCasesServiceImpl.java b/...ver-controller/src/main/java/com/sonic/controller/services/impl/TestCasesServiceImpl.java
@@ -67,7 +67,7 @@ public List<TestCases> findAll(int projectId, int platform) {
     public boolean delete(int id) {
         if (testCasesRepository.existsById(id)) {
             TestCases testCases = testCasesRepository.findById(id).get();
-            Set<TestSuites> testSuitesSet = testCases.getTestSuites();
+            List<TestSuites> testSuitesSet = testCases.getTestSuites();
             for (TestSuites testSuites : testSuitesSet) {
                 testSuites.getTestCases().remove(testCases);
             }