Skip to content

Commit 0fe0b10

Browse files
authored
Remove effectiveFrom field from PayrollResponse and WorkPolicyResponse (#18)
1 parent b254bcd commit 0fe0b10

File tree

7 files changed

+2
-10
lines changed

7 files changed

+2
-10
lines changed

src/main/kotlin/com/moa/service/OnboardingStatusService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class OnboardingStatusService(
3636
.findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today)
3737
?.let {
3838
PayrollResponse(
39-
effectiveFrom = it.effectiveFrom,
4039
salaryInputType = it.salaryInputType,
4140
salaryAmount = it.salaryAmount,
4241
)
@@ -48,7 +47,6 @@ class OnboardingStatusService(
4847
?.takeIf { it.workdays.isNotEmpty() }
4948
?.let {
5049
WorkPolicyResponse(
51-
effectiveFrom = it.effectiveFrom,
5250
workdays = it.workdays.sorted(),
5351
clockInTime = it.clockInTime,
5452
clockOutTime = it.clockOutTime,

src/main/kotlin/com/moa/service/PayrollService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class PayrollService(
3333
)
3434

3535
return PayrollResponse(
36-
effectiveFrom = saved.effectiveFrom,
3736
salaryInputType = saved.salaryInputType,
3837
salaryAmount = saved.salaryAmount,
3938
)
@@ -45,7 +44,6 @@ class PayrollService(
4544
.findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today)
4645
?: throw NotFoundException()
4746
return PayrollResponse(
48-
effectiveFrom = version.effectiveFrom,
4947
salaryInputType = version.salaryInputType,
5048
salaryAmount = version.salaryAmount,
5149
)

src/main/kotlin/com/moa/service/WorkPolicyService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class WorkPolicyService(
3333
versionRepository.save(version)
3434

3535
return WorkPolicyResponse(
36-
effectiveFrom = version.effectiveFrom,
3736
workdays = req.workdays.sortedBy { it.dayOfWeek.value },
3837
clockInTime = req.clockInTime,
3938
clockOutTime = req.clockOutTime,
@@ -47,7 +46,6 @@ class WorkPolicyService(
4746
?: throw NotFoundException()
4847

4948
return WorkPolicyResponse(
50-
effectiveFrom = version.effectiveFrom,
5149
workdays = version.workdays.sortedBy { it.dayOfWeek.value },
5250
clockInTime = version.clockInTime,
5351
clockOutTime = version.clockOutTime,

src/main/kotlin/com/moa/service/dto/PayrollResponse.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.moa.entity.SalaryInputType
44
import java.time.LocalDate
55

66
data class PayrollResponse(
7-
val effectiveFrom: LocalDate,
87
val salaryInputType: SalaryInputType,
98
val salaryAmount: Long,
109
)

src/main/kotlin/com/moa/service/dto/WorkPolicyResponse.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import java.time.LocalDate
66
import java.time.LocalTime
77

88
data class WorkPolicyResponse(
9-
val effectiveFrom: LocalDate,
109
val workdays: List<Workday>,
1110
@JsonFormat(pattern = "HH:mm")
1211
val clockInTime: LocalTime,

src/main/resources/application-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
spring:
22
jpa:
33
hibernate:
4-
ddl-auto: update
4+
ddl-auto: create
55
properties:
66
hibernate:
77
format_sql: true

src/main/resources/application-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spring:
88
jpa:
99
database-platform: org.hibernate.dialect.MySQLDialect
1010
hibernate:
11-
ddl-auto: update
11+
ddl-auto: create # TODO. validates로 변경
1212
properties:
1313
hibernate:
1414
format_sql: true

0 commit comments

Comments
 (0)