Skip to content

Commit 60316bf

Browse files
pjh5365pjh5365
committed
Refactor: AI 요구사항에 맞게 코드 수정
1 parent d88fe6d commit 60316bf

File tree

15 files changed

+274
-111
lines changed

15 files changed

+274
-111
lines changed

‎src/main/java/workplate/workplateserver/auth/domain/Experience.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/workplate/workplateserver/auth/domain/MainExperience.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package workplate.workplateserver.auth.domain;
2+
3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
6+
/**
7+
* 직종 대분류
8+
*
9+
* @author : parkjihyeok
10+
* @since : 2024/11/03
11+
*/
12+
@Getter
13+
@RequiredArgsConstructor
14+
public enum MainExperience {
15+
COOKING_SERVING("요리·서빙"),
16+
PRODUCTION_TECHNICAL("생산·기술"),
17+
DRIVING_DELIVERY_LOGISTICS("운전·배달·물류"),
18+
CONSTRUCTION_CIVIL_ENGINEERING_LABOR("건설·토목·노무"),
19+
DISTRIBUTION_SALES("유통·판매"),
20+
CULTURE_LEISURE_LIFESTYLE("문화·여가·생활"),
21+
SERVICE("서비스"),
22+
OFFICE_ACCOUNTING_IT("사무·회계·IT"),
23+
SALES_CONSULTING("영업·상담"),
24+
CAREGIVING_NURSING_MEDICAL("요양·간호·의료"),
25+
EDUCATION_INSTRUCTION("교육·강사");
26+
27+
private final String mainExperience;
28+
}

‎src/main/java/workplate/workplateserver/auth/domain/PhysicalStatus.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
@Getter
1313
@RequiredArgsConstructor
1414
public enum PhysicalStatus {
15-
// TODO: 2024/11/3 타입에 맞게 추가하기
16-
TEST("테스트용");
15+
NORMAL("정상"),
16+
PRE_FRAIL("노쇠 전"),
17+
FRAIL("노쇠");
1718
private final String physicalStatus;
1819
}

