chore: merge develop

ok-su-su · Jul 8, 2024 · 5339dcc · 5339dcc
2 parents 8c5b8ce + 9dbb853
commit 5339dcc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/api/src/main/kotlin/com/oksusu/susu/api/envelope/application/EnvelopeFacade.kt b/api/src/main/kotlin/com/oksusu/susu/api/envelope/application/EnvelopeFacade.kt
@@ -118,7 +118,8 @@ class EnvelopeFacade(
                 envelope = createdEnvelope,
                 friend = friend,
                 friendRelationship = friendRelationship,
-                relationship = relationship
+                relationship = relationship,
+                category = CategoryWithCustomModel.of(category, customCategory)
             )
         }
     }
@@ -168,7 +169,8 @@ class EnvelopeFacade(
             envelope = updatedEnvelope,
             friend = friend,
             friendRelationship = friendRelationship,
-            relationship = relationship
+            relationship = relationship,
+            category = CategoryWithCustomModel.of(category, customCategory)
         )
     }
 

diff --git a/...ain/kotlin/com/oksusu/susu/api/envelope/model/response/CreateAndUpdateEnvelopeResponse.kt b/...ain/kotlin/com/oksusu/susu/api/envelope/model/response/CreateAndUpdateEnvelopeResponse.kt
@@ -1,5 +1,6 @@
 package com.oksusu.susu.api.envelope.model.response
 
+import com.oksusu.susu.api.category.model.CategoryWithCustomModel
 import com.oksusu.susu.api.envelope.model.EnvelopeModel
 import com.oksusu.susu.api.friend.model.FriendModel
 import com.oksusu.susu.api.friend.model.FriendRelationshipModel
@@ -17,19 +18,23 @@ data class CreateAndUpdateEnvelopeResponse(
     val friendRelationship: FriendRelationshipModel,
     /** 관계 정보 */
     val relationship: RelationshipModel,
+    /** 카테고리 정보 */
+    val category: CategoryWithCustomModel,
 ) {
     companion object {
         fun of(
             envelope: Envelope,
             friend: Friend,
             friendRelationship: FriendRelationship,
             relationship: RelationshipModel,
+            category: CategoryWithCustomModel,
         ): CreateAndUpdateEnvelopeResponse {
             return CreateAndUpdateEnvelopeResponse(
                 envelope = EnvelopeModel.from(envelope),
                 friend = FriendModel.from(friend),
                 friendRelationship = FriendRelationshipModel.from(friendRelationship),
-                relationship = relationship
+                relationship = relationship,
+                category = category
             )
         }
     }

diff --git a/scripts/DDL.sql → sql/DDL.sql b/scripts/DDL.sql → sql/DDL.sql
diff --git a/scripts/DML.sql → sql/DML.sql b/scripts/DML.sql → sql/DML.sql