fix : conflict fix

Kernel360 · Feb 11, 2025 · ca0b025 · ca0b025
1 parent d44cb07
commit ca0b025
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Common/src/main/java/com/seveneleven/entity/project/ProjectTag.java b/Common/src/main/java/com/seveneleven/entity/project/ProjectTag.java
@@ -2,6 +2,7 @@
 
 import com.seveneleven.entity.global.BaseEntity;
 import com.seveneleven.entity.global.YesNo;
+import com.seveneleven.entity.global.converter.YesNoConverter;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -23,13 +24,13 @@ public class ProjectTag extends BaseEntity {
 
     private String tag;
 
-    @Enumerated(EnumType.STRING)
-    private YesNo IsActive;
+    @Convert(converter = YesNoConverter.class)
+    private YesNo isActive;
 
     public ProjectTag(Project project, String tag) {
         this.project = project;
         this.tag = tag;
-        IsActive = YesNo.YES;
+        isActive = YesNo.YES;
     }
 
     public static ProjectTag create(Project project, String tag) {

diff --git a/Main/src/main/java/com/seveneleven/project/service/ProjectServiceImpl.java b/Main/src/main/java/com/seveneleven/project/service/ProjectServiceImpl.java
@@ -44,7 +44,7 @@ public GetProjectDetail.Response getProjectDetail(Long projectId) {
 
     @Override
     public PatchProjectCurrentStep.Response patchProjectCurrentStep(Long projectId, Long stepId) {
-        Project project = getProject(projectId);
+        Project project = projectReader.read(projectId);
         ProjectStep projectStep = stepReader.read(stepId);
 
         return PatchProjectCurrentStep.Response.toDto(