@@ -3,9 +3,7 @@ package com.dobby.external.prompt
33import com.dobby.enums.MatchType
44import com.dobby.enums.experiment.TimeSlot
55import com.dobby.enums.member.GenderType
6- import com.dobby.external.prompt.dto.ApplyMethodDto
76import com.dobby.external.prompt.dto.ExperimentPostKeywordDto
8- import com.dobby.external.prompt.dto.TargetGroupDto
97import com.dobby.model.experiment.keyword.ApplyMethodKeyword
108import com.dobby.model.experiment.keyword.ExperimentPostKeywords
119import com.dobby.model.experiment.keyword.TargetGroupKeyword
@@ -18,37 +16,36 @@ class ExperimentPostKeywordMapper {
1816 return ExperimentPostKeywords (
1917 targetGroup = dto.targetGroup?.let { targetGroupDto ->
2018 TargetGroupKeyword (
21- startAge = targetGroupDto.startAge ? : 0 ,
22- endAge = targetGroupDto.endAge ? : 0 ,
23- genderType = targetGroupDto.genderType?.let { genderStr ->
24- when (genderStr) {
25- " MALE" -> GenderType .MALE
26- " FEMALE" -> GenderType .FEMALE
27- " ALL" -> GenderType .ALL
28- else -> GenderType .ALL
19+ startAge = targetGroupDto.startAge,
20+ endAge = targetGroupDto.endAge,
21+ genderType = targetGroupDto.genderType?.let {
22+ try {
23+ GenderType .valueOf(it)
24+ } catch (e: IllegalArgumentException ) {
25+ null
2926 }
30- } ? : GenderType . ALL ,
27+ },
3128 otherCondition = targetGroupDto.otherCondition
3229 )
3330 },
3431 applyMethod = dto.applyMethod?.let { applyMethodDto ->
3532 ApplyMethodKeyword (
36- content = applyMethodDto.content ? : " " ,
33+ content = applyMethodDto.content,
3734 isFormUrl = applyMethodDto.isFormUrl,
38- formUrl = applyMethodDto.formUrl ? : " " ,
35+ formUrl = applyMethodDto.formUrl,
3936 isPhoneNum = applyMethodDto.isPhoneNum,
40- phoneNum = applyMethodDto.phoneNum ? : " "
37+ phoneNum = applyMethodDto.phoneNum
4138 )
4239 },
4340 matchType = dto.matchType?.let { matchTypeStr ->
4441 try {
4542 MatchType .valueOf(matchTypeStr)
4643 } catch (e: IllegalArgumentException ) {
47- MatchType . ALL
44+ null
4845 }
49- } ? : MatchType . ALL ,
50- reward = dto.reward ? : " " ,
51- count = dto.count ? : 0 ,
46+ },
47+ reward = dto.reward,
48+ count = dto.count,
5249 timeRequired = dto.timeRequired?.takeIf { it.isNotBlank() }?.let { timeSlotStr ->
5350 try {
5451 TimeSlot .valueOf(timeSlotStr)
@@ -58,30 +55,4 @@ class ExperimentPostKeywordMapper {
5855 }
5956 )
6057 }
61-
62- fun toDto (domain : ExperimentPostKeywords ): ExperimentPostKeywordDto {
63- return ExperimentPostKeywordDto (
64- targetGroup = domain.targetGroup?.let { targetGroupDomain ->
65- TargetGroupDto (
66- startAge = targetGroupDomain.startAge,
67- endAge = targetGroupDomain.endAge,
68- genderType = targetGroupDomain.genderType?.name,
69- otherCondition = targetGroupDomain.otherCondition
70- )
71- },
72- applyMethod = domain.applyMethod?.let { applyMethodDomain ->
73- ApplyMethodDto (
74- content = applyMethodDomain.content,
75- isFormUrl = applyMethodDomain.isFormUrl,
76- formUrl = applyMethodDomain.formUrl,
77- isPhoneNum = applyMethodDomain.isPhoneNum,
78- phoneNum = applyMethodDomain.phoneNum
79- )
80- },
81- matchType = domain.matchType?.name,
82- reward = domain.reward,
83- count = domain.count,
84- timeRequired = domain.timeRequired?.name
85- )
86- }
8758}
0 commit comments