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 index c2ad1fa9..3cd432b8 100644 --- 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/api/src/main/kotlin/com/oksusu/susu/api/envelope/model/response/CreateAndUpdateEnvelopeResponse.kt b/api/src/main/kotlin/com/oksusu/susu/api/envelope/model/response/CreateAndUpdateEnvelopeResponse.kt index 2c683234..28778464 100644 --- a/api/src/main/kotlin/com/oksusu/susu/api/envelope/model/response/CreateAndUpdateEnvelopeResponse.kt +++ b/api/src/main/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,6 +18,8 @@ data class CreateAndUpdateEnvelopeResponse( val friendRelationship: FriendRelationshipModel, /** 관계 정보 */ val relationship: RelationshipModel, + /** 카테고리 정보 */ + val category: CategoryWithCustomModel, ) { companion object { fun of( @@ -24,12 +27,14 @@ data class CreateAndUpdateEnvelopeResponse( 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 b/sql/DDL.sql similarity index 100% rename from scripts/DDL.sql rename to sql/DDL.sql diff --git a/scripts/DML.sql b/sql/DML.sql similarity index 100% rename from scripts/DML.sql rename to sql/DML.sql