diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index bf55a707..bfe87e6c 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -593,4 +593,27 @@ AS SELECT a.seq, LEFT JOIN researcher_has_household rhh ON rhh.admin_seq = a.seq AND rhh.is_deleted = false LEFT JOIN household h ON h.seq = rhh.household_seq AND h.is_panel IS TRUE AND h.is_deleted = false WHERE ahr.role_id::text = 'ROLE_RESEARCHER'::text - GROUP BY a.seq, a.id, a.name, a.phone, a.account_disabled; \ No newline at end of file + GROUP BY a.seq, a.id, a.name, a.phone, a.account_disabled; + +-- ============================================ +-- 개인정보 변경 동의 내역 +-- ============================================ +-- public.term_agreement + +CREATE SEQUENCE public.term_agreement_seq + INCREMENT BY 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1 + NO CYCLE; + +CREATE TABLE public.term_agreement ( +id int8 DEFAULT nextval('term_agreement_seq'::regclass) NOT NULL, +seq int8 not NULL, +"type" varchar(10) NULL, +previous_data varchar(10) NULL, +created_at timestamp(6) NULL, +created_by varchar(255) null, +CONSTRAINT term_agreement_pkey PRIMARY KEY (id) +); diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementDao.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementDao.java new file mode 100644 index 00000000..b47d92f7 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementDao.java @@ -0,0 +1,20 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.adapters.persistence; + +import app.module.core.config.application.annotation.CreateCommand; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortOut; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class InsertTermAgreementDao implements InsertTermAgreementPortOut { + + private final InsertTermAgreementMapper mapper; + + @Override + @CreateCommand + public void operate(InsertTermAgreementCmd cmd) { + mapper.insert(cmd); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java new file mode 100644 index 00000000..ab49cb1c --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.adapters.persistence; + +import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFront; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Optional; + +@Mapper +public interface InsertTermAgreementMapper { + void insert(InsertTermAgreementCmd cmd); +} diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortIn.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortIn.java new file mode 100644 index 00000000..26bfd36f --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortIn.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.ports; + +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; + +public interface InsertTermAgreementPortIn { + void operate(InsertTermAgreementCmd cmd); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortOut.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortOut.java new file mode 100644 index 00000000..1d70f702 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/InsertTermAgreementPortOut.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.ports; + +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; + +public interface InsertTermAgreementPortOut { + void operate(InsertTermAgreementCmd cmd); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java new file mode 100644 index 00000000..1951de41 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java @@ -0,0 +1,19 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.ports.application; + +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortIn; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortOut; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; +import app.module.front.usecase.info.userFront.updateUser.ports.UpdateUserFrontPortIn; +import app.module.front.usecase.info.userFront.updateUser.ports.UpdateUserFrontPortOut; +import app.module.front.usecase.info.userFront.updateUser.ports.application.domain.UpdateUserFrontCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class InsertTermAgreementService implements InsertTermAgreementPortIn { + private final InsertTermAgreementPortOut portOut; + + @Override + public void operate(InsertTermAgreementCmd cmd) { portOut.operate(cmd); } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/domain/InsertTermAgreementCmd.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/domain/InsertTermAgreementCmd.java new file mode 100644 index 00000000..7893217d --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/domain/InsertTermAgreementCmd.java @@ -0,0 +1,15 @@ +package app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class InsertTermAgreementCmd extends AuditCommand { + private Long seq; + private String previousData; + private String type; +} diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/InsertUserFrontTermAgreementCmd.java b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/InsertUserFrontTermAgreementCmd.java new file mode 100644 index 00000000..6c8d65d3 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/userFront/updateUser/ports/application/domain/InsertUserFrontTermAgreementCmd.java @@ -0,0 +1,15 @@ +package app.module.front.usecase.info.userFront.updateUser.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class InsertUserFrontTermAgreementCmd extends AuditCommand { + private Long seq; + private String previousData; + private String type; +} diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java index 3f42d32f..d5332c63 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java @@ -6,6 +6,8 @@ import app.module.front.config.application.response.ApiResponse; import app.module.front.usecase.info.userFront.getUserFront.ports.GetUserFrontPortIn; import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFront; import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFrontCmd; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortIn; +import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; import app.module.front.usecase.info.userFront.updateUser.ports.UpdateUserFrontPortIn; import app.module.front.usecase.info.userFront.updateUser.ports.application.domain.UpdateUserFrontCmd; import app.module.front.usecase.info.userUI.updateUserUI.adapters.web.model.UpdateUserReqVO; @@ -25,6 +27,7 @@ class UpdateUserController { private final UpdateUserFrontPortIn updateUserPortIn; private final GetUserFrontPortIn getUserPortIn; + private final InsertTermAgreementPortIn insertTermAgreementPortIn; private final CoreUtil coreUtil; @@ -36,6 +39,13 @@ class UpdateUserController { } GetUserFront getHousehold = getUserPortIn.operate(new GetUserFrontCmd(CommonUtil.getLoginUsername())).orElseThrow(); + if(reqVO.getTermAgreement()){ + insertTermAgreementPortIn.operate(new InsertTermAgreementCmd( + getHousehold.getSeq(), + getHousehold.getOwnerName(), + "PERSONAL" + )); + } updateUserPortIn.operate(new UpdateUserFrontCmd( getHousehold.getSeq(), reqVO.getOwnerName(), diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java index ed3f7a19..5bc5831b 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/model/UpdateUserReqVO.java @@ -48,4 +48,7 @@ public class UpdateUserReqVO { @NotBlank(message = "전체 주소를 입력해주세요.")//"주소는 필수 항목입니다.") @Size(max = 255, message = "전체 주소를 입력해주세요.")//"주소는 255자 이하여야 합니다.") private String address; + + private Boolean termAgreement; + } diff --git a/front/src/main/resources/mappers/userFront/InsertTermAgreementMapper.xml b/front/src/main/resources/mappers/userFront/InsertTermAgreementMapper.xml new file mode 100644 index 00000000..56063534 --- /dev/null +++ b/front/src/main/resources/mappers/userFront/InsertTermAgreementMapper.xml @@ -0,0 +1,25 @@ + + + + + + INSERT INTO term_agreement( + id, + seq, + "type", + previous_data, + created_at, + created_by + )VALUES( + nextval('term_agreement_seq'::regclass), + #{seq}, + #{type}, + #{previousData}, + NOW(), + #{createdBy} + ) + + + \ No newline at end of file diff --git a/front/src/main/resources/static/assets/json/2025-01.json b/front/src/main/resources/static/assets/json/2025-01.json deleted file mode 100644 index 9065b7b8..00000000 --- a/front/src/main/resources/static/assets/json/2025-01.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": [{}, {}]}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": [{}, {}]}, - {"no":15, "start":26, "end":27, "children": [{}, {}, {}, {}]}, - {"no":16, "start":28, "end":29, "children": []}, - {"no":17, "start":30, "end":31, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/2025-02.json b/front/src/main/resources/static/assets/json/2025-02.json deleted file mode 100644 index 8f9df2e1..00000000 --- a/front/src/main/resources/static/assets/json/2025-02.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": [{}, {}]}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": [{}, {}]}, - {"no":15, "start":26, "end":27, "children": [{}, {}, {}, {}]}, - {"no":16, "start":28, "end":28, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/2025-03.json b/front/src/main/resources/static/assets/json/2025-03.json deleted file mode 100644 index 9065b7b8..00000000 --- a/front/src/main/resources/static/assets/json/2025-03.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": [{}, {}]}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": [{}, {}]}, - {"no":15, "start":26, "end":27, "children": [{}, {}, {}, {}]}, - {"no":16, "start":28, "end":29, "children": []}, - {"no":17, "start":30, "end":31, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/2025-04.json b/front/src/main/resources/static/assets/json/2025-04.json deleted file mode 100644 index 7117198c..00000000 --- a/front/src/main/resources/static/assets/json/2025-04.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": [{}, {}]}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": [{}, {}]}, - {"no":15, "start":26, "end":27, "children": [{}, {}, {}, {}]}, - {"no":16, "start":28, "end":29, "children": []}, - {"no":17, "start":30, "end":30, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/2025-05.json b/front/src/main/resources/static/assets/json/2025-05.json deleted file mode 100644 index 9065b7b8..00000000 --- a/front/src/main/resources/static/assets/json/2025-05.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": [{}, {}]}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": [{}, {}]}, - {"no":15, "start":26, "end":27, "children": [{}, {}, {}, {}]}, - {"no":16, "start":28, "end":29, "children": []}, - {"no":17, "start":30, "end":31, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/2025-06.json b/front/src/main/resources/static/assets/json/2025-06.json deleted file mode 100644 index 1d17d0bb..00000000 --- a/front/src/main/resources/static/assets/json/2025-06.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - {"no":1, "start":1, "end":2, "children": []}, - {"no":2, "start":3, "end":4, "children": [{}, {}]}, - {"no":3, "start":5, "end":6, "children": []}, - {"no":4, "start":7, "end":7, "children": [{}]}, - {"no":5, "start":8, "end":9, "children": []}, - {"no":6, "start":10, "end":11, "children": []}, - {"no":7, "start":12, "end":13, "children": []}, - {"no":8, "start":14, "end":14, "children": []}, - {"no":9, "start":15, "end":16, "children": []}, - {"no":10, "start":17, "end":18, "children": []}, - {"no":11, "start":19, "end":20, "children": []}, - {"no":12, "start":21, "end":21, "children": []}, - {"no":13, "start":22, "end":23, "children": []}, - {"no":14, "start":24, "end":25, "children": []}, - {"no":15, "start":26, "end":27, "children": []}, - {"no":16, "start":28, "end":29, "children": []}, - {"no":17, "start":30, "end":30, "children": []} -] diff --git a/front/src/main/resources/static/assets/json/manifest.json b/front/src/main/resources/static/assets/json/manifest.json deleted file mode 100644 index bb1d8140..00000000 --- a/front/src/main/resources/static/assets/json/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "My App", - "short_name": "MyApp", - "start_url": "/", - "display": "standalone", - "background_color": "#ffffff", - //"theme_color": "#4BBC43", - "icons": [ - { - "src": "kri_appimg.png", - "sizes": "512x512", - "type": "image/png" - } - ] -} diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 5cd56d1b..48952654 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -31,7 +31,7 @@ - + diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 781f2718..4157850d 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -12,6 +12,7 @@
+
@@ -386,12 +387,11 @@ } } if (form.phone1.value || form.phone2.value || form.phone3.value) { - if (form.tel2.value.length === 3) errors.push({ field: 'tel1', message: '핸드폰 번호를 입력해 주세요.' }); - if (form.tel2.value.length < 3 || form.tel2.value.length > 4) errors.push({ field: 'tel2', message: '핸드폰 번호를 입력해 주세요.' }); - if (form.tel3.value.length !== 4) errors.push({ field: 'tel3', message: '핸드폰 번호를 입력해 주세요.' }); + if (form.phone1.value.length !== 3) errors.push({ field: 'phone1', message: '핸드폰 번호를 입력해 주세요.' }); + if (form.phone2.value.length < 3 || form.phone2.value.length > 4) errors.push({ field: 'phone2', message: '핸드폰 번호를 입력해 주세요.' }); + if (form.phone3.value.length !== 4) errors.push({ field: 'phone3', message: '핸드폰 번호를 입력해 주세요.' }); } if (!form.phone1.value ||!form.phone2.value || !form.phone3.value) errors.push({field: 'phone1', message: '휴대폰 번호를 입력해 주세요.'}); - if (form.phone1.value.length < 2 || form.phone2.value.length < 3 || form.phone2.value.length > 4 || form.phone3.value.length < 3 || form.phone3.value.length > 4) errors.push({field: 'phone1', message: '휴대폰 번호를 입력해 주세요.'}); if (!form.regionSubCode.value) errors.push({field: 'regionSubCode', message: '지역을 선택해 주세요.'}); if (!form.regionDetailCode.value) errors.push({field: 'regionDetailCode', message: '세부 지역를 선택해 주세요.'}); if (!form.address.value) errors.push({field: 'address', message: '전체 주소를 입력해 주세요.'}); @@ -410,6 +410,7 @@ }, confirmPopupOk() { ENV.module.confirmPopup.close(); + document.querySelector('input[name="termAgreement"]').value = true; formControl.updateUserInfo(); }, updateUserInfo() {