Skip to content
This repository was archived by the owner on Jul 7, 2025. It is now read-only.

Commit 547137c

Browse files
authored
Merge pull request #122 from ASAP-Lettering/ASAP-420
ASAP-420 모든 도메인에 createdAt, updatedAt 추가
2 parents 255ba16 + 531574c commit 547137c

File tree

50 files changed

+312
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+312
-66
lines changed

Application-Module/src/main/kotlin/com/asap/application/space/port/out/SpaceManagementPort.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ interface SpaceManagementPort {
2626

2727
fun deleteBy(space: Space)
2828

29+
fun deleteAll()
30+
2931
fun countByUserId(userId: DomainId): Long
3032
}

Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceCommandService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class SpaceCommandService(
2626
override fun create(command: CreateSpaceUsecase.Command) {
2727
val userId = DomainId(command.userId)
2828
Space.create(
29+
id = DomainId.generate(),
2930
userId = userId,
3031
name = command.spaceName,
3132
templateType = command.templateType,

Application-Module/src/main/kotlin/com/asap/application/user/port/out/UserManagementPort.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ interface UserManagementPort {
1111

1212
@Throws(UserException.UserNotFoundException::class)
1313
fun getUserNotNull(userId: DomainId): User
14+
15+
fun findById(userId: DomainId): User?
1416
}

Application-Module/src/main/kotlin/com/asap/application/user/service/SocialLoginService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SocialLoginService(
2525
userManagementPort.getUser(userAuth.userId)?.let { user ->
2626
val accessToken = userTokenConvertPort.generateAccessToken(user)
2727
val refreshToken = userTokenConvertPort.generateRefreshToken(user)
28-
userTokenManagementPort.saveUserToken(UserToken(token = refreshToken, userId = user.id))
28+
userTokenManagementPort.saveUserToken(UserToken.create(token = refreshToken, userId = user.id))
2929
SocialLoginUsecase.Success(accessToken, refreshToken, user.isProcessedOnboarding())
3030
} ?: run {
3131
throw DefaultException.InvalidStateException("사용자 인증정보만 존재합니다. - ${userAuth.userId}")
@@ -39,7 +39,7 @@ class SocialLoginService(
3939
profileImage = authInfo.profileImage,
4040
email = authInfo.email,
4141
)
42-
userTokenManagementPort.saveUserToken(UserToken(token = registerToken))
42+
userTokenManagementPort.saveUserToken(UserToken.create(token = registerToken))
4343
SocialLoginUsecase.NonRegistered(registerToken)
4444
}
4545
}

Application-Module/src/main/kotlin/com/asap/application/user/service/UserCommandService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class UserCommandService(
4848
email = userClaims.email,
4949
)
5050
val userAuth =
51-
UserAuth(
51+
UserAuth.create(
5252
userId = registerUser.id,
5353
socialId = userClaims.socialId,
5454
socialLoginProvider = userClaims.socialLoginProvider,
@@ -60,7 +60,7 @@ class UserCommandService(
6060
val accessToken = userTokenConvertPort.generateAccessToken(registerUser)
6161
val refreshToken = userTokenConvertPort.generateRefreshToken(registerUser)
6262

63-
userTokenManagementPort.saveUserToken(UserToken(token = refreshToken, userId = registerUser.id))
63+
userTokenManagementPort.saveUserToken(UserToken.create(token = refreshToken, userId = registerUser.id))
6464

6565
return RegisterUserUsecase.Response(accessToken, refreshToken)
6666
}

Application-Module/src/main/kotlin/com/asap/application/user/service/UserTokenCommandService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class UserTokenCommandService(
3939

4040
val accessToken = userTokenConvertPort.generateAccessToken(user)
4141
val refreshToken = userTokenConvertPort.generateRefreshToken(user)
42-
userTokenManagementPort.saveUserToken(UserToken(userId = user.id, token = refreshToken))
42+
userTokenManagementPort.saveUserToken(UserToken.create(userId = user.id, token = refreshToken))
4343
return ReissueTokenUsecase.Response(
4444
accessToken = accessToken,
4545
refreshToken = refreshToken,

Application-Module/src/test/kotlin/com/asap/application/user/service/SocialLoginServiceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SocialLoginServiceTest :
3838
var command = SocialLoginUsecase.Command(SocialLoginProvider.KAKAO.name, "registered")
3939
val authInfo = AuthInfo(SocialLoginProvider.KAKAO, "socialId", "name", "email", "profileImage")
4040
val getUserAuth =
41-
UserAuth(
41+
UserAuth.create(
4242
userId = DomainId.generate(),
4343
socialId = "socialId",
4444
socialLoginProvider = SocialLoginProvider.KAKAO,

Application-Module/src/testFixtures/kotlin/com/asap/application/letter/LetterMockManager.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ class LetterMockManager(
129129
),
130130
spaceId = DomainId(spaceId),
131131
receiveDate = LocalDate.now(),
132+
132133
)
133134
spaceLetterManagementPort.save(
134135
spaceLetter,

Application-Module/src/testFixtures/kotlin/com/asap/application/space/SpaceMockManager.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class SpaceMockManager(
1414
): Space {
1515
val space =
1616
Space.create(
17+
id = DomainId.generate(),
1718
userId = DomainId(userId),
1819
name = "test",
1920
templateType = 0,
@@ -28,4 +29,8 @@ class SpaceMockManager(
2829
}
2930
}
3031
}
32+
33+
fun clear() {
34+
spaceManagementPort.deleteAll()
35+
}
3136
}

Application-Module/src/testFixtures/kotlin/com/asap/application/user/UserMockManager.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.asap.domain.user.entity.UserAuth
88
import com.asap.domain.user.enums.SocialLoginProvider
99
import com.asap.domain.user.vo.UserPermission
1010
import java.time.LocalDate
11+
import java.time.LocalDateTime
1112

1213
class UserMockManager(
1314
private val userManagementPort: UserManagementPort,
@@ -33,7 +34,9 @@ class UserMockManager(
3334
permission = UserPermission(true, true, true),
3435
birthday = LocalDate.now(),
3536
email = "email",
36-
onboardingAt = null,
37+
onboardingAt = LocalDateTime.now(),
38+
createdAt = LocalDateTime.now(),
39+
updatedAt = LocalDateTime.now()
3740
),
3841
)
3942

@@ -43,7 +46,7 @@ class UserMockManager(
4346
provider: String = "KAKAO",
4447
) {
4548
userAuthManagementPort.saveUserAuth(
46-
UserAuth(
49+
UserAuth.create(
4750
userId = DomainId(userId),
4851
socialId = socialId,
4952
socialLoginProvider = SocialLoginProvider.parse(provider),

0 commit comments

Comments
 (0)