‎src/main/java/workplate/workplateserver/auth/domain/Preference.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/workplate/workplateserver/auth/domain/SubExperience.java‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
package workplate.workplateserver.auth.domain;
2+
3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
6+
/**
7+
* 직종 소분류
8+
*
9+
* @author : parkjihyeok
10+
* @since : 2024/11/15
11+
*/
12+
@Getter
13+
@RequiredArgsConstructor
14+
public enum SubExperience {
15+
// Cooking and Serving
16+
CHEF_COOK("주방장·조리사"),
17+
KITCHEN_STAFF("주방·주방보조·설거지"),
18+
SERVING_PACKAGING("서빙·포장"),
19+
COUNTER("카운터"),
20+
STORE_MANAGER("점장·매니저"),
21+
OTHER_COOKING_SERVING("요리·서빙 기타"),
22+
23+
// Production and Technical
24+
TEXTILE("섬유·재단·미싱"),
25+
PRODUCTION_MANUFACTURING("생산·제조·조립·인쇄"),
26+
PACKAGING_INSPECTION("포장·검사"),
27+
INSTALLATION_REPAIR("설치·수리·정비·AS"),
28+
FARM_AGRICULTURE("농장·농사"),
29+
METALWORK_MOLD("금속·금형"),
30+
AUTO_REPAIR_SHIPBUILDING("자동차정비·조선·선원"),
31+
MACHINERY_EQUIPMENT("기계·설비"),
32+
FOOD_MANUFACTURING("농수산물 가공·식품 제조"),
33+
OTHER_PRODUCTION_TECHNICAL("생산·기술 기타"),
34+
35+
// Driving and Delivery
36+
PARCEL_DELIVERY("택배·물류"),
37+
CARGO_SPECIAL_VEHICLES("화물·중장비·특수차"),
38+
INDEPENDENT_CONTRACTOR("지입·차량용역"),
39+
BUS_TAXI_VAN("버스·택시·승합차"),
40+
DELIVERY_MOVING("배송·이사"),
41+
QUICK_SERVICE("배달·퀵·이륜차"),
42+
CHAUFFEUR("승용차·대리운전"),
43+
OTHER_DRIVING_DELIVERY("운전·배달 기타"),
44+
45+
// Construction
46+
CONSTRUCTION_FINISHING("건설마감"),
47+
CONSTRUCTION_STRUCTURE("건설구조"),
48+
WELDING_CUTTING("용접·절단"),
49+
PLUMBING_FACILITIES("배관·설비"),
50+
ELECTRICAL_MANAGEMENT("전기·조명·시설관리"),
51+
CONSTRUCTION_SITE("건설현장"),
52+
OTHER_CONSTRUCTION("건설·토목 기타"),
53+
54+
// Sales and Distribution
55+
MART_SUPERMARKET("마트·슈퍼"),
56+
CONVENIENCE_STORE("편의점"),
57+
LIVESTOCK_PRODUCE("축산·청과·농수산"),
58+
DEPARTMENT_STORE("백화점·아울렛·쇼핑몰"),
59+
LARGE_RETAIL_STORE("대형마트·유통점"),
60+
CLOTHING_ACCESSORIES("의류·주얼리·잡화"),
61+
FLORIST("꽃·화훼"),
62+
COSMETICS_BEAUTY("화장품·뷰티·헬스스토어"),
63+
OTHER_SALES_DISTRIBUTION("유통·판매 기타"),
64+
65+
// Culture and Leisure
66+
HOTEL_LODGING("모텔·호텔·숙박"),
67+
SAUNA_SPA("사우나·찜질방"),
68+
HIGHWAY_REST_STOP("고속도로 휴게소"),
69+
SPORTS("당구장·볼링장·스포츠"),
70+
GOLF("골프·스크린골프"),
71+
ARCADE_PC_ROOM("오락실·PC방"),
72+
BEAUTY("헤어·네일·피부·미용"),
73+
PET_SHOP("반려동물·애견샵"),
74+
STUDY_CAFE("독서실·고시원·스터디카페"),
75+
OTHER_LIFESTYLE("문화·여가·생활 기타"),
76+
77+
// Services
78+
CLEANING_SANITATION("청소·미화·방역"),
79+
SECURITY_GUARD("경비·보안"),
80+
CAR_WASH_REFUELING("세차·주유"),
81+
PARKING_MANAGEMENT("주차관리·주차도우미"),
82+
LAUNDRY_ALTERATION("세탁·수선"),
83+
HOUSEKEEPER_BABYSITTER("가사도우미·베이비시터"),
84+
FUNERAL_WEDDING("상조·웨딩·연회"),
85+
OTHER_SERVICE("서비스 기타"),
86+
87+
// Office Work
88+
ACCOUNTING_FINANCE("경리·세무·회계"),
89+
OFFICE_PLANNING("사무·기획·관리·홍보"),
90+
GENERAL_AFFAIRS("총무·노무·법무·인사"),
91+
IT_DESIGN("컴퓨터·IT·디자인"),
92+
RECEPTION_SECRETARY("안내·비서"),
93+
OTHER_OFFICE_WORK("사무·회계·IT 기타"),
94+
95+
// Sales and Consulting
96+
INBOUND_CS("인바운드·CS"),
97+
OUTBOUND_TM("아웃바운드·TM"),
98+
REAL_ESTATE("부동산"),
99+
GENERAL_SALES("일반·기술영업"),
100+
FINANCE_INSURANCE("금융·보험·카드"),
101+
OTHER_SALES_CONSULTING("상담·영업기타"),
102+
103+
// Medical and Care
104+
ELDERLY_CARE("요양·간병·돌봄"),
105+
NURSING_ASSISTANT("간호조무사·간호사"),
106+
MEDICAL_TECHNICIAN("의료기사·치료사"),
107+
DOCTOR("의사·한의사"),
108+
OTHER_MEDICAL_CARE("요양·간호·의료 기타"),
109+
110+
// Education and Instruction
111+
DAYCARE("어린이집·유치원"),
112+
ENTRANCE_EXAM("입시·보습·자격증"),
113+
PRIVATE_TUTORING("과외·공부방·학습지"),
114+
SPORTS_INSTRUCTION("생활체육·스포츠"),
115+
MUSIC_ART("음악·피아노·미술"),
116+
OTHER_EDUCATION("교육·강사 기타");
117+
118+
private final String subExperience;
119+
}

‎src/main/java/workplate/workplateserver/auth/domain/dto/request/JoinRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import lombok.AllArgsConstructor;
44
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
56

