Revert "[feat/#99] Add: multiple answers"

This reverts commit 286e008.
MoaRoom · Sep 18, 2023 · 527ff0f · 527ff0f
1 parent 286e008
commit 527ff0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/sookmyung/moaroom/Dto/requestAssignmentDto.java b/src/main/java/sookmyung/moaroom/Dto/requestAssignmentDto.java
@@ -3,8 +3,8 @@
 import com.sun.istack.NotNull;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.UUID;
 
 @Data
@@ -19,7 +19,7 @@ public class requestAssignmentDto {
     private LocalDateTime due_date;
     private String description;
     @NotNull
-    private ArrayList<String> answer;
+    private String answer;
     @NotNull
     private Double runtime;
 }
diff --git a/src/main/java/sookmyung/moaroom/Model/Assignment.java b/src/main/java/sookmyung/moaroom/Model/Assignment.java
@@ -4,14 +4,12 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
-import org.hibernate.annotations.Type;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.UUID;
 
 @Entity
@@ -38,11 +36,9 @@ public class Assignment {
     @Column(name = "description")
     private String description;
 
-
-    @Type(type = "list_str")
     @Column(name = "answer")
     @NotNull
-    private ArrayList<String> answer;
+    private String answer;
 
     @Column(name = "runtime")
     @NotNull

diff --git a/src/main/java/sookmyung/moaroom/Service/StepService.java b/src/main/java/sookmyung/moaroom/Service/StepService.java
@@ -92,7 +92,7 @@ public void autoScoring(String id, requestAutoScoreDto data){
 
         // 데이터 안에 있는 답과 런타임과 비교
         int score = 0;
-        if(assignment.getAnswer().contains(data.getAnswer()) && assignment.getRuntime() >= data.getRuntime()){
+        if(assignment.getAnswer().equals(data.getAnswer()) && assignment.getRuntime() >= data.getRuntime()){
             score = 100;
         }