Merge branch 'dev' into prod

team-diverse · Sep 8, 2024 · b216422 · b216422
2 parents 42e5fa5 + cb9bb0c
commit b216422
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 38 deletions.
diff --git a/src/main/java/com/dife/api/model/Chat.java b/src/main/java/com/dife/api/model/Chat.java
@@ -1,6 +1,7 @@
 package com.dife.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
@@ -16,6 +17,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
+@JsonIgnoreProperties(ignoreUnknown = true)
 @Table(name = "chat")
 public class Chat implements TranslateTable {
 

diff --git a/src/main/java/com/dife/api/service/MemberService.java b/src/main/java/com/dife/api/service/MemberService.java
@@ -115,13 +115,19 @@ public MemberResponseDto update(
 
 		if (password != null) member.setPassword(passwordEncoder.encode(password));
 
-		boolean notAddVerificationFile =
-				(verificationFile == null || verificationFile.isEmpty())
-						&& member.getUsername().equals("Diver");
-		if (notAddVerificationFile) throw new MemberNotAddVerificationException();
-
-		boolean hasToUploadVerificationFile = verificationFile != null && !verificationFile.isEmpty();
-		if (hasToUploadVerificationFile) updateFile(member, verificationFile, true);
+		//		 TODO: UNCOMMENT THIS AFTER BETA
+		//		boolean notAddVerificationFile =
+		//				(verificationFile == null || verificationFile.isEmpty())
+		//						&& member.getUsername().equals("Diver");
+		//		if (notAddVerificationFile) {
+		//			throw new MemberNotAddVerificationException();
+		//		}
+		//		boolean hasToUploadVerificationFile = verificationFile != null &&
+		// !verificationFile.isEmpty();
+		//		if (hasToUploadVerificationFile) updateFile(member, verificationFile, true);
+
+		//		 TODO: DELETE THIS AFTER BETA
+		member.setIsVerified(true);
 
 		boolean hasToUploadProfile = profileImg != null && !profileImg.isEmpty();
 		if (hasToUploadProfile) updateFile(member, profileImg, false);

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -8,7 +8,7 @@ spring:
 
   sql:
     init:
-      mode: always
+      mode: never
       data-locations: classpath:import.sql
 
   aws:

diff --git a/src/main/resources/db/changelog/v1.0/v1.0.2.xml b/src/main/resources/db/changelog/v1.0/v1.0.2.xml
@@ -14,4 +14,21 @@
                                  constraintName="FK_REPORT_ON_CHATROOM" referencedColumnNames="id"
                                  referencedTableName="chatroom"/>
     </changeSet>
+
+    <changeSet id="add-type-column-from-member-20240904-2350" author="suyeon">
+        <addColumn tableName="member">
+            <column name="setting_language" type="varchar(10)"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="add-type-column-from-member-20240904-2355" author="suyeon">
+        <addColumn tableName="member">
+            <column name="translation_count" type="INT"/>
+        </addColumn>
+    </changeSet>
+    <changeSet id="add-type-column-from-member-20240905-1900" author="suyeon">
+        <addColumn tableName="member">
+            <column name="verify_code" type="varchar(10)"/>
+        </addColumn>
+    </changeSet>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/v1.0/v1.0.3.xml b/src/main/resources/db/changelog/v1.0/v1.0.3.xml
diff --git a/src/main/resources/db/changelog/v1.0/v1.0.4.xml b/src/main/resources/db/changelog/v1.0/v1.0.4.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ spring: @@
       sql:
         init:
-          mode: always
+          mode: never
           data-locations: classpath:import.sql
       aws:
@@ Expand Down @@