67
/**
78
* 회원가입 요청 DTO
@@ -10,6 +11,7 @@
1011
* @since : 2024/10/31
1112
*/
1213
@Getter
14+
@NoArgsConstructor
1315
@AllArgsConstructor
1416
public class JoinRequest {
1517

‎src/main/java/workplate/workplateserver/auth/domain/dto/request/MemberDetailRequest.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package workplate.workplateserver.auth.domain.dto.request;
22

3-
import jakarta.persistence.EnumType;
4-
import jakarta.persistence.Enumerated;
53
import lombok.AllArgsConstructor;
64
import lombok.Getter;
7-
import workplate.workplateserver.auth.domain.Experience;
5+
import lombok.NoArgsConstructor;
6+
import workplate.workplateserver.auth.domain.MainExperience;
87
import workplate.workplateserver.auth.domain.PhysicalStatus;
9-
import workplate.workplateserver.auth.domain.Preference;
8+
import workplate.workplateserver.auth.domain.SubExperience;
109

1110
/**
1211
* 회원 상세정보 DTO
@@ -15,12 +14,15 @@
1514
* @since : 2024/10/31
1615
*/
1716
@Getter
17+
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class MemberDetailRequest {
2020

2121
private String username;
2222
private int age;
23-
private Experience experience;
23+
private MainExperience mainExperience;
24+
private SubExperience subExperience;
25+
private MainExperience mainPreference;
26+
private SubExperience subPreference;
2427
private PhysicalStatus physicalStatus;
25-
private Preference preference;
2628
}

‎src/main/java/workplate/workplateserver/auth/domain/entity/MemberDetail.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
import lombok.Builder;
1515
import lombok.Getter;
1616
import lombok.NoArgsConstructor;
17-
import workplate.workplateserver.auth.domain.Experience;
17+
import workplate.workplateserver.auth.domain.MainExperience;
1818
import workplate.workplateserver.auth.domain.PhysicalStatus;
19-
import workplate.workplateserver.auth.domain.Preference;
19+
import workplate.workplateserver.auth.domain.SubExperience;
20+
import workplate.workplateserver.auth.domain.dto.request.MemberDetailRequest;
2021
import workplate.workplateserver.common.BaseEntity;
2122

2223
/**
@@ -43,21 +44,25 @@ public class MemberDetail extends BaseEntity {
4344
private int age;
4445

4546
@Enumerated(value = EnumType.STRING)
46-
private Experience experience;
47+
private MainExperience mainExperience;
4748
@Enumerated(value = EnumType.STRING)
48-
private PhysicalStatus physicalStatus;
49+
private SubExperience subExperience;
50+
@Enumerated(value = EnumType.STRING)
51+
private MainExperience mainPreference;
4952
@Enumerated(value = EnumType.STRING)
50-
private Preference preference;
53+
private SubExperience subPreference;
54+
@Enumerated(value = EnumType.STRING)
55+
private PhysicalStatus physicalStatus;
5156

52-
public static MemberDetail toEntity(Member member, int age, Experience experience, PhysicalStatus physicalStatus,
53-
Preference preference) {
57+
public static MemberDetail toEntity(Member member, MemberDetailRequest request) {
5458

5559
return MemberDetail.builder()
5660
.member(member)
57-
.age(age)
58-
.experience(experience)
59-
.physicalStatus(physicalStatus)
60-
.preference(preference)
61+
.age(request.getAge())
62+
.mainPreference(request.getMainPreference())
63+
.subExperience(request.getSubExperience())
64+
.subPreference(request.getSubPreference())
65+
.physicalStatus(request.getPhysicalStatus())
6166
.build();
6267
}
6368
}

‎src/main/java/workplate/workplateserver/auth/service/MemberService.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ public void saveMember(JoinRequest joinRequest) {
5757
public void saveDetails(MemberDetailRequest request) {
5858
Member member = commonService.findByUsername(request.getUsername(), true);
5959
Credit credit = Credit.toEntity(member);
60-
MemberDetail memberDetail = MemberDetail.toEntity(member, request.getAge(), request.getExperience(),
61-
request.getPhysicalStatus(),
62-
request.getPreference());
60+
MemberDetail memberDetail = MemberDetail.toEntity(member, request);
6361
memberDetailRepository.save(memberDetail);
6462
creditRepository.save(credit);
6563
}

‎src/main/java/workplate/workplateserver/credit/domain/dto/CreditRequest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import lombok.AllArgsConstructor;
44
import lombok.Builder;
55
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
67

78
/**
89
* 크레딧 증감 요청
@@ -11,12 +12,12 @@
1112
* @since : 2024/11/13
1213
*/
1314
@Getter
15+
@NoArgsConstructor
1416
@AllArgsConstructor
1517
@Builder
1618
public class CreditRequest {
1719

1820
private String username;
1921
private Long balance;
2022

21-
2223
}

0 commit comments

Comments
 (0)