Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

// data
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
Expand Down
4 changes: 0 additions & 4 deletions src/main/kotlin/com/moa/service/dto/HomeResponse.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@ package com.moa.service.dto

import com.fasterxml.jackson.annotation.JsonFormat
import com.moa.entity.DailyWorkScheduleType
import io.swagger.v3.oas.annotations.media.Schema
import java.time.LocalTime

data class HomeResponse(
@field:Schema(nullable = true)
val workplace: String?,
val workedEarnings: Int,
val standardSalary: Int,
val dailyPay: Int,
val type: DailyWorkScheduleType,
@field:Schema(nullable = true)
@field:JsonFormat(pattern = "HH:mm")
val clockInTime: LocalTime?,
@field:Schema(nullable = true)
@field:JsonFormat(pattern = "HH:mm")
val clockOutTime: LocalTime?,
)
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
package com.moa.service.dto

import io.swagger.v3.oas.annotations.media.Schema

data class OnboardingStatusResponse(
@field:Schema(nullable = true)
val profile: ProfileResponse?,
@field:Schema(nullable = true)
val payroll: PayrollResponse?,
@field:Schema(nullable = true)
val workPolicy: WorkPolicyResponse?,
val hasRequiredTermsAgreed: Boolean,
)
3 changes: 0 additions & 3 deletions src/main/kotlin/com/moa/service/dto/PaydayUpdateRequest.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package com.moa.service.dto

import jakarta.validation.constraints.Max
import jakarta.validation.constraints.Min

data class PaydayUpdateRequest(
val paydayDay: Int,
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import java.time.LocalTime
data class WorkPolicyUpsertRequest(
@field:NotEmpty
val workdays: Set<Workday>,

val clockInTime: LocalTime,
val clockOutTime: LocalTime,
)
3 changes: 0 additions & 3 deletions src/main/kotlin/com/moa/service/dto/WorkdayResponse.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@ package com.moa.service.dto

import com.fasterxml.jackson.annotation.JsonFormat
import com.moa.entity.DailyWorkScheduleType
import io.swagger.v3.oas.annotations.media.Schema
import java.time.LocalDate
import java.time.LocalTime

data class WorkdayResponse(
val date: LocalDate,
val type: DailyWorkScheduleType,
val dailyPay: Int,
@field:Schema(nullable = true)
@field:JsonFormat(pattern = "HH:mm")
val clockInTime: LocalTime? = null,
@field:Schema(nullable = true)
@field:JsonFormat(pattern = "HH:mm")
val clockOutTime: LocalTime? = null,
)
Loading