Skip to content

Commit beeb18c

Browse files
HuuuuneeHuuuunee
authored
Merge pull request #369 from GSM-MSG/feature/366-authentication-refac
어색한 네임들 다 수정
2 parents d9f0f0c + d359f11 commit beeb18c

14 files changed

+32
-36
lines changed

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/dto/req/CreateAuthenticationFieldRequestData.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package team.msg.sms.domain.authentication.dto.req
22

3-
import team.msg.sms.domain.authentication.model.SectionType
4-
import java.util.*
3+
import team.msg.sms.domain.authentication.model.FieldType
54

65
data class CreateAuthenticationFieldRequestData(
76
val description: String?,
87
val placeHolder: String?,
9-
val fieldInputType: SectionType,
8+
val fieldType: FieldType,
109
val selectorSectionName: List<String>
1110
)

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/dto/req/CreateAuthenticationSectionRequestData.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package team.msg.sms.domain.authentication.dto.req
22

3-
import team.msg.sms.domain.authentication.model.SectionType
4-
53
data class CreateAuthenticationSectionRequestData(
64
val sectionName: String,
75
val maxCount: Int,

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/dto/req/SubmitUserFormRequestData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package team.msg.sms.domain.authentication.dto.req
22

3-
import team.msg.sms.domain.authentication.model.SectionType
3+
import team.msg.sms.domain.authentication.model.FieldType
44
import java.util.*
55

66
data class SubmitUserFormRequestData(
@@ -10,7 +10,7 @@ data class SubmitUserFormRequestData(
1010
data class SubmitValueRequestData(
1111
val fieldId: UUID,
1212
val selectId: UUID?,
13-
val sectionType: SectionType,
13+
val fieldType: FieldType,
1414
val value: String?
1515
)
1616
}

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/dto/res/AuthenticationSectionFieldResponseData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package team.msg.sms.domain.authentication.dto.res
22

3-
import team.msg.sms.domain.authentication.model.SectionType
3+
import team.msg.sms.domain.authentication.model.FieldType
44
import java.util.*
55

66
data class AuthenticationSectionFieldResponseData(
77
val fieldId: UUID,
8-
val sectionType: SectionType,
8+
val fieldType: FieldType,
99
val scoreDescription: String?,
1010
val values: List<AuthenticationSelectorValueResponseData>?,
1111
val example: String?

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/model/AuthenticationField.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data class AuthenticationField(
77
val sectionId: UUID,
88
val description: String?,
99
val placeHolder: String?,
10-
val fieldInputType: SectionType,
10+
val fieldInputType: FieldType,
1111
val fieldScore: Double,
1212
val sort: Int
1313
)

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/model/SectionType.kt renamed to ‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/model/FieldType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package team.msg.sms.domain.authentication.model
22

3-
enum class SectionType {
3+
enum class FieldType {
44
TEXT,
55
FILE,
66
SELECT,

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/model/UserFormValue.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class UserFormValue(
1212
val authenticationFieldId: UUID,
1313
val value: String?,
1414
val score: Int,
15-
val sectionType: SectionType,
15+
val fieldType: FieldType,
1616
val targetId: UUID?,
1717
val createdBy: UUID,
1818
val createdAt: LocalDateTime,

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/CreateAuthenticationFormUseCase.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class CreateAuthenticationFormUseCase(
135135
sectionId = sectionId,
136136
description = fieldData.description,
137137
placeHolder = fieldData.placeHolder,
138-
fieldInputType = fieldData.fieldInputType,
138+
fieldInputType = fieldData.fieldType,
139139
fieldScore = 0.0,
140140
sort = index
141141
)
@@ -146,10 +146,10 @@ class CreateAuthenticationFormUseCase(
146146
fieldData: CreateAuthenticationFieldRequestData,
147147
field: AuthenticationField
148148
) {
149-
if (fieldData.fieldInputType in listOf(
150-
SectionType.SELECT,
151-
SectionType.SELECT_VALUE,
152-
SectionType.BOOLEAN
149+
if (fieldData.fieldType in listOf(
150+
FieldType.SELECT,
151+
FieldType.SELECT_VALUE,
152+
FieldType.BOOLEAN
153153
)
154154
) {
155155
val selectorSectionValues = fieldData.selectorSectionName.mapIndexed { selectorIndex, name ->

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/QueryAuthenticationFormUseCase.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import team.msg.sms.common.annotation.UseCase
55
import team.msg.sms.domain.authentication.dto.res.*
66
import team.msg.sms.domain.authentication.model.AuthenticationSection
77
import team.msg.sms.domain.authentication.model.AuthenticationArea
8-
import team.msg.sms.domain.authentication.model.SectionType
8+
import team.msg.sms.domain.authentication.model.FieldType
99
import team.msg.sms.domain.authentication.model.SelectorSectionValue
1010
import team.msg.sms.domain.authentication.service.AuthenticationFieldService
1111
import team.msg.sms.domain.authentication.service.AuthenticationSectionService
1212
import team.msg.sms.domain.authentication.service.AuthenticationAreaService
1313
import team.msg.sms.domain.authentication.service.SelectorSectionValueService
1414
import team.msg.sms.domain.file.dto.res.FileResponseData
1515
import team.msg.sms.domain.file.service.FileService
16+
import team.msg.sms.domain.user.model.User
1617
import java.util.*
1718

1819
@UseCase
@@ -88,7 +89,7 @@ class QueryAuthenticationFormUseCase(
8889
fieldId = authenticationField.id,
8990
scoreDescription = authenticationField.description,
9091
example = authenticationField.placeHolder,
91-
sectionType = authenticationField.fieldInputType,
92+
fieldType = authenticationField.fieldInputType,
9293
values = generateSelectorValues(
9394
authenticationField.fieldInputType,
9495
selectorSectionValues,
@@ -99,11 +100,11 @@ class QueryAuthenticationFormUseCase(
99100
}
100101

101102
private fun generateSelectorValues(
102-
type: SectionType,
103+
type: FieldType,
103104
sectionValue: List<SelectorSectionValue>,
104105
authenticationFieldId: UUID
105106
): List<AuthenticationSelectorValueResponseData>? {
106-
return if (type in listOf(SectionType.SELECT_VALUE, SectionType.SELECT, SectionType.BOOLEAN)) {
107+
return if (type in listOf(FieldType.SELECT_VALUE, FieldType.SELECT, FieldType.BOOLEAN)) {
107108
sectionValue.filter { it.authenticationFieldId == authenticationFieldId }
108109
.map {
109110
AuthenticationSelectorValueResponseData(

‎sms-core/src/main/kotlin/team/msg/sms/domain/authentication/usecase/SubmitUserFormDataUseCase.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package team.msg.sms.domain.authentication.usecase
22

33
import team.msg.sms.common.annotation.UseCase
44
import team.msg.sms.domain.authentication.dto.req.SubmitUserFormRequestData
5-
import team.msg.sms.domain.authentication.model.SectionType
5+
import team.msg.sms.domain.authentication.model.FieldType
66
import team.msg.sms.domain.authentication.model.UserFormValue
77
import team.msg.sms.domain.authentication.service.AuthenticationSectionService
88
import team.msg.sms.domain.authentication.service.UserFormValueService
@@ -44,14 +44,14 @@ class SubmitUserFormDataUseCase(
4444
studentId: UUID,
4545
authenticationFormId: UUID
4646
): UserFormValue {
47-
val value = when (submitData.sectionType) {
48-
SectionType.SELECT_VALUE -> submitData.value
49-
SectionType.SELECT, SectionType.BOOLEAN -> null
47+
val value = when (submitData.fieldType) {
48+
FieldType.SELECT_VALUE -> submitData.value
49+
FieldType.SELECT, FieldType.BOOLEAN -> null
5050
else -> submitData.value
5151
}
5252

53-
val selectId = when (submitData.sectionType) {
54-
SectionType.SELECT_VALUE, SectionType.SELECT, SectionType.BOOLEAN -> submitData.selectId
53+
val selectId = when (submitData.fieldType) {
54+
FieldType.SELECT_VALUE, FieldType.SELECT, FieldType.BOOLEAN -> submitData.selectId
5555
else -> null
5656
}
5757

@@ -61,7 +61,7 @@ class SubmitUserFormDataUseCase(
6161
authenticationSectionId = sectionId,
6262
value = value,
6363
score = 0,
64-
sectionType = submitData.sectionType,
64+
fieldType = submitData.fieldType,
6565
targetId = selectId,
6666
createdAt = LocalDateTime.now(),
6767
createdBy = studentId,

‎sms-persistence/src/main/kotlin/team/msg/sms/persistence/authentication/entity/AuthenticationFieldJpaEntity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package team.msg.sms.persistence.authentication.entity
22

3-
import team.msg.sms.domain.authentication.model.SectionType
3+
import team.msg.sms.domain.authentication.model.FieldType
44
import team.msg.sms.persistence.BaseUuidEntity
5-
import java.time.LocalDateTime
65
import java.util.*
76
import javax.persistence.Column
87
import javax.persistence.Entity
@@ -21,7 +20,7 @@ class AuthenticationFieldJpaEntity(
2120
val placeHolder: String?,
2221

2322
@Enumerated(EnumType.STRING)
24-
val fieldInputType: SectionType,
23+
val fieldInputType: FieldType,
2524

2625
val fieldScore: Double,
2726

‎sms-persistence/src/main/kotlin/team/msg/sms/persistence/authentication/entity/AuthenticationSectionJpaEntity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package team.msg.sms.persistence.authentication.entity
22

33
import org.hibernate.annotations.GenericGenerator
4-
import team.msg.sms.domain.authentication.model.SectionType
54
import team.msg.sms.persistence.BaseUuidEntity
65
import java.util.*
76
import javax.persistence.*

‎sms-persistence/src/main/kotlin/team/msg/sms/persistence/authentication/entity/UserFormValueJpaEntity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package team.msg.sms.persistence.authentication.entity
22

33
import org.hibernate.annotations.GenericGenerator
4-
import team.msg.sms.domain.authentication.model.SectionType
4+
import team.msg.sms.domain.authentication.model.FieldType
55
import team.msg.sms.persistence.BaseUuidEntity
66
import java.time.LocalDateTime
77
import java.util.*
@@ -26,7 +26,7 @@ class UserFormValueJpaEntity(
2626
val score: Int,
2727

2828
@Enumerated(EnumType.STRING)
29-
val sectionType: SectionType,
29+
val fieldType: FieldType,
3030

3131
@GeneratedValue(generator = "uuid2")
3232
@GenericGenerator(name = "uuid2", strategy = "uuid2")

‎sms-persistence/src/main/kotlin/team/msg/sms/persistence/authentication/mapper/UserFormValueMapper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fun UserFormValueJpaEntity.toDomain() =
99
authenticationSectionId = authenticationSectionId,
1010
value = value,
1111
score = score,
12-
sectionType = sectionType,
12+
fieldType = fieldType,
1313
targetId = targetId,
1414
createdBy = createdBy,
1515
createdAt = createdAt,
@@ -24,7 +24,7 @@ fun UserFormValue.toEntity() =
2424
authenticationSectionId = authenticationSectionId,
2525
value = value,
2626
score = score,
27-
sectionType = sectionType,
27+
fieldType = fieldType,
2828
targetId = targetId,
2929
createdBy = createdBy,
3030
createdAt = createdAt,

0 commit comments

Comments
 (0)