From a479b6bf07e7630e93a8e5585b7e17a468df8263 Mon Sep 17 00:00:00 2001 From: yongckim Date: Sun, 21 Apr 2024 13:50:34 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20[STMT-254]=20=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=A5=BC=20=EC=B0=BE=EB=8A=94=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=84=20=EB=B3=84=EB=8F=84=EC=9D=98=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=88=98=ED=96=89=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../out/mapper/ActivityStatusConverter.java | 3 +-- .../activity/domain/model/ActivityStatus.java | 12 ++++++++++++ .../domain/model/ActivityStatusFactory.java | 17 ----------------- 3 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 src/main/java/com/stumeet/server/activity/domain/model/ActivityStatusFactory.java diff --git a/src/main/java/com/stumeet/server/activity/adapter/out/mapper/ActivityStatusConverter.java b/src/main/java/com/stumeet/server/activity/adapter/out/mapper/ActivityStatusConverter.java index ce641e67..0c032763 100644 --- a/src/main/java/com/stumeet/server/activity/adapter/out/mapper/ActivityStatusConverter.java +++ b/src/main/java/com/stumeet/server/activity/adapter/out/mapper/ActivityStatusConverter.java @@ -1,7 +1,6 @@ package com.stumeet.server.activity.adapter.out.mapper; import com.stumeet.server.activity.domain.model.ActivityStatus; -import com.stumeet.server.activity.domain.model.ActivityStatusFactory; import jakarta.persistence.AttributeConverter; public class ActivityStatusConverter implements AttributeConverter { @@ -12,6 +11,6 @@ public String convertToDatabaseColumn(ActivityStatus activityStatus) { @Override public ActivityStatus convertToEntityAttribute(String s) { - return ActivityStatusFactory.createByStatus(s); + return ActivityStatus.findByStatus(s); } } diff --git a/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatus.java b/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatus.java index 4d15a619..aada8bce 100644 --- a/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatus.java +++ b/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatus.java @@ -1,6 +1,18 @@ package com.stumeet.server.activity.domain.model; +import com.stumeet.server.activity.domain.exception.NotExistsActivityStatusException; + +import java.util.stream.Stream; + public interface ActivityStatus { String getStatus(); + static ActivityStatus findByStatus(String status) { + return Stream.of(MeetStatus.values(), DefaultStatus.values(), AssignmentStatus.values()) + .flatMap(Stream::of) + .filter(activityStatus -> activityStatus.getStatus().equals(status)) + .findAny() + .orElseThrow(() -> new NotExistsActivityStatusException(status)); + } + } diff --git a/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatusFactory.java b/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatusFactory.java deleted file mode 100644 index 7778c1a2..00000000 --- a/src/main/java/com/stumeet/server/activity/domain/model/ActivityStatusFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.stumeet.server.activity.domain.model; - -import com.stumeet.server.activity.domain.exception.NotExistsActivityStatusException; - -import java.util.stream.Stream; - -public class ActivityStatusFactory { - private ActivityStatusFactory() {} - - public static ActivityStatus createByStatus(String status) { - return Stream.of(MeetStatus.values(), DefaultStatus.values(), AssignmentStatus.values()) - .flatMap(Stream::of) - .filter(activityStatus -> activityStatus.getStatus().equals(status)) - .findAny() - .orElseThrow(() -> new NotExistsActivityStatusException(status)); - } -}