Merge pull request #19 from U-is-Ni-in-Korea/feature/json

feat: Update Entity

src/main/java/com/universe/uni/domain/MissionType.java

@@ -0,0 +1,16 @@
+package com.universe.uni.domain;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+public enum MissionType {
+	SAME,
+	DIFFERENCE;
+
+	public static MissionType findMissionTypeBy(String missionTypeName) {
+		return Arrays.stream(values())
+			.filter(missionType -> Objects.equals(missionType.name(), missionTypeName))
+			.findFirst()
+			.orElseThrow(() -> new IllegalArgumentException("Unsupported social login type: " + missionTypeName));
+	}
+}

src/main/java/com/universe/uni/domain/entity/MissionCategory.java

@@ -1,12 +1,17 @@
 package com.universe.uni.domain.entity;
 
 import javax.persistence.Column;
+import javax.persistence.Convert;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import com.universe.uni.domain.MissionType;
+import com.universe.uni.domain.entity.convertor.GameResultAttributeConverter;
+import com.universe.uni.domain.entity.convertor.MissionTypeAttributeConverter;
+
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
@@ -32,6 +37,13 @@ public class MissionCategory {
 	@Column(name = "image", nullable = false)
 	private String image;
 
-	@Column(name = "lever", nullable = false)
+	@Column(name = "level", nullable = false)
 	private int level;
+
+	@Column(name = "expected_time", nullable = false)
+	private int expectedTime;
+
+	@Column(name = "mission_type")
+	@Convert(converter = MissionTypeAttributeConverter.class)
+	private MissionType missionType;
 }

src/main/java/com/universe/uni/domain/entity/RoundGame.java

@@ -27,12 +27,16 @@ public class RoundGame {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "game_id", nullable = false)
-	private Game game;
+	private Game game; 
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "mission_category_id", nullable = false)
 	private MissionCategory missionCategory;
 
 	@Column(name = "enable", nullable = false)
 	private Boolean enable;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_game_history_id")
+	private UserGameHistory userGameHistory;
 }

src/main/java/com/universe/uni/domain/entity/RoundMission.java

@@ -48,4 +48,8 @@ public class RoundMission {
 	@Column(name = "result")
 	@Convert(converter = GameResultAttributeConverter.class)
 	private GameResult result;
+
+	@Column(name = "final_result")
+	@Convert(converter = GameResultAttributeConverter.class)
+	private GameResult finalResult;
 }

src/main/java/com/universe/uni/domain/entity/convertor/MissionTypeAttributeConverter.java

@@ -0,0 +1,19 @@
+package com.universe.uni.domain.entity.convertor;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+import com.universe.uni.domain.MissionType;
+
+@Converter
+public class MissionTypeAttributeConverter implements AttributeConverter<MissionType, String> {
+	@Override
+	public String convertToDatabaseColumn(MissionType attribute) {
+		return attribute.name();
+	}
+
+	@Override
+	public MissionType convertToEntityAttribute(String dbData) {
+		return MissionType.findMissionTypeBy(dbData);
+	}
+}