From 7b8e65b1cb9a6618c875835b592f3d7f77a0cc24 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 23 Sep 2025 22:17:37 +0900 Subject: [PATCH 01/30] default setting --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea5e249..2fcdc14 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ DKU UMC Spring Boot 스터디 | 이승준 | 정윤철 | 설원준 | 윤영주 | 고희연 | 고경수 | 구현모 | | :------: | :------: | :------: | :------: | :------: | :------: | :------: | -| [이승준](https://github.com/hilees) | [정윤철](https://github.com/Yoonchulchung) | [설원준]() | [윤영주]() | [고희연]() | [고경수]() | [구현모]() | +| [이승준](https://github.com/hilees) | [정윤철](https://github.com/Yoonchulchung) | [설원준]() | [윤영주](https://github.com/som141) | [고희연]() | [고경수]() | [구현모]() |
From a39800163e0b5fea8aa547eb7f0bec8a4f1e26d7 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 23 Sep 2025 22:30:06 +0900 Subject: [PATCH 02/30] =?UTF-8?q?[week1/mission]Chapter1.=EC=8B=A4?= =?UTF-8?q?=EC=A0=84SQL-=EC=96=B4=EB=96=A4Query=EB=A5=BC=EC=9E=91=EC=84=B1?= =?UTF-8?q?=ED=95=B4=EC=95=BC=20=ED=95=A0=EA=B9=8C=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- week0/ddl.sql | 151 +++ week0/erd.vuerd.json | 2265 ++++++++++++++++++++++++++++++++++++++++++ week1/ex1.sql | 20 + week1/workbook.txt | 25 + 4 files changed, 2461 insertions(+) create mode 100644 week0/ddl.sql create mode 100644 week0/erd.vuerd.json create mode 100644 week1/ex1.sql create mode 100644 week1/workbook.txt diff --git a/week0/ddl.sql b/week0/ddl.sql new file mode 100644 index 0000000..e2a8515 --- /dev/null +++ b/week0/ddl.sql @@ -0,0 +1,151 @@ + +CREATE TABLE favorate_food +( + id long NOT NULL COMMENT '유저선호음식코드', + food_id long NOT NULL COMMENT '음식 카테고리를 정하고 함', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + PRIMARY KEY (id) +) COMMENT '선호음식'; + +CREATE TABLE food +( + id long NOT NULL DEFAULT autoincrement COMMENT '음식 카테고리를 정하고 함', + name VARCHAR(40) NOT NULL COMMENT '음식카테고리 이름', + PRIMARY KEY (id) +) COMMENT '푸드카테고리'; + +CREATE TABLE foodmarket +( + id long NOT NULL DEFAULT autoincrement COMMENT '가게 id', + name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', + address VARCHAR(50) NOT NULL COMMENT '가게주소', + open BOOLEAN NOT NULL COMMENT '영업중이냐?', + content VARCHAR(200) NOT NULL COMMENT '가계 내용', + PRIMARY KEY (id) +); + +CREATE TABLE mission +( + id long NOT NULL DEFAULT autoincrement COMMENT '고유미션_id', + market_id long NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '미션내용', + mission_point INTEGER NOT NULL COMMENT '미션포인트', + PRIMARY KEY (id) +) COMMENT '마켓과 유저 사이의 미션'; + +CREATE TABLE mission+user +( + id long NOT NULL DEFAULT autoincrement, + mission_id long NOT NULL COMMENT '고유미션_id', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + content VARCHAR NOT NULL COMMENT '새 미션에 대한 내용', + PRIMARY KEY (id) +) COMMENT '신규 미션 받아라 유저!'; + +CREATE TABLE permission_mission +( + id long NOT NULL DEFAULT autoincrement COMMENT '유저 미션할당번호(이거 사장님한테 보여주면 댐)', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + mission_id long NOT NULL COMMENT '고유미션_id', + PRIMARY KEY (id) +); + +CREATE TABLE review +( + id long NOT NULL DEFAULT autoincrement COMMENT '리뷰 고유(id)', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + market_id long NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '리뷰내용', + star FLOAT NOT NULL COMMENT '0~5까지', + PRIMARY KEY (id) +) COMMENT '마켓과 유저사이의 리뷰'; + +CREATE TABLE review_alram +( + id long NOT NULL DEFAULT autoincrement, + user_id long NOT NULL COMMENT '가게 id', + foodmarket_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + content VARCHAR NOT NULL COMMENT '알람내용(리뷰관련 내용)', + PRIMARY KEY (id) +) COMMENT '리뷰해주세용'; + +CREATE TABLE review_image +( + id long NOT NULL DEFAULT autoincrement COMMENT '고유이미지_id', + review_id long NOT NULL COMMENT '리뷰 고유(id)', + url VARCHAR(200) NOT NULL COMMENT '이미지 uri', + PRIMARY KEY (id) +) COMMENT '리뷰에 쓰이는 이미지들'; + +CREATE TABLE user +( + id long NOT NULL DEFAULT autoincrement COMMENT '유저 (id)db내에서의 불변고유식별자', + email VARCHAR(50) NOT NULL COMMENT '로그인할때 이메일(유니크 속성주기)', + password VARCHAR(30) NULL COMMENT '8자리이상 영문 숫자 특수문자 조합하셈', + name VARCHAR(20) NOT NULL COMMENT '이름임', + gender INTEGER NOT NULL COMMENT '남자0,여자1, 제삼의 성(?)3', + birth DATETIME NOT NULL COMMENT '8자리', + address VARCHAR(50) NOT NULL COMMENT '주소', + point INTEGER NOT NULL COMMENT '총 point', + PRIMARY KEY (id) +) COMMENT 'user_information'; + +ALTER TABLE review_image + ADD CONSTRAINT FK_review_TO_review_image + FOREIGN KEY (review_id) + REFERENCES review (id); + +ALTER TABLE permission_mission + ADD CONSTRAINT FK_user_TO_permission_mission + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE review + ADD CONSTRAINT FK_foodmarket_TO_review + FOREIGN KEY (market_id) + REFERENCES foodmarket (id); + +ALTER TABLE review + ADD CONSTRAINT FK_user_TO_review + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE mission + ADD CONSTRAINT FK_foodmarket_TO_mission + FOREIGN KEY (market_id) + REFERENCES foodmarket (id); + +ALTER TABLE permission_mission + ADD CONSTRAINT FK_mission_TO_permission_mission + FOREIGN KEY (mission_id) + REFERENCES mission (id); + +ALTER TABLE favorate_food + ADD CONSTRAINT FK_food_TO_favorate_food + FOREIGN KEY (food_id) + REFERENCES food (id); + +ALTER TABLE favorate_food + ADD CONSTRAINT FK_user_TO_favorate_food + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE review_alram + ADD CONSTRAINT FK_foodmarket_TO_review_alram + FOREIGN KEY (user_id) + REFERENCES foodmarket (id); + +ALTER TABLE review_alram + ADD CONSTRAINT FK_user_TO_review_alram + FOREIGN KEY (foodmarket_id) + REFERENCES user (id); + +ALTER TABLE mission+user + ADD CONSTRAINT FK_mission_TO_mission+user + FOREIGN KEY (mission_id) + REFERENCES mission (id); + +ALTER TABLE mission+user + ADD CONSTRAINT FK_user_TO_mission+user + FOREIGN KEY (user_id) + REFERENCES user (id); diff --git a/week0/erd.vuerd.json b/week0/erd.vuerd.json new file mode 100644 index 0000000..0501b0f --- /dev/null +++ b/week0/erd.vuerd.json @@ -0,0 +1,2265 @@ +{ + "$schema": "https://raw.githubusercontent.com/dineug/erd-editor/main/json-schema/schema.json", + "version": "3.0.0", + "settings": { + "width": 2000, + "height": 2000, + "scrollTop": -201.8457, + "scrollLeft": -140.64, + "zoomLevel": 0.85, + "show": 431, + "database": 4, + "databaseName": "", + "canvasType": "@dineug/erd-editor/builtin-schema-sql", + "language": 1, + "tableNameCase": 4, + "columnNameCase": 2, + "bracketType": 1, + "relationshipDataTypeSync": true, + "relationshipOptimization": false, + "columnOrder": [ + 1, + 2, + 4, + 8, + 16, + 32, + 64 + ], + "maxWidthComment": -1, + "ignoreSaveSettings": 0 + }, + "doc": { + "tableIds": [ + "1h1BgNxEvKkk6gEY5CMPg", + "jAhMpDau6eAWbR8ifxIk7", + "U1KhhqX8xZco_6X76lUUF", + "eOdf64btd3jXZ3odam357", + "P7FiH9nZLSpro47ZFRs82", + "BrlSmoR0vOA5wp7DxG5we", + "0JvjupyrC_HXBhFN_shc4", + "spDJoG67LKxqns5k01Sw8", + "gb4iYsr3YyVUrKqBUXFw4", + "yoRJ0I0phZM05vvjpplpG" + ], + "relationshipIds": [ + "95LGlwc5ro-THdZsaS9E_", + "-CCfH3cvSxvdbUzVIjRqx", + "3NAwaUh04XxCu9WtiJZGQ", + "hsUPR9Uagl9UsCj3_v7-D", + "TaYFbfPGvec7SZetfjcbm", + "nrUSGKD4XjLLYG8gtNeX0", + "rRR3UlrXRccW3-FvusZwo", + "lF_M2fq7NZ-MM9bQ_QFa9", + "Zh4XQbVDVYrT3m77ypVoQ", + "28vE14zEXeDiQ9WZAlOgr", + "Fl9pEIK2AlrkViNySHsbU", + "75cGtrFxrlxv8h9HNbs_x" + ], + "indexIds": [], + "memoIds": [] + }, + "collections": { + "tableEntities": { + "XWGdk108BNIBTS4E5LyA-": { + "id": "XWGdk108BNIBTS4E5LyA-", + "name": "user", + "comment": "유저임", + "columnIds": [ + "HZU82lNKDOrgajhOG536V", + "t_RLBWhrZFUxlJ5bjRnfk", + "0kcH_8Z8tm3Ga1etxwa8U", + "9MBWULvb4IO29t17QfULg", + "4tkb0skf9LlAChFmM0d2q" + ], + "seqColumnIds": [ + "HZU82lNKDOrgajhOG536V", + "t_RLBWhrZFUxlJ5bjRnfk", + "0kcH_8Z8tm3Ga1etxwa8U", + "C4drmy-Oz1fH_pvwRy2ya", + "9MBWULvb4IO29t17QfULg", + "4tkb0skf9LlAChFmM0d2q" + ], + "ui": { + "x": 173, + "y": 262, + "zIndex": 102, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758383326408, + "createAt": 1758064771910 + } + }, + "1h1BgNxEvKkk6gEY5CMPg": { + "id": "1h1BgNxEvKkk6gEY5CMPg", + "name": "user", + "comment": "user_information", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4", + "VT6dpeOGqyA1I7KQ6b4mK", + "R09EvHSVhLqVeSYQg8Dqa", + "sRdypptEf1G5rSsm6FX6g", + "k5QSZS8WtQ23EvpJsMuyy", + "4I1ptgrrjPfZ7kwaNL-gI", + "9YJk76nhsU2pQJHAgGuCQ", + "TdPHSn_WW5ipoJJugiMDr" + ], + "seqColumnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4", + "VT6dpeOGqyA1I7KQ6b4mK", + "R09EvHSVhLqVeSYQg8Dqa", + "sRdypptEf1G5rSsm6FX6g", + "k5QSZS8WtQ23EvpJsMuyy", + "4I1ptgrrjPfZ7kwaNL-gI", + "9YJk76nhsU2pQJHAgGuCQ", + "TdPHSn_WW5ipoJJugiMDr" + ], + "ui": { + "x": 37.9412, + "y": 715.9412, + "zIndex": 2, + "widthName": 60, + "widthComment": 91, + "color": "" + }, + "meta": { + "updateAt": 1758522460041, + "createAt": 1758383331119 + } + }, + "jAhMpDau6eAWbR8ifxIk7": { + "id": "jAhMpDau6eAWbR8ifxIk7", + "name": "foodmarket", + "comment": "", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44", + "I-JEAuVy-GEHNuhd_R1Fl", + "sqis3p25lk_He3rwnCuDc", + "O0ry03x6NOpDvBTK0CMbb", + "cU-E1DpewiYVt3r5W3J67" + ], + "seqColumnIds": [ + "Zq1avcoEnaVsfbppogJ44", + "I-JEAuVy-GEHNuhd_R1Fl", + "sqis3p25lk_He3rwnCuDc", + "O0ry03x6NOpDvBTK0CMbb", + "frGgeCTDN_R-BO-pHTIZU", + "qQ4TPs1xEDtsaN2F69b8n", + "rWUlSO-Zx2_CzblYkScil", + "cU-E1DpewiYVt3r5W3J67", + "dUWHJDNXCbHc3eEVauegi" + ], + "ui": { + "x": 1469, + "y": 363, + "zIndex": 9, + "widthName": 64, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758521924972, + "createAt": 1758383344116 + } + }, + "U1KhhqX8xZco_6X76lUUF": { + "id": "U1KhhqX8xZco_6X76lUUF", + "name": "review", + "comment": "마켓과 유저사이의 리뷰", + "columnIds": [ + "icCcVDsFAlzlq4FjE0ubK", + "r28FAr4NRktLF6jeinkQI", + "CVbY3U1IRbHYIv2_ABSi8", + "K2GSuWKKwoSYl0WoAcju0", + "TL3kiOfuBdtpAHnnAtq7x" + ], + "seqColumnIds": [ + "5rLifUB24BKsa7wxaS7UE", + "g3rYiPsqjN477uVH0qkLg", + "icCcVDsFAlzlq4FjE0ubK", + "r2POd-u5Q9w3HwIM7oZpS", + "VbAABiEWDtaW-BR5OX5e7", + "r28FAr4NRktLF6jeinkQI", + "CVbY3U1IRbHYIv2_ABSi8", + "K2GSuWKKwoSYl0WoAcju0", + "TL3kiOfuBdtpAHnnAtq7x" + ], + "ui": { + "x": 719, + "y": 363, + "zIndex": 25, + "widthName": 60, + "widthComment": 129, + "color": "" + }, + "meta": { + "updateAt": 1758521507399, + "createAt": 1758383404844 + } + }, + "eOdf64btd3jXZ3odam357": { + "id": "eOdf64btd3jXZ3odam357", + "name": "mission", + "comment": "마켓과 유저 사이의 미션", + "columnIds": [ + "ReQt_SxQicmPN6FInTteO", + "db5bXfLzqmyQYh_JjRPiy", + "bUJ9zMEJqs9SvY5IKsqc6", + "9WTFvYP-wRigq5OnVHaBt" + ], + "seqColumnIds": [ + "ReQt_SxQicmPN6FInTteO", + "db5bXfLzqmyQYh_JjRPiy", + "aI9MAW7Hiyy_vI2M7Pm0-", + "8rJpsU0PXxwff0XAgxqMm", + "SBNOyYuMRXvVKFCbagHDJ", + "bUJ9zMEJqs9SvY5IKsqc6", + "9WTFvYP-wRigq5OnVHaBt", + "ldych5z2WqoYn7KrDYRkC" + ], + "ui": { + "x": 1492, + "y": 832, + "zIndex": 29, + "widthName": 60, + "widthComment": 132, + "color": "" + }, + "meta": { + "updateAt": 1758522109141, + "createAt": 1758383411510 + } + }, + "fF0hgBzZeatjUrv0tbY6I": { + "id": "fF0hgBzZeatjUrv0tbY6I", + "name": "", + "comment": "", + "columnIds": [], + "seqColumnIds": [], + "ui": { + "x": 200, + "y": 110, + "zIndex": 291, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758385063879, + "createAt": 1758385063879 + } + }, + "P7FiH9nZLSpro47ZFRs82": { + "id": "P7FiH9nZLSpro47ZFRs82", + "name": "review_image", + "comment": "리뷰에 쓰이는 이미지들", + "columnIds": [ + "46mPj-jrSqP7EJVOWDkx6", + "TuNRq7Dmvw9HkKmJzmHyA", + "JpL2_wJdOTerJ5aBqveT3" + ], + "seqColumnIds": [ + "46mPj-jrSqP7EJVOWDkx6", + "TuNRq7Dmvw9HkKmJzmHyA", + "JpL2_wJdOTerJ5aBqveT3" + ], + "ui": { + "x": 778, + "y": 77, + "zIndex": 365, + "widthName": 74, + "widthComment": 129, + "color": "" + }, + "meta": { + "updateAt": 1758452632100, + "createAt": 1758385868614 + } + }, + "rg9wZvwotSRlkEuHNiT-a": { + "id": "rg9wZvwotSRlkEuHNiT-a", + "name": "a", + "comment": "", + "columnIds": [], + "seqColumnIds": [], + "ui": { + "x": 158, + "y": 145, + "zIndex": 447, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758453350856, + "createAt": 1758453328467 + } + }, + "GNTqlOzVMcjrNhTKrLaOf": { + "id": "GNTqlOzVMcjrNhTKrLaOf", + "name": "", + "comment": "", + "columnIds": [], + "seqColumnIds": [], + "ui": { + "x": 229, + "y": 771, + "zIndex": 448, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758471120574, + "createAt": 1758471113180 + } + }, + "XWcAkkKP3pemRFkafGh7s": { + "id": "XWcAkkKP3pemRFkafGh7s", + "name": "", + "comment": "", + "columnIds": [], + "seqColumnIds": [], + "ui": { + "x": 200, + "y": 102, + "zIndex": 374, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758520909487, + "createAt": 1758520909487 + } + }, + "BrlSmoR0vOA5wp7DxG5we": { + "id": "BrlSmoR0vOA5wp7DxG5we", + "name": "permission_mission", + "comment": "", + "columnIds": [ + "D831T8cqOSlCjjniUaDc2", + "Zl7soLlH7_f8dROOoajF6", + "7uVQuguLC9lssgHo5xhLG" + ], + "seqColumnIds": [ + "D831T8cqOSlCjjniUaDc2", + "Zl7soLlH7_f8dROOoajF6", + "CkI_d-LBnoNOjBGw3ay_0", + "7uVQuguLC9lssgHo5xhLG" + ], + "ui": { + "x": 693, + "y": 848, + "zIndex": 378, + "widthName": 105, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758522022162, + "createAt": 1758520950080 + } + }, + "0JvjupyrC_HXBhFN_shc4": { + "id": "0JvjupyrC_HXBhFN_shc4", + "name": "review_alram", + "comment": "리뷰해주세용", + "columnIds": [ + "_bry5dwUtsSl6H9ydBcm1", + "bHXNv5MX53K6nr7N3Q8eK", + "xUscWzzz5Gz5EdHQRfk_N", + "zpzXrlmb7ooqirK9DmIXM" + ], + "seqColumnIds": [ + "_bry5dwUtsSl6H9ydBcm1", + "bHXNv5MX53K6nr7N3Q8eK", + "xUscWzzz5Gz5EdHQRfk_N", + "zpzXrlmb7ooqirK9DmIXM" + ], + "ui": { + "x": 766.2355, + "y": 592.1762, + "zIndex": 401, + "widthName": 71, + "widthComment": 74, + "color": "" + }, + "meta": { + "updateAt": 1758523203551, + "createAt": 1758521232356 + } + }, + "spDJoG67LKxqns5k01Sw8": { + "id": "spDJoG67LKxqns5k01Sw8", + "name": "food", + "comment": "푸드카테고리", + "columnIds": [ + "hxvxT750NkNHHEtYpUicL", + "s7jRm5AKMPwQqU88tFn6B" + ], + "seqColumnIds": [ + "hxvxT750NkNHHEtYpUicL", + "s7jRm5AKMPwQqU88tFn6B" + ], + "ui": { + "x": 79.9999, + "y": 209.2066, + "zIndex": 487, + "widthName": 60, + "widthComment": 74, + "color": "" + }, + "meta": { + "updateAt": 1758522508144, + "createAt": 1758522257974 + } + }, + "gb4iYsr3YyVUrKqBUXFw4": { + "id": "gb4iYsr3YyVUrKqBUXFw4", + "name": "favorate_food", + "comment": "선호음식", + "columnIds": [ + "tVkpMHG_0E5JLY_yJf3c9", + "MbXpR0Vw0Si2O1rM9QRbA", + "TgQ6AVIBficrVrE_W4Sk2" + ], + "seqColumnIds": [ + "tVkpMHG_0E5JLY_yJf3c9", + "MbXpR0Vw0Si2O1rM9QRbA", + "TgQ6AVIBficrVrE_W4Sk2" + ], + "ui": { + "x": 67.0591, + "y": 491.5598, + "zIndex": 530, + "widthName": 75, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758522510966, + "createAt": 1758522378614 + } + }, + "yoRJ0I0phZM05vvjpplpG": { + "id": "yoRJ0I0phZM05vvjpplpG", + "name": "mission+user", + "comment": "신규 미션 받아라 유저!", + "columnIds": [ + "zVhoZPYp_b61QSqtMvvQq", + "qOaGuBBg_Wfz0JKwfaKUe", + "8U14FBzF_FqWWddLVhfeB", + "zJlYvdBeyNcIvgcKSBk4w" + ], + "seqColumnIds": [ + "zVhoZPYp_b61QSqtMvvQq", + "qOaGuBBg_Wfz0JKwfaKUe", + "8U14FBzF_FqWWddLVhfeB", + "zJlYvdBeyNcIvgcKSBk4w" + ], + "ui": { + "x": 721.1765, + "y": 1039.7949, + "zIndex": 581, + "widthName": 73, + "widthComment": 123, + "color": "" + }, + "meta": { + "updateAt": 1758528597424, + "createAt": 1758523047319 + } + }, + "rDtD8_KsF_UXR7P4hrBJt": { + "id": "rDtD8_KsF_UXR7P4hrBJt", + "name": "", + "comment": "", + "columnIds": [], + "seqColumnIds": [], + "ui": { + "x": 58.823529411764696, + "y": 185.67729411764702, + "zIndex": 590, + "widthName": 60, + "widthComment": 60, + "color": "" + }, + "meta": { + "updateAt": 1758523083601, + "createAt": 1758523083601 + } + } + }, + "tableColumnEntities": { + "HZU82lNKDOrgajhOG536V": { + "id": "HZU82lNKDOrgajhOG536V", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "id", + "comment": "고유식별자임", + "dataType": "INTEGER", + "default": "", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 74, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758064848008, + "createAt": 1758064781776 + } + }, + "t_RLBWhrZFUxlJ5bjRnfk": { + "id": "t_RLBWhrZFUxlJ5bjRnfk", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "name", + "comment": "있어야함", + "dataType": "VARCHAR", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758064876275, + "createAt": 1758064857525 + } + }, + "0kcH_8Z8tm3Ga1etxwa8U": { + "id": "0kcH_8Z8tm3Ga1etxwa8U", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "kakao", + "comment": "디폴트는 false", + "dataType": "BOOLEAN", + "default": "false", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 77, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758064966134, + "createAt": 1758064876276 + } + }, + "C4drmy-Oz1fH_pvwRy2ya": { + "id": "C4drmy-Oz1fH_pvwRy2ya", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "", + "comment": "", + "dataType": "", + "default": "", + "options": 0, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758065019725, + "createAt": 1758065009459 + } + }, + "9MBWULvb4IO29t17QfULg": { + "id": "9MBWULvb4IO29t17QfULg", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "create_time", + "comment": "생성시간", + "dataType": "DATETIME(6)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 63, + "widthComment": 60, + "widthDataType": 69, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758065275286, + "createAt": 1758065274645 + } + }, + "4tkb0skf9LlAChFmM0d2q": { + "id": "4tkb0skf9LlAChFmM0d2q", + "tableId": "XWGdk108BNIBTS4E5LyA-", + "name": "update_time", + "comment": "업데이트 타임", + "dataType": "DATETIME(6)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 68, + "widthComment": 77, + "widthDataType": 69, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758065275286, + "createAt": 1758065275286 + } + }, + "Gh8Azk72nGvgic4QJ8XZ4": { + "id": "Gh8Azk72nGvgic4QJ8XZ4", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758385536289, + "createAt": 1758383453193 + } + }, + "sRdypptEf1G5rSsm6FX6g": { + "id": "sRdypptEf1G5rSsm6FX6g", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "name", + "comment": "이름임", + "dataType": "VARCHAR(20)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758383677590, + "createAt": 1758383651007 + } + }, + "k5QSZS8WtQ23EvpJsMuyy": { + "id": "k5QSZS8WtQ23EvpJsMuyy", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "gender", + "comment": "남자0,여자1, 제삼의 성(?)3", + "dataType": "INTEGER", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 142, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384280668, + "createAt": 1758383677591 + } + }, + "4I1ptgrrjPfZ7kwaNL-gI": { + "id": "4I1ptgrrjPfZ7kwaNL-gI", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "birth", + "comment": "8자리", + "dataType": "DATETIME", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384114992, + "createAt": 1758383799994 + } + }, + "9YJk76nhsU2pQJHAgGuCQ": { + "id": "9YJk76nhsU2pQJHAgGuCQ", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "address", + "comment": "주소", + "dataType": "VARCHAR(50)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384111863, + "createAt": 1758383858077 + } + }, + "VT6dpeOGqyA1I7KQ6b4mK": { + "id": "VT6dpeOGqyA1I7KQ6b4mK", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "email", + "comment": "로그인할때 이메일(유니크 속성주기)", + "dataType": "VARCHAR(50)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 196, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384244390, + "createAt": 1758383923497 + } + }, + "R09EvHSVhLqVeSYQg8Dqa": { + "id": "R09EvHSVhLqVeSYQg8Dqa", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "password", + "comment": "8자리이상 영문 숫자 특수문자 조합하셈", + "dataType": "VARCHAR(30)", + "default": "", + "options": 0, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 214, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384159973, + "createAt": 1758384128863 + } + }, + "Zq1avcoEnaVsfbppogJ44": { + "id": "Zq1avcoEnaVsfbppogJ44", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "id", + "comment": "가게 id", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758384854893, + "createAt": 1758384260781 + } + }, + "I-JEAuVy-GEHNuhd_R1Fl": { + "id": "I-JEAuVy-GEHNuhd_R1Fl", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "name", + "comment": "상호명(유니크는 아님)", + "dataType": "VARCHAR(40)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 121, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384675963, + "createAt": 1758384515354 + } + }, + "sqis3p25lk_He3rwnCuDc": { + "id": "sqis3p25lk_He3rwnCuDc", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "address", + "comment": "가게주소", + "dataType": "VARCHAR(50)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384684669, + "createAt": 1758384640113 + } + }, + "O0ry03x6NOpDvBTK0CMbb": { + "id": "O0ry03x6NOpDvBTK0CMbb", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "open", + "comment": "영업중이냐?", + "dataType": "BOOLEAN", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 67, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384720579, + "createAt": 1758384684669 + } + }, + "frGgeCTDN_R-BO-pHTIZU": { + "id": "frGgeCTDN_R-BO-pHTIZU", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "star", + "comment": "", + "dataType": "FLOAT", + "default": "0", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384751181, + "createAt": 1758384724228 + } + }, + "qQ4TPs1xEDtsaN2F69b8n": { + "id": "qQ4TPs1xEDtsaN2F69b8n", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "mission", + "comment": "", + "dataType": "", + "default": "", + "options": 0, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384908134, + "createAt": 1758384888313 + } + }, + "5rLifUB24BKsa7wxaS7UE": { + "id": "5rLifUB24BKsa7wxaS7UE", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "id", + "comment": "가게 id", + "dataType": "long", + "default": "autoincrement", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758384978019, + "createAt": 1758384978019 + } + }, + "g3rYiPsqjN477uVH0qkLg": { + "id": "g3rYiPsqjN477uVH0qkLg", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "", + "comment": "", + "dataType": "", + "default": "", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384989514, + "createAt": 1758384989514 + } + }, + "rWUlSO-Zx2_CzblYkScil": { + "id": "rWUlSO-Zx2_CzblYkScil", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "", + "comment": "", + "dataType": "", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758384989952, + "createAt": 1758384989952 + } + }, + "r2POd-u5Q9w3HwIM7oZpS": { + "id": "r2POd-u5Q9w3HwIM7oZpS", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "market_id", + "comment": "가게 id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758385507835, + "createAt": 1758385052865 + } + }, + "VbAABiEWDtaW-BR5OX5e7": { + "id": "VbAABiEWDtaW-BR5OX5e7", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758385488940, + "createAt": 1758385081817 + } + }, + "icCcVDsFAlzlq4FjE0ubK": { + "id": "icCcVDsFAlzlq4FjE0ubK", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "id", + "comment": "리뷰 고유(id)", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 71, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758385549054, + "createAt": 1758385470718 + } + }, + "K2GSuWKKwoSYl0WoAcju0": { + "id": "K2GSuWKKwoSYl0WoAcju0", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "content", + "comment": "리뷰내용", + "dataType": "VARCHAR(100)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 81, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758385732751, + "createAt": 1758385622322 + } + }, + "TL3kiOfuBdtpAHnnAtq7x": { + "id": "TL3kiOfuBdtpAHnnAtq7x", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "star", + "comment": "0~5까지", + "dataType": "FLOAT", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758386182875, + "createAt": 1758385737635 + } + }, + "46mPj-jrSqP7EJVOWDkx6": { + "id": "46mPj-jrSqP7EJVOWDkx6", + "tableId": "P7FiH9nZLSpro47ZFRs82", + "name": "id", + "comment": "고유이미지_id", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 77, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758452601618, + "createAt": 1758385893212 + } + }, + "TuNRq7Dmvw9HkKmJzmHyA": { + "id": "TuNRq7Dmvw9HkKmJzmHyA", + "tableId": "P7FiH9nZLSpro47ZFRs82", + "name": "review_id", + "comment": "리뷰 고유(id)", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 71, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758386198028, + "createAt": 1758385949681 + } + }, + "cU-E1DpewiYVt3r5W3J67": { + "id": "cU-E1DpewiYVt3r5W3J67", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "content", + "comment": "가계 내용", + "dataType": "VARCHAR(200)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 81, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758386124234, + "createAt": 1758386101996 + } + }, + "JpL2_wJdOTerJ5aBqveT3": { + "id": "JpL2_wJdOTerJ5aBqveT3", + "tableId": "P7FiH9nZLSpro47ZFRs82", + "name": "url", + "comment": "이미지 uri", + "dataType": "VARCHAR(200)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 81, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758386311629, + "createAt": 1758386284163 + } + }, + "aI9MAW7Hiyy_vI2M7Pm0-": { + "id": "aI9MAW7Hiyy_vI2M7Pm0-", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "market_id", + "comment": "가게 id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758452704017, + "createAt": 1758452663070 + } + }, + "8rJpsU0PXxwff0XAgxqMm": { + "id": "8rJpsU0PXxwff0XAgxqMm", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758452706979, + "createAt": 1758452672201 + } + }, + "ReQt_SxQicmPN6FInTteO": { + "id": "ReQt_SxQicmPN6FInTteO", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "id", + "comment": "고유미션_id", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 65, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758452735615, + "createAt": 1758452682271 + } + }, + "SBNOyYuMRXvVKFCbagHDJ": { + "id": "SBNOyYuMRXvVKFCbagHDJ", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "identifyed_number", + "comment": "고유 미션 번호(서로 확인 절차)", + "dataType": "long", + "default": "autoincrement", + "options": 8, + "ui": { + "keys": 0, + "widthName": 101, + "widthComment": 166, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758452829093, + "createAt": 1758452765615 + } + }, + "TdPHSn_WW5ipoJJugiMDr": { + "id": "TdPHSn_WW5ipoJJugiMDr", + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "name": "point", + "comment": "총 point", + "dataType": "INTEGER", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758453236942, + "createAt": 1758453214516 + } + }, + "bUJ9zMEJqs9SvY5IKsqc6": { + "id": "bUJ9zMEJqs9SvY5IKsqc6", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "content", + "comment": "미션내용", + "dataType": "VARCHAR(100)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 81, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758453268496, + "createAt": 1758453244654 + } + }, + "9WTFvYP-wRigq5OnVHaBt": { + "id": "9WTFvYP-wRigq5OnVHaBt", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "mission_point", + "comment": "미션포인트", + "dataType": "INTEGER", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 75, + "widthComment": 62, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758453321214, + "createAt": 1758453268497 + } + }, + "Zl7soLlH7_f8dROOoajF6": { + "id": "Zl7soLlH7_f8dROOoajF6", + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758521084219, + "createAt": 1758521025058 + } + }, + "D831T8cqOSlCjjniUaDc2": { + "id": "D831T8cqOSlCjjniUaDc2", + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "name": "id", + "comment": "유저 미션할당번호(이거 사장님한테 보여주면 댐)", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 262, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758523290544, + "createAt": 1758521079088 + } + }, + "CkI_d-LBnoNOjBGw3ay_0": { + "id": "CkI_d-LBnoNOjBGw3ay_0", + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "name": "mission_id", + "comment": "고유미션_id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 65, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758521317800, + "createAt": 1758521244136 + } + }, + "dUWHJDNXCbHc3eEVauegi": { + "id": "dUWHJDNXCbHc3eEVauegi", + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "name": "id", + "comment": "리뷰 고유(id)", + "dataType": "long", + "default": "autoincrement", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 71, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758521399180, + "createAt": 1758521399180 + } + }, + "CVbY3U1IRbHYIv2_ABSi8": { + "id": "CVbY3U1IRbHYIv2_ABSi8", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "market_id", + "comment": "가게 id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758521495607, + "createAt": 1758521413946 + } + }, + "r28FAr4NRktLF6jeinkQI": { + "id": "r28FAr4NRktLF6jeinkQI", + "tableId": "U1KhhqX8xZco_6X76lUUF", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758521503092, + "createAt": 1758521432311 + } + }, + "db5bXfLzqmyQYh_JjRPiy": { + "id": "db5bXfLzqmyQYh_JjRPiy", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "market_id", + "comment": "가게 id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522105219, + "createAt": 1758521673578 + } + }, + "7uVQuguLC9lssgHo5xhLG": { + "id": "7uVQuguLC9lssgHo5xhLG", + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "name": "mission_id", + "comment": "고유미션_id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 65, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522009610, + "createAt": 1758521996327 + } + }, + "ldych5z2WqoYn7KrDYRkC": { + "id": "ldych5z2WqoYn7KrDYRkC", + "tableId": "eOdf64btd3jXZ3odam357", + "name": "point", + "comment": "", + "dataType": "INTEGER", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522098199, + "createAt": 1758522087155 + } + }, + "hxvxT750NkNHHEtYpUicL": { + "id": "hxvxT750NkNHHEtYpUicL", + "tableId": "spDJoG67LKxqns5k01Sw8", + "name": "id", + "comment": "음식 카테고리를 정하고 함", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 144, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758522355077, + "createAt": 1758522293697 + } + }, + "s7jRm5AKMPwQqU88tFn6B": { + "id": "s7jRm5AKMPwQqU88tFn6B", + "tableId": "spDJoG67LKxqns5k01Sw8", + "name": "name", + "comment": "음식카테고리 이름", + "dataType": "VARCHAR(40)", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 101, + "widthDataType": 75, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522377137, + "createAt": 1758522326861 + } + }, + "MbXpR0Vw0Si2O1rM9QRbA": { + "id": "MbXpR0Vw0Si2O1rM9QRbA", + "tableId": "gb4iYsr3YyVUrKqBUXFw4", + "name": "food_id", + "comment": "음식 카테고리를 정하고 함", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 144, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522487576, + "createAt": 1758522454178 + } + }, + "TgQ6AVIBficrVrE_W4Sk2": { + "id": "TgQ6AVIBficrVrE_W4Sk2", + "tableId": "gb4iYsr3YyVUrKqBUXFw4", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522485448, + "createAt": 1758522460392 + } + }, + "tVkpMHG_0E5JLY_yJf3c9": { + "id": "tVkpMHG_0E5JLY_yJf3c9", + "tableId": "gb4iYsr3YyVUrKqBUXFw4", + "name": "id", + "comment": "유저선호음식코드", + "dataType": "long", + "default": "", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 98, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758522500384, + "createAt": 1758522474856 + } + }, + "bHXNv5MX53K6nr7N3Q8eK": { + "id": "bHXNv5MX53K6nr7N3Q8eK", + "tableId": "0JvjupyrC_HXBhFN_shc4", + "name": "user_id", + "comment": "가게 id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523147397, + "createAt": 1758523031524 + } + }, + "xUscWzzz5Gz5EdHQRfk_N": { + "id": "xUscWzzz5Gz5EdHQRfk_N", + "tableId": "0JvjupyrC_HXBhFN_shc4", + "name": "foodmarket_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 79, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523157435, + "createAt": 1758523036391 + } + }, + "zVhoZPYp_b61QSqtMvvQq": { + "id": "zVhoZPYp_b61QSqtMvvQq", + "tableId": "yoRJ0I0phZM05vvjpplpG", + "name": "id", + "comment": "", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758523291783, + "createAt": 1758523066388 + } + }, + "qOaGuBBg_Wfz0JKwfaKUe": { + "id": "qOaGuBBg_Wfz0JKwfaKUe", + "tableId": "yoRJ0I0phZM05vvjpplpG", + "name": "mission_id", + "comment": "고유미션_id", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 65, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523183284, + "createAt": 1758523081911 + } + }, + "8U14FBzF_FqWWddLVhfeB": { + "id": "8U14FBzF_FqWWddLVhfeB", + "tableId": "yoRJ0I0phZM05vvjpplpG", + "name": "user_id", + "comment": "유저 (id)db내에서의 불변고유식별자", + "dataType": "long", + "default": "", + "options": 8, + "ui": { + "keys": 2, + "widthName": 60, + "widthComment": 196, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523185505, + "createAt": 1758523093065 + } + }, + "_bry5dwUtsSl6H9ydBcm1": { + "id": "_bry5dwUtsSl6H9ydBcm1", + "tableId": "0JvjupyrC_HXBhFN_shc4", + "name": "id", + "comment": "", + "dataType": "long", + "default": "autoincrement", + "options": 10, + "ui": { + "keys": 1, + "widthName": 60, + "widthComment": 60, + "widthDataType": 60, + "widthDefault": 79 + }, + "meta": { + "updateAt": 1758523141535, + "createAt": 1758523099958 + } + }, + "zpzXrlmb7ooqirK9DmIXM": { + "id": "zpzXrlmb7ooqirK9DmIXM", + "tableId": "0JvjupyrC_HXBhFN_shc4", + "name": "content", + "comment": "알람내용(리뷰관련 내용)", + "dataType": "VARCHAR", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 133, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523238236, + "createAt": 1758523203551 + } + }, + "zJlYvdBeyNcIvgcKSBk4w": { + "id": "zJlYvdBeyNcIvgcKSBk4w", + "tableId": "yoRJ0I0phZM05vvjpplpG", + "name": "content", + "comment": "새 미션에 대한 내용", + "dataType": "VARCHAR", + "default": "", + "options": 8, + "ui": { + "keys": 0, + "widthName": 60, + "widthComment": 108, + "widthDataType": 60, + "widthDefault": 60 + }, + "meta": { + "updateAt": 1758523270003, + "createAt": 1758523247840 + } + } + }, + "relationshipEntities": { + "8Z53qVGZIj6OhsaZ9vGMf": { + "id": "8Z53qVGZIj6OhsaZ9vGMf", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1143, + "y": 242, + "direction": 1 + }, + "end": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "5rLifUB24BKsa7wxaS7UE" + ], + "x": 1073, + "y": 166, + "direction": 2 + }, + "meta": { + "updateAt": 1758384978019, + "createAt": 1758384978019 + } + }, + "0WvFCow4O2GNAcz8b4Dql": { + "id": "0WvFCow4O2GNAcz8b4Dql", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "g3rYiPsqjN477uVH0qkLg" + ], + "x": 1073, + "y": 178, + "direction": 2 + }, + "end": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "rWUlSO-Zx2_CzblYkScil" + ], + "x": 1143, + "y": 254, + "direction": 1 + }, + "meta": { + "updateAt": 1758384989952, + "createAt": 1758384989952 + } + }, + "d8XK9y1W2Y2Sm6T5bJTST": { + "id": "d8XK9y1W2Y2Sm6T5bJTST", + "identification": false, + "relationshipType": 16, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1469, + "y": 462, + "direction": 1 + }, + "end": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "r2POd-u5Q9w3HwIM7oZpS" + ], + "x": 1260, + "y": 451, + "direction": 2 + }, + "meta": { + "updateAt": 1758385052865, + "createAt": 1758385052865 + } + }, + "eiWfcJs5w-HFv5PEUBniY": { + "id": "eiWfcJs5w-HFv5PEUBniY", + "identification": false, + "relationshipType": 16, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 620, + "y": 789, + "direction": 2 + }, + "end": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "VbAABiEWDtaW-BR5OX5e7" + ], + "x": 719, + "y": 451, + "direction": 1 + }, + "meta": { + "updateAt": 1758385081817, + "createAt": 1758385081817 + } + }, + "95LGlwc5ro-THdZsaS9E_": { + "id": "95LGlwc5ro-THdZsaS9E_", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "icCcVDsFAlzlq4FjE0ubK" + ], + "x": 989.5, + "y": 363, + "direction": 4 + }, + "end": { + "tableId": "P7FiH9nZLSpro47ZFRs82", + "columnIds": [ + "TuNRq7Dmvw9HkKmJzmHyA" + ], + "x": 989, + "y": 205, + "direction": 8 + }, + "meta": { + "updateAt": 1758385949681, + "createAt": 1758385949681 + } + }, + "AhYoCwpMoUZjKuaTsV67y": { + "id": "AhYoCwpMoUZjKuaTsV67y", + "identification": false, + "relationshipType": 16, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1702, + "y": 563, + "direction": 8 + }, + "end": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "aI9MAW7Hiyy_vI2M7Pm0-" + ], + "x": 1745.5, + "y": 837, + "direction": 4 + }, + "meta": { + "updateAt": 1758452663071, + "createAt": 1758452663071 + } + }, + "bHRhHIOth5vgHKEWcIqCg": { + "id": "bHRhHIOth5vgHKEWcIqCg", + "identification": false, + "relationshipType": 16, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 545, + "y": 526, + "direction": 2 + }, + "end": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "8rJpsU0PXxwff0XAgxqMm" + ], + "x": 742, + "y": 688, + "direction": 1 + }, + "meta": { + "updateAt": 1758452672201, + "createAt": 1758452672201 + } + }, + "-CCfH3cvSxvdbUzVIjRqx": { + "id": "-CCfH3cvSxvdbUzVIjRqx", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 590.9412, + "y": 870.9412, + "direction": 2 + }, + "end": { + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "columnIds": [ + "Zl7soLlH7_f8dROOoajF6" + ], + "x": 693, + "y": 912, + "direction": 1 + }, + "meta": { + "updateAt": 1758521025059, + "createAt": 1758521025059 + } + }, + "MBnlvlcsZqkaQ8PYk26m1": { + "id": "MBnlvlcsZqkaQ8PYk26m1", + "identification": false, + "relationshipType": 2, + "startRelationshipType": 2, + "start": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "ReQt_SxQicmPN6FInTteO" + ], + "x": 1533, + "y": 913, + "direction": 1 + }, + "end": { + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "columnIds": [ + "CkI_d-LBnoNOjBGw3ay_0" + ], + "x": 1260, + "y": 912, + "direction": 2 + }, + "meta": { + "updateAt": 1758521244136, + "createAt": 1758521244136 + } + }, + "TZyzCxNXZSBj2H19VgZBh": { + "id": "TZyzCxNXZSBj2H19VgZBh", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "icCcVDsFAlzlq4FjE0ubK" + ], + "x": 1260, + "y": 451, + "direction": 2 + }, + "end": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "dUWHJDNXCbHc3eEVauegi" + ], + "x": 1469, + "y": 474, + "direction": 1 + }, + "meta": { + "updateAt": 1758521399180, + "createAt": 1758521399180 + } + }, + "3NAwaUh04XxCu9WtiJZGQ": { + "id": "3NAwaUh04XxCu9WtiJZGQ", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1469, + "y": 407, + "direction": 1 + }, + "end": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "CVbY3U1IRbHYIv2_ABSi8" + ], + "x": 1260, + "y": 451, + "direction": 2 + }, + "meta": { + "updateAt": 1758521413946, + "createAt": 1758521413946 + } + }, + "hsUPR9Uagl9UsCj3_v7-D": { + "id": "hsUPR9Uagl9UsCj3_v7-D", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 590.9412, + "y": 746.9412, + "direction": 2 + }, + "end": { + "tableId": "U1KhhqX8xZco_6X76lUUF", + "columnIds": [ + "r28FAr4NRktLF6jeinkQI" + ], + "x": 719, + "y": 451, + "direction": 1 + }, + "meta": { + "updateAt": 1758521432311, + "createAt": 1758521432311 + } + }, + "TaYFbfPGvec7SZetfjcbm": { + "id": "TaYFbfPGvec7SZetfjcbm", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1702, + "y": 539, + "direction": 8 + }, + "end": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "db5bXfLzqmyQYh_JjRPiy" + ], + "x": 1704.5, + "y": 832, + "direction": 4 + }, + "meta": { + "updateAt": 1758521673578, + "createAt": 1758521673578 + } + }, + "nrUSGKD4XjLLYG8gtNeX0": { + "id": "nrUSGKD4XjLLYG8gtNeX0", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "ReQt_SxQicmPN6FInTteO" + ], + "x": 1492, + "y": 870, + "direction": 1 + }, + "end": { + "tableId": "BrlSmoR0vOA5wp7DxG5we", + "columnIds": [ + "7uVQuguLC9lssgHo5xhLG" + ], + "x": 1279, + "y": 912, + "direction": 2 + }, + "meta": { + "updateAt": 1758521996327, + "createAt": 1758521996327 + } + }, + "rRR3UlrXRccW3-FvusZwo": { + "id": "rRR3UlrXRccW3-FvusZwo", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "spDJoG67LKxqns5k01Sw8", + "columnIds": [ + "hxvxT750NkNHHEtYpUicL" + ], + "x": 321.4999, + "y": 313.2066, + "direction": 8 + }, + "end": { + "tableId": "gb4iYsr3YyVUrKqBUXFw4", + "columnIds": [ + "MbXpR0Vw0Si2O1rM9QRbA" + ], + "x": 317.5591, + "y": 491.5598, + "direction": 4 + }, + "meta": { + "updateAt": 1758522454179, + "createAt": 1758522454179 + } + }, + "lF_M2fq7NZ-MM9bQ_QFa9": { + "id": "lF_M2fq7NZ-MM9bQ_QFa9", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 314.4412, + "y": 715.9412, + "direction": 4 + }, + "end": { + "tableId": "gb4iYsr3YyVUrKqBUXFw4", + "columnIds": [ + "TgQ6AVIBficrVrE_W4Sk2" + ], + "x": 317.5591, + "y": 619.5598, + "direction": 8 + }, + "meta": { + "updateAt": 1758522460392, + "createAt": 1758522460392 + } + }, + "Zh4XQbVDVYrT3m77ypVoQ": { + "id": "Zh4XQbVDVYrT3m77ypVoQ", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "jAhMpDau6eAWbR8ifxIk7", + "columnIds": [ + "Zq1avcoEnaVsfbppogJ44" + ], + "x": 1469, + "y": 495, + "direction": 1 + }, + "end": { + "tableId": "0JvjupyrC_HXBhFN_shc4", + "columnIds": [ + "bHXNv5MX53K6nr7N3Q8eK" + ], + "x": 1305.2355, + "y": 668.1762, + "direction": 2 + }, + "meta": { + "updateAt": 1758523031524, + "createAt": 1758523031524 + } + }, + "28vE14zEXeDiQ9WZAlOgr": { + "id": "28vE14zEXeDiQ9WZAlOgr", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 590.9412, + "y": 808.9412, + "direction": 2 + }, + "end": { + "tableId": "0JvjupyrC_HXBhFN_shc4", + "columnIds": [ + "xUscWzzz5Gz5EdHQRfk_N" + ], + "x": 766.2355, + "y": 668.1762, + "direction": 1 + }, + "meta": { + "updateAt": 1758523036392, + "createAt": 1758523036392 + } + }, + "Fl9pEIK2AlrkViNySHsbU": { + "id": "Fl9pEIK2AlrkViNySHsbU", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "eOdf64btd3jXZ3odam357", + "columnIds": [ + "ReQt_SxQicmPN6FInTteO" + ], + "x": 1492, + "y": 946, + "direction": 1 + }, + "end": { + "tableId": "yoRJ0I0phZM05vvjpplpG", + "columnIds": [ + "qOaGuBBg_Wfz0JKwfaKUe" + ], + "x": 1241.1765, + "y": 1115.7949, + "direction": 2 + }, + "meta": { + "updateAt": 1758523081911, + "createAt": 1758523081911 + } + }, + "75cGtrFxrlxv8h9HNbs_x": { + "id": "75cGtrFxrlxv8h9HNbs_x", + "identification": false, + "relationshipType": 4, + "startRelationshipType": 2, + "start": { + "tableId": "1h1BgNxEvKkk6gEY5CMPg", + "columnIds": [ + "Gh8Azk72nGvgic4QJ8XZ4" + ], + "x": 590.9412, + "y": 932.9412, + "direction": 2 + }, + "end": { + "tableId": "yoRJ0I0phZM05vvjpplpG", + "columnIds": [ + "8U14FBzF_FqWWddLVhfeB" + ], + "x": 721.1765, + "y": 1115.7949, + "direction": 1 + }, + "meta": { + "updateAt": 1758523093065, + "createAt": 1758523093065 + } + } + }, + "indexEntities": {}, + "indexColumnEntities": {}, + "memoEntities": {} + } +} \ No newline at end of file diff --git a/week1/ex1.sql b/week1/ex1.sql new file mode 100644 index 0000000..f0eff4f --- /dev/null +++ b/week1/ex1.sql @@ -0,0 +1,20 @@ +select * from review where review.market_id=”점포id”; +select (유저란에 있는 관련정보)from user where=(여기에 로그인 인증때 쓴 id값을 넣어줘야함) +select (선택할 정보)from permission_mission as p inner join mission as m on p.mission_id=m.id inner join food_market as f on m.market_id=f.id where p.user_id=”유저아이디” +limit 10 : 20 (대충 한페이지에 10개씩 담아서 조회하고 지금은 3페이지임; +홈 화면 쿼리(현재 선택 된 지역에서 도전이 가능한 미션 목록, 페이징 포함) 만약에 foodmarket테이블에 위치정보가 있다면 (거리 계산은 단순 차로 계산함) +select(정보들) from food_market as f join mission as m on f.id= m.mission_id +where foodmarket.distance<3 + +limit 10 : 20 (대충 한페이지에 10개씩 담아서 조회하고 지금은 3페이지임 +select (선택할 정보) +from permission_mission as p +inner join mission as m on p.mission_id=m.id +inner join food_market as f on m.market_id=f.id +where p.user_id=”유저아이디” +AND ( + points < :p + OR (m .points = :p AND m.created_at < :t) + OR (m.points = :p AND m.created_at = :t AND m.id < :m.id) + ) +order by m.point m.created_at diff --git a/week1/workbook.txt b/week1/workbook.txt new file mode 100644 index 0000000..ed8baf8 --- /dev/null +++ b/week1/workbook.txt @@ -0,0 +1,25 @@ +- [ ] 다양한 트랜젝션 상태와, 트랜젝션 전파에 대해 조사해주세요! + - acid의 i의 상태는 + + + + ![image.png](attachment:d296fec7-dfa8-47ad-9d3d-79fb98c3253f:image.png) + + +이렇게 되고 serializable로 갈수록 격리성이 높아져서 공유 데이터가 안전해 집니다. + +- [ ] 함수 기반 인덱스와 복합 인덱스에 대해 조사하고, +성능상 이점과 단점을 적어주세요! + - 인덱스는 보통 select 시에 데이터를 빠르게 찾기위함이 주 목적인데 이때 찾는 조건 where절을 잘 볼 필요가 있다 우리가 where절의 조건을 기본키로 했으면 큰 문제가 없겠지만 만약 함수식조건, 복합컬럼으로 조회했을때는 문제가 되기에 이를 해결하기 위한것이 + - 함수기반 인덱스와 복합 인덱스이다. + - 함수기반 인덱스는 abs(a,b)자체 계산값들을 인덱스로 저장하고 복합 인덱스는 CREATE INDEX idx_user_name_age ON users(name, age); 처럼 키를 묶어서 저장해 놓는다. + +함수기반 장단점 + +장점: where절에서 함수기반 서칭을 해도 빠르게 찾기가능. + +단점: 계산하고 저장해서 저장공간을 잡아먹는다. + +장점 : 복합인덱스: 복합키로 찾을때 빠른 서칭가능. + +단점 : 만약 히트 못시키면 그냥 저장공간 낭비 \ No newline at end of file From 2c826d7c6953ecf1304ab202a05e67bdb4d14e59 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 14 Oct 2025 21:29:40 +0900 Subject: [PATCH 03/30] Include week4/demo as regular folder --- .idea/.gitignore | 8 + .idea/Spring.iml | 9 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 7 + week4/demo/.gitattributes | 3 + week4/demo/.gitignore | 37 +++ week4/demo/build.gradle | 37 +++ week4/demo/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + week4/demo/gradlew | 251 ++++++++++++++++++ week4/demo/gradlew.bat | 94 +++++++ week4/demo/settings.gradle | 1 + .../com/example/demo/DemoApplication.java | 13 + .../main/java/com/example/demo/ddl/market.sql | 151 +++++++++++ .../src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + 17 files changed, 646 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/Spring.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 week4/demo/.gitattributes create mode 100644 week4/demo/.gitignore create mode 100644 week4/demo/build.gradle create mode 100644 week4/demo/gradle/wrapper/gradle-wrapper.jar create mode 100644 week4/demo/gradle/wrapper/gradle-wrapper.properties create mode 100644 week4/demo/gradlew create mode 100644 week4/demo/gradlew.bat create mode 100644 week4/demo/settings.gradle create mode 100644 week4/demo/src/main/java/com/example/demo/DemoApplication.java create mode 100644 week4/demo/src/main/java/com/example/demo/ddl/market.sql create mode 100644 week4/demo/src/main/resources/application.properties create mode 100644 week4/demo/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..c3f502a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 디폴트 무시된 파일 +/shelf/ +/workspace.xml +# 에디터 기반 HTTP 클라이언트 요청 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/Spring.iml b/.idea/Spring.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Spring.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b2041a1 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..7f2e21e --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/week4/demo/.gitattributes b/week4/demo/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/week4/demo/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/week4/demo/.gitignore b/week4/demo/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/week4/demo/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/week4/demo/build.gradle b/week4/demo/build.gradle new file mode 100644 index 0000000..3a91725 --- /dev/null +++ b/week4/demo/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'study' +version = '0.0.1-SNAPSHOT' +description = 'demo' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/week4/demo/gradle/wrapper/gradle-wrapper.jar b/week4/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 zcma&OWmKeVvL#I6?i3D%6z=Zs?ofE*?rw#G$eqJB ziT4y8-Y@s9rkH0Tz>ll(^xkcTl)CY?rS&9VNd66Yc)g^6)JcWaY(5$5gt z8gr3SBXUTN;~cBgz&})qX%#!Fxom2Yau_`&8)+6aSN7YY+pS410rRUU*>J}qL0TnJ zRxt*7QeUqTh8j)Q&iavh<}L+$Jqz))<`IfKussVk%%Ah-Ti?Eo0hQH!rK%K=#EAw0 zwq@@~XNUXRnv8$;zv<6rCRJ6fPD^hfrh;0K?n z=p!u^3xOgWZ%f3+?+>H)9+w^$Tn1e;?UpVMJb!!;f)`6f&4|8mr+g)^@x>_rvnL0< zvD0Hu_N>$(Li7|Jgu0mRh&MV+<}`~Wi*+avM01E)Jtg=)-vViQKax!GeDc!xv$^mL z{#OVBA$U{(Zr8~Xm|cP@odkHC*1R8z6hcLY#N@3E-A8XEvpt066+3t9L_6Zg6j@9Q zj$$%~yO-OS6PUVrM2s)(T4#6=JpI_@Uz+!6=GdyVU?`!F=d;8#ZB@(5g7$A0(`eqY z8_i@3w$0*es5mrSjhW*qzrl!_LQWs4?VfLmo1Sd@Ztt53+etwzAT^8ow_*7Jp`Y|l z*UgSEwvxq+FYO!O*aLf-PinZYne7Ib6ny3u>MjQz=((r3NTEeU4=-i0LBq3H-VJH< z^>1RE3_JwrclUn9vb7HcGUaFRA0QHcnE;6)hnkp%lY1UII#WPAv?-;c?YH}LWB8Nl z{sx-@Z;QxWh9fX8SxLZk8;kMFlGD3Jc^QZVL4nO)1I$zQwvwM&_!kW+LMf&lApv#< zur|EyC|U@5OQuph$TC_ZU`{!vJp`13e9alaR0Dbn5ikLFH7>eIz4QbV|C=%7)F=qo z_>M&5N)d)7G(A%c>}UCrW!Ql_6_A{?R7&CL`;!KOb3 z8Z=$YkV-IF;c7zs{3-WDEFJzuakFbd*4LWd<_kBE8~BFcv}js_2OowRNzWCtCQ6&k z{&~Me92$m*@e0ANcWKuz)?YjB*VoSTx??-3Cc0l2U!X^;Bv@m87eKHukAljrD54R+ zE;@_w4NPe1>3`i5Qy*3^E9x#VB6?}v=~qIprrrd5|DFkg;v5ixo0IsBmik8=Y;zv2 z%Bcf%NE$a44bk^`i4VwDLTbX=q@j9;JWT9JncQ!+Y%2&HHk@1~*L8-{ZpY?(-a9J-1~<1ltr9i~D9`P{XTIFWA6IG8c4;6bFw*lzU-{+?b&%OcIoCiw00n>A1ra zFPE$y@>ebbZlf(sN_iWBzQKDV zmmaLX#zK!@ZdvCANfwV}9@2O&w)!5gSgQzHdk2Q`jG6KD7S+1R5&F)j6QTD^=hq&7 zHUW+r^da^%V(h(wonR(j?BOiC!;y=%nJvz?*aW&5E87qq;2z`EI(f zBJNNSMFF9U{sR-af5{IY&AtoGcoG)Iq-S^v{7+t0>7N(KRoPj;+2N5;9o_nxIGjJ@ z7bYQK)bX)vEhy~VL%N6g^NE@D5VtV+Q8U2%{ji_=6+i^G%xeskEhH>Sqr194PJ$fB zu1y^){?9Vkg(FY2h)3ZHrw0Z<@;(gd_dtF#6y_;Iwi{yX$?asr?0N0_B*CifEi7<6 zq`?OdQjCYbhVcg+7MSgIM|pJRu~`g?g3x?Tl+V}#$It`iD1j+!x+!;wS0+2e>#g?Z z*EA^k7W{jO1r^K~cD#5pamp+o@8&yw6;%b|uiT?{Wa=4+9<}aXWUuL#ZwN1a;lQod zW{pxWCYGXdEq9qAmvAB904}?97=re$>!I%wxPV#|f#@A*Y=qa%zHlDv^yWbR03%V0 zprLP+b(#fBqxI%FiF*-n8HtH6$8f(P6!H3V^ysgd8de-N(@|K!A< z^qP}jp(RaM9kQ(^K(U8O84?D)aU(g?1S8iWwe)gqpHCaFlJxb*ilr{KTnu4_@5{K- z)n=CCeCrPHO0WHz)dDtkbZfUfVBd?53}K>C5*-wC4hpDN8cGk3lu-ypq+EYpb_2H; z%vP4@&+c2p;thaTs$dc^1CDGlPG@A;yGR5@$UEqk6p58qpw#7lc<+W(WR;(vr(D>W z#(K$vE#uBkT=*q&uaZwzz=P5mjiee6>!lV?c}QIX%ZdkO1dHg>Fa#xcGT6~}1*2m9 zkc7l3ItD6Ie~o_aFjI$Ri=C!8uF4!Ky7iG9QTrxVbsQroi|r)SAon#*B*{}TB-?=@ z8~jJs;_R2iDd!$+n$%X6FO&PYS{YhDAS+U2o4su9x~1+U3z7YN5o0qUK&|g^klZ6X zj_vrM5SUTnz5`*}Hyts9ADwLu#x_L=nv$Z0`HqN`Zo=V>OQI)fh01n~*a%01%cx%0 z4LTFVjmW+ipVQv5rYcn3;d2o4qunWUY!p+?s~X~(ost@WR@r@EuDOSs8*MT4fiP>! zkfo^!PWJJ1MHgKS2D_hc?Bs?isSDO61>ebl$U*9*QY(b=i&rp3@3GV@z>KzcZOxip z^dzA~44;R~cnhWz7s$$v?_8y-k!DZys}Q?4IkSyR!)C0j$(Gm|t#e3|QAOFaV2}36 z?dPNY;@I=FaCwylc_;~kXlZsk$_eLkNb~TIl8QQ`mmH&$*zwwR8zHU*sId)rxHu*K z;yZWa8UmCwju%aSNLwD5fBl^b0Ux1%q8YR*uG`53Mi<`5uA^Dc6Ync)J3N7;zQ*75)hf%a@{$H+%S?SGT)ks60)?6j$ zspl|4Ad6@%-r1t*$tT(en!gIXTUDcsj?28ZEzz)dH)SV3bZ+pjMaW0oc~rOPZP@g! zb9E+ndeVO_Ib9c_>{)`01^`ZS198 z)(t=+{Azi11$eu%aU7jbwuQrO`vLOixuh~%4z@mKr_Oc;F%Uq01fA)^W&y+g16e?rkLhTxV!EqC%2}sx_1u7IBq|}Be&7WI z4I<;1-9tJsI&pQIhj>FPkQV9{(m!wYYV@i5h?A0#BN2wqlEwNDIq06|^2oYVa7<~h zI_OLan0Do*4R5P=a3H9`s5*>xU}_PSztg`+2mv)|3nIy=5#Z$%+@tZnr> zLcTI!Mxa`PY7%{;KW~!=;*t)R_sl<^b>eNO@w#fEt(tPMg_jpJpW$q_DoUlkY|uo> z0-1{ouA#;t%spf*7VjkK&$QrvwUERKt^Sdo)5@?qAP)>}Y!h4(JQ!7{wIdkA+|)bv z&8hBwoX4v|+fie}iTslaBX^i*TjwO}f{V)8*!dMmRPi%XAWc8<_IqK1jUsApk)+~R zNFTCD-h>M5Y{qTQ&0#j@I@tmXGj%rzhTW5%Bkh&sSc=$Fv;M@1y!zvYG5P2(2|(&W zlcbR1{--rJ&s!rB{G-sX5^PaM@3EqWVz_y9cwLR9xMig&9gq(voeI)W&{d6j1jh&< zARXi&APWE1FQWh7eoZjuP z;vdgX>zep^{{2%hem;e*gDJhK1Hj12nBLIJoL<=0+8SVEBx7!4Ea+hBY;A1gBwvY<)tj~T=H`^?3>zeWWm|LAwo*S4Z%bDVUe z6r)CH1H!(>OH#MXFJ2V(U(qxD{4Px2`8qfFLG+=a;B^~Te_Z!r3RO%Oc#ZAHKQxV5 zRYXxZ9T2A%NVJIu5Pu7!Mj>t%YDO$T@M=RR(~mi%sv(YXVl`yMLD;+WZ{vG9(@P#e zMo}ZiK^7^h6TV%cG+;jhJ0s>h&VERs=tuZz^Tlu~%d{ZHtq6hX$V9h)Bw|jVCMudd zwZ5l7In8NT)qEPGF$VSKg&fb0%R2RnUnqa){)V(X(s0U zkCdVZe6wy{+_WhZh3qLp245Y2RR$@g-!9PjJ&4~0cFSHMUn=>dapv)hy}|y91ZWTV zCh=z*!S3_?`$&-eZ6xIXUq8RGl9oK0BJw*TdU6A`LJqX9eS3X@F)g$jLkBWFscPhR zpCv8#KeAc^y>>Y$k^=r|K(DTC}T$0#jQBOwB#@`P6~*IuW_8JxCG}J4va{ zsZzt}tt+cv7=l&CEuVtjD6G2~_Meh%p4RGuY?hSt?(sreO_F}8r7Kp$qQdvCdZnDQ zxzc*qchE*E2=WK)^oRNa>Ttj`fpvF-JZ5tu5>X1xw)J@1!IqWjq)ESBG?J|ez`-Tc zi5a}GZx|w-h%5lNDE_3ho0hEXMoaofo#Z;$8|2;EDF&*L+e$u}K=u?pb;dv$SXeQM zD-~7P0i_`Wk$#YP$=hw3UVU+=^@Kuy$>6?~gIXx636jh{PHly_a2xNYe1l60`|y!7 z(u%;ILuW0DDJ)2%y`Zc~hOALnj1~txJtcdD#o4BCT68+8gZe`=^te6H_egxY#nZH&P*)hgYaoJ^qtmpeea`35Fw)cy!w@c#v6E29co8&D9CTCl%^GV|X;SpneSXzV~LXyRn-@K0Df z{tK-nDWA!q38M1~`xUIt_(MO^R(yNY#9@es9RQbY@Ia*xHhD&=k^T+ zJi@j2I|WcgW=PuAc>hs`(&CvgjL2a9Rx zCbZyUpi8NWUOi@S%t+Su4|r&UoU|ze9SVe7p@f1GBkrjkkq)T}X%Qo1g!SQ{O{P?m z-OfGyyWta+UCXH+-+(D^%kw#A1-U;?9129at7MeCCzC{DNgO zeSqsV>W^NIfTO~4({c}KUiuoH8A*J!Cb0*sp*w-Bg@YfBIPZFH!M}C=S=S7PLLcIG zs7K77g~W)~^|+mx9onzMm0qh(f~OsDTzVmRtz=aZTllgR zGUn~_5hw_k&rll<4G=G+`^Xlnw;jNYDJz@bE?|r866F2hA9v0-8=JO3g}IHB#b`hy zA42a0>{0L7CcabSD+F7?pGbS1KMvT{@1_@k!_+Ki|5~EMGt7T%u=79F)8xEiL5!EJ zzuxQ`NBliCoJMJdwu|);zRCD<5Sf?Y>U$trQ-;xj6!s5&w=9E7)%pZ+1Nh&8nCCwM zv5>Ket%I?cxr3vVva`YeR?dGxbG@pi{H#8@kFEf0Jq6~K4>kt26*bxv=P&jyE#e$| zDJB_~imk^-z|o!2njF2hL*|7sHCnzluhJjwLQGDmC)Y9 zr9ZN`s)uCd^XDvn)VirMgW~qfn1~SaN^7vcX#K1G`==UGaDVVx$0BQnubhX|{e z^i0}>k-;BP#Szk{cFjO{2x~LjK{^Upqd&<+03_iMLp0$!6_$@TbX>8U-f*-w-ew1?`CtD_0y_Lo|PfKi52p?`5$Jzx0E8`M0 zNIb?#!K$mM4X%`Ry_yhG5k@*+n4||2!~*+&pYLh~{`~o(W|o64^NrjP?-1Lgu?iK^ zTX6u3?#$?R?N!{599vg>G8RGHw)Hx&=|g4599y}mXNpM{EPKKXB&+m?==R3GsIq?G zL5fH={=zawB(sMlDBJ+{dgb)Vx3pu>L=mDV0{r1Qs{0Pn%TpopH{m(By4;{FBvi{I z$}x!Iw~MJOL~&)p93SDIfP3x%ROjg}X{Sme#hiJ&Yk&a;iR}V|n%PriZBY8SX2*;6 z4hdb^&h;Xz%)BDACY5AUsV!($lib4>11UmcgXKWpzRL8r2Srl*9Y(1uBQsY&hO&uv znDNff0tpHlLISam?o(lOp#CmFdH<6HmA0{UwfU#Y{8M+7od8b8|B|7ZYR9f<#+V|ZSaCQvI$~es~g(Pv{2&m_rKSB2QQ zMvT}$?Ll>V+!9Xh5^iy3?UG;dF-zh~RL#++roOCsW^cZ&({6q|?Jt6`?S8=16Y{oH zp50I7r1AC1(#{b`Aq5cw>ypNggHKM9vBx!W$eYIzD!4KbLsZGr2o8>g<@inmS3*>J zx8oG((8f!ei|M@JZB`p7+n<Q}?>h249<`7xJ?u}_n;Gq(&km#1ULN87CeTO~FY zS_Ty}0TgQhV zOh3T7{{x&LSYGQfKR1PDIkP!WnfC1$l+fs@Di+d4O=eVKeF~2fq#1<8hEvpwuqcaH z4A8u~r^gnY3u6}zj*RHjk{AHhrrDqaj?|6GaVJbV%o-nATw}ASFr!f`Oz|u_QPkR# z0mDudY1dZRlk@TyQ?%Eti=$_WNFtLpSx9=S^be{wXINp%MU?a`F66LNU<c;0&ngifmP9i;bj6&hdGMW^Kf8e6ZDXbQD&$QAAMo;OQ)G zW(qlHh;}!ZP)JKEjm$VZjTs@hk&4{?@+NADuYrr!R^cJzU{kGc1yB?;7mIyAWwhbeA_l_lw-iDVi7wcFurf5 z#Uw)A@a9fOf{D}AWE%<`s1L_AwpZ?F!Vac$LYkp<#A!!`XKaDC{A%)~K#5z6>Hv@V zBEqF(D5?@6r3Pwj$^krpPDCjB+UOszqUS;b2n>&iAFcw<*im2(b3|5u6SK!n9Sg4I z0KLcwA6{Mq?p%t>aW0W!PQ>iUeYvNjdKYqII!CE7SsS&Rj)eIw-K4jtI?II+0IdGq z2WT|L3RL?;GtGgt1LWfI4Ka`9dbZXc$TMJ~8#Juv@K^1RJN@yzdLS8$AJ(>g!U9`# zx}qr7JWlU+&m)VG*Se;rGisutS%!6yybi%B`bv|9rjS(xOUIvbNz5qtvC$_JYY+c& za*3*2$RUH8p%pSq>48xR)4qsp!Q7BEiJ*`^>^6INRbC@>+2q9?x(h0bpc>GaNFi$K zPH$6!#(~{8@0QZk=)QnM#I=bDx5vTvjm$f4K}%*s+((H2>tUTf==$wqyoI`oxI7>C z&>5fe)Yg)SmT)eA(|j@JYR1M%KixxC-Eceknf-;N=jJTwKvk#@|J^&5H0c+%KxHUI z6dQbwwVx3p?X<_VRVb2fStH?HH zFR@Mp=qX%#L3XL)+$PXKV|o|#DpHAoqvj6uQKe@M-mnhCSou7Dj4YuO6^*V`m)1lf z;)@e%1!Qg$10w8uEmz{ENb$^%u}B;J7sDd zump}onoD#!l=agcBR)iG!3AF0-63%@`K9G(CzKrm$VJ{v7^O9Ps7Zej|3m= zVXlR&yW6=Y%mD30G@|tf=yC7-#L!16Q=dq&@beWgaIL40k0n% z)QHrp2Jck#evLMM1RGt3WvQ936ZC9vEje0nFMfvmOHVI+&okB_K|l-;|4vW;qk>n~ z+|kk8#`K?x`q>`(f6A${wfw9Cx(^)~tX7<#TpxR#zYG2P+FY~mG{tnEkv~d6oUQA+ z&hNTL=~Y@rF`v-RZlts$nb$3(OL1&@Y11hhL9+zUb6)SP!;CD)^GUtUpCHBE`j1te zAGud@miCVFLk$fjsrcpjsadP__yj9iEZUW{Ll7PPi<$R;m1o!&Xdl~R_v0;oDX2z^!&8}zNGA}iYG|k zmehMd1%?R)u6R#<)B)1oe9TgYH5-CqUT8N7K-A-dm3hbm_W21p%8)H{O)xUlBVb+iUR}-v5dFaCyfSd zC6Bd7=N4A@+Bna=!-l|*_(nWGDpoyU>nH=}IOrLfS+-d40&(Wo*dDB9nQiA2Tse$R z;uq{`X7LLzP)%Y9aHa4YQ%H?htkWd3Owv&UYbr5NUDAH^<l@Z0Cx%`N+B*i!!1u>D8%;Qt1$ zE5O0{-`9gdDxZ!`0m}ywH!;c{oBfL-(BH<&SQ~smbcobU!j49O^f4&IIYh~f+hK*M zZwTp%{ZSAhMFj1qFaOA+3)p^gnXH^=)`NTYgTu!CLpEV2NF=~-`(}7p^Eof=@VUbd z_9U|8qF7Rueg&$qpSSkN%%%DpbV?8E8ivu@ensI0toJ7Eas^jyFReQ1JeY9plb^{m z&eQO)qPLZQ6O;FTr*aJq=$cMN)QlQO@G&%z?BKUs1&I^`lq>=QLODwa`(mFGC`0H< zOlc*|N?B5&!U6BuJvkL?s1&nsi$*5cCv7^j_*l&$-sBmRS85UIrE--7eD8Gr3^+o? zqG-Yl4S&E;>H>k^a0GdUI(|n1`ws@)1%sq2XBdK`mqrNq_b4N{#VpouCXLzNvjoFv zo9wMQ6l0+FT+?%N(ka*;%m~(?338bu32v26!{r)|w8J`EL|t$}TA4q_FJRX5 zCPa{hc_I(7TGE#@rO-(!$1H3N-C0{R$J=yPCXCtGk{4>=*B56JdXU9cQVwB`6~cQZ zf^qK21x_d>X%dT!!)CJQ3mlHA@ z{Prkgfs6=Tz%63$6Zr8CO0Ak3A)Cv#@BVKr&aiKG7RYxY$Yx>Bj#3gJk*~Ps-jc1l z;4nltQwwT4@Z)}Pb!3xM?+EW0qEKA)sqzw~!C6wd^{03-9aGf3Jmt=}w-*!yXupLf z;)>-7uvWN4Unn8b4kfIza-X=x*e4n5pU`HtgpFFd))s$C@#d>aUl3helLom+RYb&g zI7A9GXLRZPl}iQS*d$Azxg-VgcUr*lpLnbPKUV{QI|bsG{8bLG<%CF( zMoS4pRDtLVYOWG^@ox^h8xL~afW_9DcE#^1eEC1SVSb1BfDi^@g?#f6e%v~Aw>@w- zIY0k+2lGWNV|aA*e#`U3=+oBDmGeInfcL)>*!w|*;mWiKNG6wP6AW4-4imN!W)!hE zA02~S1*@Q`fD*+qX@f3!2yJX&6FsEfPditB%TWo3=HA;T3o2IrjS@9SSxv%{{7&4_ zdS#r4OU41~GYMiib#z#O;zohNbhJknrPPZS6sN$%HB=jUnlCO_w5Gw5EeE@KV>soy z2EZ?Y|4RQDDjt5y!WBlZ(8M)|HP<0YyG|D%RqD+K#e7-##o3IZxS^wQ5{Kbzb6h(i z#(wZ|^ei>8`%ta*!2tJzwMv+IFHLF`zTU8E^Mu!R*45_=ccqI};Zbyxw@U%a#2}%f zF>q?SrUa_a4H9l+uW8JHh2Oob>NyUwG=QH~-^ZebU*R@67DcXdz2{HVB4#@edz?B< z5!rQH3O0>A&ylROO%G^fimV*LX7>!%re{_Sm6N>S{+GW1LCnGImHRoF@csnFzn@P0 zM=jld0z%oz;j=>c7mMwzq$B^2mae7NiG}%>(wtmsDXkWk{?BeMpTrIt3Mizq?vRsf zi_WjNp+61uV(%gEU-Vf0;>~vcDhe(dzWdaf#4mH3o^v{0EWhj?E?$5v02sV@xL0l4 zX0_IMFtQ44PfWBbPYN#}qxa%=J%dlR{O!KyZvk^g5s?sTNycWYPJ^FK(nl3k?z-5t z39#hKrdO7V(@!TU)LAPY&ngnZ1MzLEeEiZznn7e-jLCy8LO zu^7_#z*%I-BjS#Pg-;zKWWqX-+Ly$T!4`vTe5ZOV0j?TJVA*2?*=82^GVlZIuH%9s zXiV&(T(QGHHah=s&7e|6y?g+XxZGmK55`wGV>@1U)Th&=JTgJq>4mI&Av2C z)w+kRoj_dA!;SfTfkgMPO>7Dw6&1*Hi1q?54Yng`JO&q->^CX21^PrU^JU#CJ_qhV zSG>afB%>2fx<~g8p=P8Yzxqc}s@>>{g7}F!;lCXvF#RV)^fyYb_)iKVCz1xEq=fJ| z0a7DMCK*FuP=NM*5h;*D`R4y$6cpW-E&-i{v`x=Jbk_xSn@2T3q!3HoAOB`@5Vg6) z{PW|@9o!e;v1jZ2{=Uw6S6o{g82x6g=k!)cFSC*oemHaVjg?VpEmtUuD2_J^A~$4* z3O7HsbA6wxw{TP5Kk)(Vm?gKo+_}11vbo{Tp_5x79P~#F)ahQXT)tSH5;;14?s)On zel1J>1x>+7;g1Iz2FRpnYz;sD0wG9Q!vuzE9yKi3@4a9Nh1!GGN?hA)!mZEnnHh&i zf?#ZEN2sFbf~kV;>K3UNj1&vFhc^sxgj8FCL4v>EOYL?2uuT`0eDH}R zmtUJMxVrV5H{L53hu3#qaWLUa#5zY?f5ozIn|PkMWNP%n zWB5!B0LZB0kLw$k39=!akkE9Q>F4j+q434jB4VmslQ;$ zKiO#FZ`p|dKS716jpcvR{QJkSNfDVhr2%~eHrW;fU45>>snr*S8Vik-5eN5k*c2Mp zyxvX&_cFbB6lODXznHHT|rsURe2!swomtrqc~w5 zymTM8!w`1{04CBprR!_F{5LB+2_SOuZN{b*!J~1ZiPpP-M;);!ce!rOPDLtgR@Ie1 zPreuqm4!H)hYePcW1WZ0Fyaqe%l}F~Orr)~+;mkS&pOhP5Ebb`cnUt!X_QhP4_4p( z8YKQCDKGIy>?WIFm3-}Br2-N`T&FOi?t)$hjphB9wOhBXU#Hb+zm&We_-O)s(wc`2 z8?VsvU;J>Ju7n}uUb3s1yPx_F*|FlAi=Ge=-kN?1;`~6szP%$3B0|8Sqp%ebM)F8v zADFrbeT0cgE>M0DMV@_Ze*GHM>q}wWMzt|GYC%}r{OXRG3Ij&<+nx9;4jE${Fj_r* z`{z1AW_6Myd)i6e0E-h&m{{CvzH=Xg!&(bLYgRMO_YVd8JU7W+7MuGWNE=4@OvP9+ zxi^vqS@5%+#gf*Z@RVyU9N1sO-(rY$24LGsg1>w>s6ST^@)|D9>cT50maXLUD{Fzf zt~tp{OSTEKg3ZSQyQQ5r51){%=?xlZ54*t1;Ow)zLe3i?8tD8YyY^k%M)e`V*r+vL zPqUf&m)U+zxps+NprxMHF{QSxv}>lE{JZETNk1&F+R~bp{_T$dbXL2UGnB|hgh*p4h$clt#6;NO~>zuyY@C-MD@)JCc5XrYOt`wW7! z_ti2hhZBMJNbn0O-uTxl_b6Hm313^fG@e;RrhIUK9@# z+DHGv_Ow$%S8D%RB}`doJjJy*aOa5mGHVHz0e0>>O_%+^56?IkA5eN+L1BVCp4~m=1eeL zb;#G!#^5G%6Mw}r1KnaKsLvJB%HZL)!3OxT{k$Yo-XrJ?|7{s4!H+S2o?N|^Z z)+?IE9H7h~Vxn5hTis^3wHYuOU84+bWd)cUKuHapq=&}WV#OxHpLab`NpwHm8LmOo zjri+!k;7j_?FP##CpM+pOVx*0wExEex z@`#)K<-ZrGyArK;a%Km`^+We|eT+#MygHOT6lXBmz`8|lyZOwL1+b+?Z$0OhMEp3R z&J=iRERpv~TC=p2-BYLC*?4 zxvPs9V@g=JT0>zky5Poj=fW_M!c)Xxz1<=&_ZcL=LMZJqlnO1P^xwGGW*Z+yTBvbV z-IFe6;(k1@$1;tS>{%pXZ_7w+i?N4A2=TXnGf=YhePg8bH8M|Lk-->+w8Y+FjZ;L=wSGwxfA`gqSn)f(XNuSm>6Y z@|#e-)I(PQ^G@N`%|_DZSb4_pkaEF0!-nqY+t#pyA>{9^*I-zw4SYA1_z2Bs$XGUZbGA;VeMo%CezHK0lO={L%G)dI-+8w?r9iexdoB{?l zbJ}C?huIhWXBVs7oo{!$lOTlvCLZ_KN1N+XJGuG$rh<^eUQIqcI7^pmqhBSaOKNRq zrx~w^?9C?*&rNwP_SPYmo;J-#!G|{`$JZK7DxsM3N^8iR4vvn>E4MU&Oe1DKJvLc~ zCT>KLZ1;t@My zRj_2hI^61T&LIz)S!+AQIV23n1>ng+LUvzv;xu!4;wpqb#EZz;F)BLUzT;8UA1x*6vJ zicB!3Mj03s*kGV{g`fpC?V^s(=JG-k1EMHbkdP4P*1^8p_TqO|;!Zr%GuP$8KLxuf z=pv*H;kzd;P|2`JmBt~h6|GxdU~@weK5O=X&5~w$HpfO}@l-T7@vTCxVOwCkoPQv8 z@aV_)I5HQtfs7^X=C03zYmH4m0S!V@JINm6#(JmZRHBD?T!m^DdiZJrhKpBcur2u1 zf9e4%k$$vcFopK5!CC`;ww(CKL~}mlxK_Pv!cOsFgVkNIghA2Au@)t6;Y3*2gK=5d z?|@1a)-(sQ%uFOmJ7v2iG&l&m^u&^6DJM#XzCrF%r>{2XKyxLD2rgWBD;i(!e4InDQBDg==^z;AzT2z~OmV0!?Z z0S9pX$+E;w3WN;v&NYT=+G8hf=6w0E1$0AOr61}eOvE8W1jX%>&Mjo7&!ulawgzLH zbcb+IF(s^3aj12WSi#pzIpijJJzkP?JzRawnxmNDSUR#7!29vHULCE<3Aa#be}ie~d|!V+ z%l~s9Odo$G&fH!t!+`rUT0T9DulF!Yq&BfQWFZV1L9D($r4H(}Gnf6k3^wa7g5|Ws zj7%d`!3(0bb55yhC6@Q{?H|2os{_F%o=;-h{@Yyyn*V7?{s%Grvpe!H^kl6tF4Zf5 z{Jv1~yZ*iIWL_9C*8pBMQArfJJ0d9Df6Kl#wa}7Xa#Ef_5B7=X}DzbQXVPfCwTO@9+@;A^Ti6il_C>g?A-GFwA0#U;t4;wOm-4oS})h z5&on>NAu67O?YCQr%7XIzY%LS4bha9*e*4bU4{lGCUmO2UQ2U)QOqClLo61Kx~3dI zmV3*(P6F_Tr-oP%x!0kTnnT?Ep5j;_IQ^pTRp=e8dmJtI4YgWd0}+b2=ATkOhgpXe z;jmw+FBLE}UIs4!&HflFr4)vMFOJ19W4f2^W(=2)F%TAL)+=F>IE$=e=@j-*bFLSg z)wf|uFQu+!=N-UzSef62u0-C8Zc7 zo6@F)c+nZA{H|+~7i$DCU0pL{0Ye|fKLuV^w!0Y^tT$isu%i1Iw&N|tX3kwFKJN(M zXS`k9js66o$r)x?TWL}Kxl`wUDUpwFx(w4Yk%49;$sgVvT~n8AgfG~HUcDt1TRo^s zdla@6heJB@JV z!vK;BUMznhzGK6PVtj0)GB=zTv6)Q9Yt@l#fv7>wKovLobMV-+(8)NJmyF8R zcB|_K7=FJGGn^X@JdFaat0uhKjp3>k#^&xE_}6NYNG?kgTp>2Iu?ElUjt4~E-?`Du z?mDCS9wbuS%fU?5BU@Ijx>1HG*N?gIP+<~xE4u=>H`8o((cS5M6@_OK%jSjFHirQK zN9@~NXFx*jS{<|bgSpC|SAnA@I)+GB=2W|JJChLI_mx+-J(mSJ!b)uUom6nH0#2^(L@JBlV#t zLl?j54s`Y3vE^c_3^Hl0TGu*tw_n?@HyO@ZrENxA+^!)OvUX28gDSF*xFtQzM$A+O zCG=n#6~r|3zt=8%GuG} z<#VCZ%2?3Q(Ad#Y7GMJ~{U3>E{5e@z6+rgZLX{Cxk^p-7dip^d29;2N1_mm4QkASo z-L`GWWPCq$uCo;X_BmGIpJFBlhl<8~EG{vOD1o|X$aB9KPhWO_cKiU*$HWEgtf=fn zsO%9bp~D2c@?*K9jVN@_vhR03>M_8h!_~%aN!Cnr?s-!;U3SVfmhRwk11A^8Ns`@KeE}+ zN$H}a1U6E;*j5&~Og!xHdfK5M<~xka)x-0N)K_&e7AjMz`toDzasH+^1bZlC!n()crk9kg@$(Y{wdKvbuUd04N^8}t1iOgsKF zGa%%XWx@WoVaNC1!|&{5ZbkopFre-Lu(LCE5HWZBoE#W@er9W<>R=^oYxBvypN#x3 zq#LC8&q)GFP=5^-bpHj?LW=)-g+3_)Ylps!3^YQ{9~O9&K)xgy zMkCWaApU-MI~e^cV{Je75Qr7eF%&_H)BvfyKL=gIA>;OSq(y z052BFz3E(Prg~09>|_Z@!qj}@;8yxnw+#Ej0?Rk<y}4ghbD569B{9hSFr*^ygZ zr6j7P#gtZh6tMk6?4V$*Jgz+#&ug;yOr>=qdI#9U&^am2qoh4Jy}H2%a|#Fs{E(5r z%!ijh;VuGA6)W)cJZx+;9Bp1LMUzN~x_8lQ#D3+sL{be-Jyeo@@dv7XguJ&S5vrH` z>QxOMWn7N-T!D@1(@4>ZlL^y5>m#0!HKovs12GRav4z!>p(1~xok8+_{| z#Ae4{9#NLh#Vj2&JuIn5$d6t@__`o}umFo(n0QxUtd2GKCyE+erwXY?`cm*h&^9*8 zJ+8x6fRZI-e$CRygofIQN^dWysCxgkyr{(_oBwwSRxZora1(%(aC!5BTtj^+YuevI zx?)H#(xlALUp6QJ!=l9N__$cxBZ5p&7;qD3PsXRFVd<({Kh+mShFWJNpy`N@ab7?9 zv5=klvCJ4bx|-pvOO2-+G)6O?$&)ncA#Urze2rlBfp#htudhx-NeRnJ@u%^_bfw4o z4|{b8SkPV3b>Wera1W(+N@p9H>dc6{cnkh-sgr?e%(YkWvK+0YXVwk0=d`)}*47*B z5JGkEdVix!w7-<%r0JF~`ZMMPe;f0EQHuYHxya`puazyph*ZSb1mJAt^k4549BfS; zK7~T&lRb=W{s&t`DJ$B}s-eH1&&-wEOH1KWsKn0a(ZI+G!v&W4A*cl>qAvUv6pbUR z#(f#EKV8~hk&8oayBz4vaswc(?qw1vn`yC zZQDl2PCB-&Uu@g9ZQHhO+v(W0bNig{-k0;;`+wM@#@J)8r?qOYs#&vUna8ILxN7S{ zp1s41KnR8miQJtJtOr|+qk}wrLt+N*z#5o`TmD1)E&QD(Vh&pjZJ_J*0!8dy_ z>^=@v=J)C`x&gjqAYu`}t^S=DFCtc0MkBU2zf|69?xW`Ck~(6zLD)gSE{7n~6w8j_ zoH&~$ED2k5-yRa0!r8fMRy z;QjBYUaUnpd}mf%iVFPR%Dg9!d>g`01m~>2s))`W|5!kc+_&Y>wD@@C9%>-lE`WB0 zOIf%FVD^cj#2hCkFgi-fgzIfOi+ya)MZK@IZhHT5FVEaSbv-oDDs0W)pA0&^nM0TW zmgJmd7b1R7b0a`UwWJYZXp4AJPteYLH>@M|xZFKwm!t3D3&q~av?i)WvAKHE{RqpD{{%OhYkK?47}+}` zrR2(Iv9bhVa;cDzJ%6ntcSbx7v7J@Y4x&+eWSKZ*eR7_=CVIUSB$^lfYe@g+p|LD{ zPSpQmxx@b$%d!05|H}WzBT4_cq?@~dvy<7s&QWtieJ9)hd4)$SZz}#H2UTi$CkFWW|I)v_-NjuH!VypONC=1`A=rm_jfzQ8Fu~1r8i{q-+S_j$ z#u^t&Xnfi5tZtl@^!fUJhx@~Cg0*vXMK}D{>|$#T*+mj(J_@c{jXBF|rm4-8%Z2o! z2z0o(4%8KljCm^>6HDK!{jI7p+RAPcty_~GZ~R_+=+UzZ0qzOwD=;YeZt*?3%UGdr z`c|BPE;yUbnyARUl&XWSNJ<+uRt%!xPF&K;(l$^JcA_CMH6)FZt{>6ah$|(9$2fc~ z=CD00uHM{qv;{Zk9FR0~u|3|Eiqv9?z2#^GqylT5>6JNZwKqKBzzQpKU2_pmtD;CT zi%Ktau!Y2Tldfu&b0UgmF(SSBID)15*r08eoUe#bT_K-G4VecJL2Pa=6D1K6({zj6 za(2Z{r!FY5W^y{qZ}08+h9f>EKd&PN90f}Sc0ejf%kB4+f#T8Q1=Pj=~#pi$U zp#5rMR%W25>k?<$;$x72pkLibu1N|jX4cWjD3q^Pk3js!uK6h7!dlvw24crL|MZs_ zb%Y%?Fyp0bY0HkG^XyS76Ts*|Giw{31LR~+WU5NejqfPr73Rp!xQ1mLgq@mdWncLy z%8}|nzS4P&`^;zAR-&nm5f;D-%yNQPwq4N7&yULM8bkttkD)hVU>h>t47`{8?n2&4 zjEfL}UEagLUYwdx0sB2QXGeRmL?sZ%J!XM`$@ODc2!y|2#7hys=b$LrGbvvjx`Iqi z&RDDm3YBrlKhl`O@%%&rhLWZ*ABFz2nHu7k~3@e4)kO3%$=?GEFUcCF=6-1n!x^vmu+Ai*amgXH+Rknl6U>#9w;A} zn2xanZSDu`4%%x}+~FG{Wbi1jo@wqBc5(5Xl~d0KW(^Iu(U3>WB@-(&vn_PJt9{1`e9Iic@+{VPc`vP776L*viP{wYB2Iff8hB%E3|o zGMOu)tJX!`qJ}ZPzq7>=`*9TmETN7xwU;^AmFZ-ckZjV5B2T09pYliaqGFY|X#E-8 z20b>y?(r-Fn5*WZ-GsK}4WM>@TTqsxvSYWL6>18q8Q`~JO1{vLND2wg@58OaU!EvT z1|o+f1mVXz2EKAbL!Q=QWQKDZpV|jznuJ}@-)1&cdo z^&~b4Mx{*1gurlH;Vhk5g_cM&6LOHS2 zRkLfO#HabR1JD4Vc2t828dCUG#DL}f5QDSBg?o)IYYi@_xVwR2w_ntlpAW0NWk$F1 z$If?*lP&Ka1oWfl!)1c3fl`g*lMW3JOn#)R1+tfwrs`aiFUgz3;XIJ>{QFxLCkK30 zNS-)#DON3yb!7LBHQJ$)4y%TN82DC2-9tOIqzhZ27@WY^<6}vXCWcR5iN{LN8{0u9 zNXayqD=G|e?O^*ms*4P?G%o@J1tN9_76e}E#66mr89%W_&w4n66~R;X_vWD(oArwj z4CpY`)_mH2FvDuxgT+akffhX0b_slJJ*?Jn3O3~moqu2Fs1oL*>7m=oVek2bnprnW zixkaIFU%+3XhNA@@9hyhFwqsH2bM|`P?G>i<-gy>NflhrN{$9?LZ1ynSE_Mj0rADF zhOz4FnK}wpLmQuV zgO4_Oz9GBu_NN>cPLA=`SP^$gxAnj;WjJnBi%Q1zg`*^cG;Q)#3Gv@c^j6L{arv>- zAW%8WrSAVY1sj$=umcAf#ZgC8UGZGoamK}hR7j6}i8#np8ruUlvgQ$j+AQglFsQQq zOjyHf22pxh9+h#n$21&$h?2uq0>C9P?P=Juw0|;oE~c$H{#RGfa>| zj)Iv&uOnaf@foiBJ}_;zyPHcZt1U~nOcNB{)og8Btv+;f@PIT*xz$x!G?u0Di$lo7 zOugtQ$Wx|C($fyJTZE1JvR~i7LP{ zbdIwqYghQAJi9p}V&$=*2Azev$6K@pyblphgpv8^9bN!?V}{BkC!o#bl&AP!3DAjM zmWFsvn2fKWCfjcAQmE+=c3Y7j@#7|{;;0f~PIodmq*;W9Fiak|gil6$w3%b_Pr6K_ zJEG@&!J%DgBZJDCMn^7mk`JV0&l07Bt`1ymM|;a)MOWz*bh2#d{i?SDe9IcHs7 zjCrnyQ*Y5GzIt}>`bD91o#~5H?4_nckAgotN{2%!?wsSl|LVmJht$uhGa+HiH>;av z8c?mcMYM7;mvWr6noUR{)gE!=i7cZUY7e;HXa221KkRoc2UB>s$Y(k%NzTSEr>W(u z<(4mcc)4rB_&bPzX*1?*ra%VF}P1nwiP5cykJ&W{!OTlz&Td0pOkVp+wc z@k=-Hg=()hNg=Q!Ub%`BONH{ z_=ZFgetj@)NvppAK2>8r!KAgi>#%*7;O-o9MOOfQjV-n@BX6;Xw;I`%HBkk20v`qoVd0)}L6_49y1IhR z_OS}+eto}OPVRn*?UHC{eGyFU7JkPz!+gX4P>?h3QOwGS63fv4D1*no^6PveUeE5% zlehjv_3_^j^C({a2&RSoVlOn71D8WwMu9@Nb@=E_>1R*ve3`#TF(NA0?d9IR_tm=P zOP-x;gS*vtyE1Cm zG0L?2nRUFj#aLr-R1fX*$sXhad)~xdA*=hF3zPZhha<2O$Ps+F07w*3#MTe?)T8|A!P!v+a|ot{|^$q(TX`35O{WI0RbU zCj?hgOv=Z)xV?F`@HKI11IKtT^ocP78cqHU!YS@cHI@{fPD?YXL)?sD~9thOAv4JM|K8OlQhPXgnevF=F7GKD2#sZW*d za}ma31wLm81IZxX(W#A9mBvLZr|PoLnP>S4BhpK8{YV_}C|p<)4#yO{#ISbco92^3 zv&kCE(q9Wi;9%7>>PQ!zSkM%qqqLZW7O`VXvcj;WcJ`2~v?ZTYB@$Q&^CTfvy?1r^ z;Cdi+PTtmQwHX_7Kz?r#1>D zS5lWU(Mw_$B&`ZPmqxpIvK<~fbXq?x20k1~9az-Q!uR78mCgRj*eQ>zh3c$W}>^+w^dIr-u{@s30J=)1zF8?Wn|H`GS<=>Om|DjzC{}Jt?{!fSJe*@$H zg>wFnlT)k#T?LslW zu$^7Uy~$SQ21cE?3Ijl+bLfuH^U5P^$@~*UY#|_`uvAIe(+wD2eF}z_y!pvomuVO; zS^9fbdv)pcm-B@CW|Upm<7s|0+$@@<&*>$a{aW+oJ%f+VMO<#wa)7n|JL5egEgoBv zl$BY(NQjE0#*nv=!kMnp&{2Le#30b)Ql2e!VkPLK*+{jv77H7)xG7&=aPHL7LK9ER z5lfHxBI5O{-3S?GU4X6$yVk>lFn;ApnwZybdC-GAvaznGW-lScIls-P?Km2mF>%B2 zkcrXTk+__hj-3f48U%|jX9*|Ps41U_cd>2QW81Lz9}%`mTDIhE)jYI$q$ma7Y-`>% z8=u+Oftgcj%~TU}3nP8&h7k+}$D-CCgS~wtWvM|UU77r^pUw3YCV80Ou*+bH0!mf0 zxzUq4ed6y>oYFz7+l18PGGzhB^pqSt)si=9M>~0(Bx9*5r~W7sa#w+_1TSj3Jn9mW zMuG9BxN=}4645Cpa#SVKjFst;9UUY@O<|wpnZk$kE+to^4!?0@?Cwr3(>!NjYbu?x z1!U-?0_O?k!NdM^-rIQ8p)%?M+2xkhltt*|l=%z2WFJhme7*2xD~@zk#`dQR$6Lmd zb3LOD4fdt$Cq>?1<%&Y^wTWX=eHQ49Xl_lFUA(YQYHGHhd}@!VpYHHm=(1-O=yfK#kKe|2Xc*9}?BDFN zD7FJM-AjVi)T~OG)hpSWqH>vlb41V#^G2B_EvYlWhDB{Z;Q9-0)ja(O+By`31=biA zG&Fs#5!%_mHi|E4Nm$;vVQ!*>=_F;ZC=1DTPB#CICS5fL2T3XmzyHu?bI;m7D4@#; ztr~;dGYwb?m^VebuULtS4lkC_7>KCS)F@)0OdxZIFZp@FM_pHnJes8YOvwB|++#G( z&dm*OP^cz95Wi15vh`Q+yB>R{8zqEhz5of>Po$9LNE{xS<)lg2*roP*sQ}3r3t<}; zPbDl{lk{pox~2(XY5=qg0z!W-x^PJ`VVtz$git7?)!h>`91&&hESZy1KCJ2nS^yMH z!=Q$eTyRi68rKxdDsdt+%J_&lapa{ds^HV9Ngp^YDvtq&-Xp}60B_w@Ma>_1TTC;^ zpbe!#gH}#fFLkNo#|`jcn?5LeUYto%==XBk6Ik0kc4$6Z+L3x^4=M6OI1=z5u#M%0 z0E`kevJEpJjvvN>+g`?gtnbo$@p4VumliZV3Z%CfXXB&wPS^5C+7of2tyVkMwNWBiTE2 z8CdPu3i{*vR-I(NY5syRR}I1TJOV@DJy-Xmvxn^IInF>Tx2e)eE9jVSz69$6T`M9-&om!T+I znia!ZWJRB28o_srWlAxtz4VVft8)cYloIoVF=pL zugnk@vFLXQ_^7;%hn9x;Vq?lzg7%CQR^c#S)Oc-8d=q_!2ZVH764V z!wDKSgP}BrVV6SfCLZnYe-7f;igDs9t+K*rbMAKsp9L$Kh<6Z;e7;xxced zn=FGY<}CUz31a2G}$Q(`_r~75PzM4l_({Hg&b@d8&jC}B?2<+ed`f#qMEWi z`gm!STV9E4sLaQX+sp5Nu9*;9g12naf5?=P9p@H@f}dxYprH+3ju)uDFt^V{G0APn zS;16Dk{*fm6&BCg#2vo?7cbkkI4R`S9SSEJ=#KBk3rl69SxnCnS#{*$!^T9UUmO#&XXKjHKBqLdt^3yVvu8yn|{ zZ#%1CP)8t-PAz(+_g?xyq;C2<9<5Yy<~C74Iw(y>uUL$+$mp(DRcCWbCKiGCZw@?_ zdomfp+C5xt;j5L@VfhF*xvZdXwA5pcdsG>G<8II-|1dhAgzS&KArcb0BD4ZZ#WfiEY{hkCq5%z9@f|!EwTm;UEjKJsUo696V>h zy##eXYX}GUu%t{Gql8vVZKkNhQeQ4C%n|RmxL4ee5$cgwlU+?V7a?(jI#&3wid+Kz5+x^G!bb#$q>QpR#BZ}Xo5UW^ zD&I`;?(a}Oys7-`I^|AkN?{XLZNa{@27Dv^s4pGowuyhHuXc zuctKG2x0{WCvg_sGN^n9myJ}&FXyGmUQnW7fR$=bj$AHR88-q$D!*8MNB{YvTTEyS zn22f@WMdvg5~o_2wkjItJN@?mDZ9UUlat2zCh(zVE=dGi$rjXF7&}*sxac^%HFD`Y zTM5D3u5x**{bW!68DL1A!s&$2XG@ytB~dX-?BF9U@XZABO`a|LM1X3HWCllgl0+uL z04S*PX$%|^WAq%jkzp~%9HyYIF{Ym?k)j3nMwPZ=hlCg9!G+t>tf0o|J2%t1 ztC+`((dUplgm3`+0JN~}&FRRJ3?l*>Y&TfjS>!ShS`*MwO{WIbAZR#<%M|4c4^dY8 z{Rh;-!qhY=dz5JthbWoovLY~jNaw>%tS4gHVlt5epV8ekXm#==Po$)}mh^u*cE>q7*kvX&gq)(AHoItMYH6^s6f(deNw%}1=7O~bTHSj1rm2|Cq+3M z93djjdomWCTCYu!3Slx2bZVy#CWDozNedIHbqa|otsUl+ut?>a;}OqPfQA05Yim_2 zs@^BjPoFHOYNc6VbNaR5QZfSMh2S*`BGwcHMM(1@w{-4jVqE8Eu0Bi%d!E*^Rj?cR z7qgxkINXZR)K^=fh{pc0DCKtrydVbVILI>@Y0!Jm>x-xM!gu%dehm?cC6ok_msDVA*J#{75%4IZt}X|tIVPReZS#aCvuHkZxc zHVMtUhT(wp09+w9j9eRqz~LtuSNi2rQx_QgQ(}jBt7NqyT&ma61ldD(s9x%@q~PQl zp6N*?=N$BtvjQ_xIT{+vhb1>{pM0Arde0!X-y))A4znDrVx8yrP3B1(7bKPE5jR@5 zwpzwT4cu~_qUG#zYMZ_!2Tkl9zP>M%cy>9Y(@&VoB84#%>amTAH{(hL4cDYt!^{8L z645F>BWO6QaFJ-{C-i|-d%j7#&7)$X7pv#%9J6da#9FB5KyDhkA+~)G0^87!^}AP>XaCSScr;kL;Z%RSPD2CgoJ;gpYT5&6NUK$86$T?jRH=w8nI9Z534O?5fk{kd z`(-t$8W|#$3>xoMfXvV^-A(Q~$8SKDE^!T;J+rQXP71XZ(kCCbP%bAQ1|%$%Ov9_a zyC`QP3uPvFoBqr_+$HenHklqyIr>PU_Fk5$2C+0eYy^~7U&(!B&&P2%7#mBUhM!z> z_B$Ko?{Pf6?)gpYs~N*y%-3!1>o-4;@1Zz9VQHh)j5U1aL-Hyu@1d?X;jtDBNk*vMXPn@ z+u@wxHN*{uHR!*g*4Xo&w;5A+=Pf9w#PeZ^x@UD?iQ&${K2c}UQgLRik-rKM#Y5rdDphdcNTF~cCX&9ViRP}`>L)QA4zNXeG)KXFzSDa6 zd^St;inY6J_i=5mcGTx4_^Ys`M3l%Q==f>{8S1LEHn{y(kbxn5g1ezt4CELqy)~TV6{;VW>O9?5^ ztcoxHRa0jQY7>wwHWcxA-BCwzsP>63Kt&3fy*n#Cha687CQurXaRQnf5wc9o8v7Rw zNwGr2fac;Wr-Ldehn7tF^(-gPJwPt@VR1f;AmKgxN&YPL;j=0^xKM{!wuU|^mh3NE zy35quf}MeL!PU;|{OW_x$TBothLylT-J>_x6p}B_jW1L>k)ps6n%7Rh z96mPkJIM0QFNYUM2H}YF5bs%@Chs6#pEnloQhEl?J-)es!(SoJpEPoMTdgA14-#mC zghayD-DJWtUu`TD8?4mR)w5E`^EHbsz2EjH5aQLYRcF{l7_Q5?CEEvzDo(zjh|BKg z3aJl_n#j&eFHsUw4~lxqnr!6NL*se)6H=A+T1e3xUJGQrd}oSPwSy5+$tt{2t5J5@(lFxl43amsARG74iyNC}uuS zd2$=(r6RdamdGx^eatX@F2D8?U23tDpR+Os?0Gq2&^dF+$9wiWf?=mDWfjo4LfRwL zI#SRV9iSz>XCSgEj!cW&9H-njJopYiYuq|2w<5R2!nZ27DyvU4UDrHpoNQZiGPkp@ z1$h4H46Zn~eqdj$pWrv;*t!rTYTfZ1_bdkZmVVIRC21YeU$iS-*XMNK`#p8Z_DJx| zk3Jssf^XP7v0X?MWFO{rACltn$^~q(M9rMYoVxG$15N;nP)A98k^m3CJx8>6}NrUd@wp-E#$Q0uUDQT5GoiK_R{ z<{`g;8s>UFLpbga#DAf%qbfi`WN1J@6IA~R!YBT}qp%V-j!ybkR{uY0X|x)gmzE0J z&)=eHPjBxJvrZSOmt|)hC+kIMI;qgOnuL3mbNR0g^<%|>9x7>{}>a2qYSZAGPt4it?8 zNcLc!Gy0>$jaU?}ZWxK78hbhzE+etM`67*-*x4DN>1_&{@5t7_c*n(qz>&K{Y?10s zXsw2&nQev#SUSd|D8w7ZD2>E<%g^; zV{yE_O}gq?Q|zL|jdqB^zcx7vo(^})QW?QKacx$yR zhG|XH|8$vDZNIfuxr-sYFR{^csEI*IM#_gd;9*C+SysUFejP0{{z7@P?1+&_o6=7V|EJLQun^XEMS)w(=@eMi5&bbH*a0f;iC~2J74V2DZIlLUHD&>mlug5+v z6xBN~8-ovZylyH&gG#ptYsNlT?-tzOh%V#Y33zlsJ{AIju`CjIgf$@gr8}JugRq^c zAVQ3;&uGaVlVw}SUSWnTkH_6DISN&k2QLMBe9YU=sA+WiX@z)FoSYX`^k@B!j;ZeC zf&**P?HQG6Rk98hZ*ozn6iS-dG}V>jQhb3?4NJB*2F?6N7Nd;EOOo;xR7acylLaLy z9)^lykX39d@8@I~iEVar4jmjjLWhR0d=EB@%I;FZM$rykBNN~jf>#WbH4U{MqhhF6 zU??@fSO~4EbU4MaeQ_UXQcFyO*Rae|VAPLYMJEU`Q_Q_%s2*>$#S^)&7er+&`9L=1 z4q4ao07Z2Vsa%(nP!kJ590YmvrWg+YrgXYs_lv&B5EcoD`%uL79WyYA$0>>qi6ov7 z%`ia~J^_l{p39EY zv>>b}Qs8vxsu&WcXEt8B#FD%L%ZpcVtY!rqVTHe;$p9rbb5O{^rFMB>auLn-^;s+-&P1#h~mf~YLg$8M9 zZ4#87;e-Y6x6QO<{McUzhy(%*6| z)`D~A(TJ$>+0H+mct(jfgL4x%^oC^T#u(bL)`E2tBI#V1kSikAWmOOYrO~#-cc_8! zCe|@1&mN2{*ceeiBldHCdrURk4>V}79_*TVP3aCyV*5n@jiNbOm+~EQ_}1#->_tI@ zqXv+jj2#8xJtW508rzFrYcJxoek@iW6SR@1%a%Bux&;>25%`j3UI`0DaUr7l79`B1 zqqUARhW1^h6=)6?;@v>xrZNM;t}{yY3P@|L}ey@gG( z9r{}WoYN(9TW&dE2dEJIXkyHA4&pU6ki=rx&l2{DLGbVmg4%3Dlfvn!GB>EVaY_%3+Df{fBiqJV>~Xf8A0aqUjgpa} zoF8YXO&^_x*Ej}nw-$-F@(ddB>%RWoPUj?p8U{t0=n>gAI83y<9Ce@Q#3&(soJ{64 z37@Vij1}5fmzAuIUnXX`EYe;!H-yTVTmhAy;y8VZeB#vD{vw9~P#DiFiKQ|kWwGFZ z=jK;JX*A;Jr{#x?n8XUOLS;C%f|zj-7vXtlf_DtP7bpurBeX%Hjwr z4lI-2TdFpzkjgiv!8Vfv`=SP+s=^i3+N~1ELNWUbH|ytVu>EyPN_3(4TM^QE1swRo zoV7Y_g)a>28+hZG0e7g%@2^s>pzR4^fzR-El}ARTmtu!zjZLuX%>#OoU3}|rFjJg} zQ2TmaygxJ#sbHVyiA5KE+yH0LREWr%^C*yR|@gM$nK2P zo}M}PV0v))uJh&33N>#aU376@ZH79u(Yw`EQ2hM3SJs9f99+cO6_pNW$j$L-CtAfe zYfM)ccwD!P%LiBk!eCD?fHCGvgMQ%Q2oT_gmf?OY=A>&PaZQOq4eT=lwbaf}33LCH zFD|)lu{K7$8n9gX#w4~URjZxWm@wlH%oL#G|I~Fb-v^0L0TWu+`B+ZG!yII)w05DU z>GO?n(TN+B=>HdxVDSlIH76pta$_LhbBg;eZ`M7OGcqt||qi zogS72W1IN%=)5JCyOHWoFP7pOFK0L*OAh=i%&VW&4^LF@R;+K)t^S!96?}^+5QBIs zjJNTCh)?)4k^H^g1&jc>gysM`y^8Rm3qsvkr$9AeWwYpa$b22=yAd1t<*{ zaowSEFP+{y?Ob}8&cwfqoy4Pb9IA~VnM3u!trIK$&&0Op#Ql4j>(EW?UNUv#*iH1$ z^j>+W{afcd`{e&`-A{g}{JnIzYib)!T56IT@YEs{4|`sMpW3c8@UCoIJv`XsAw!XC z34|Il$LpW}CIHFC5e*)}00I5{%OL*WZRGzC0?_}-9{#ue?-ug^ zLE|uv-~6xnSs_2_&CN9{9vyc!Xgtn36_g^wI0C4s0s^;8+p?|mm;Odt3`2ZjwtK;l zfd6j)*Fr#53>C6Y8(N5?$H0ma;BCF3HCjUs7rpb2Kf*x3Xcj#O8mvs#&33i+McX zQpBxD8!O{5Y8D&0*QjD=Yhl9%M0)&_vk}bmN_Ud^BPN;H=U^bn&(csl-pkA+GyY0Z zKV7sU_4n;}uR78ouo8O%g*V;79KY?3d>k6%gpcmQsKk&@Vkw9yna_3asGt`0Hmj59 z%0yiF*`jXhByBI9QsD=+>big5{)BGe&+U2gAARGe3ID)xrid~QN_{I>k}@tzL!Md_ z&=7>TWciblF@EMC3t4-WX{?!m!G6$M$1S?NzF*2KHMP3Go4=#ZHkeIv{eEd;s-yD# z_jU^Ba06TZqvV|Yd;Z_sN%$X=!T+&?#p+OQIHS%!LO`Hx0q_Y0MyGYFNoM{W;&@0@ zLM^!X4KhdtsET5G<0+|q0oqVXMW~-7LW9Bg}=E$YtNh1#1D^6Mz(V9?2g~I1( zoz9Cz=8Hw98zVLwC2AQvp@pBeKyidn6Xu0-1SY1((^Hu*-!HxFUPs)yJ+i`^BC>PC zjwd0mygOVK#d2pRC9LxqGc6;Ui>f{YW9Bvb>33bp^NcnZoH~w9(lM5@JiIlfa-6|k ziy31UoMN%fvQfhi8^T+=yrP{QEyb-jK~>$A4SZT-N56NYEbpvO&yUme&pWKs3^94D zH{oXnUTb3T@H+RgzML*lejx`WAyw*?K7B-I(VJx($2!NXYm%3`=F~TbLv3H<{>D?A zJo-FDYdSA-(Y%;4KUP2SpHKAIcv9-ld(UEJE7=TKp|Gryn;72?0LHqAN^fk6%8PCW z{g_-t)G5uCIf0I`*F0ZNl)Z>))MaLMpXgqWgj-y;R+@A+AzDjsTqw2Mo9ULKA3c70 z!7SOkMtZb+MStH>9MnvNV0G;pwSW9HgP+`tg}e{ij0H6Zt5zJ7iw`hEnvye!XbA@!~#%vIkzowCOvq5I5@$3wtc*w2R$7!$*?}vg4;eDyJ_1=ixJuEp3pUS27W?qq(P^8$_lU!mRChT}ctvZz4p!X^ zOSp|JOAi~f?UkwH#9k{0smZ7-#=lK6X3OFEMl7%)WIcHb=#ZN$L=aD`#DZKOG4p4r zwlQ~XDZ`R-RbF&hZZhu3(67kggsM-F4Y_tI^PH8PMJRcs7NS9ogF+?bZB*fcpJ z=LTM4W=N9yepVvTj&Hu~0?*vR1HgtEvf8w%Q;U0^`2@e8{SwgX5d(cQ|1(!|i$km! zvY03MK}j`sff;*-%mN~ST>xU$6Bu?*Hm%l@0dk;j@%>}jsgDcQ)Hn*UfuThz9(ww_ zasV`rSrp_^bp-0sx>i35FzJwA!d6cZ5#5#nr@GcPEjNnFHIrtUYm1^Z$;{d&{hQV9 z6EfFHaIS}46p^5I-D_EcwwzUUuO}mqRh&T7r9sfw`)G^Q%oHxEs~+XoM?8e*{-&!7 z7$m$lg9t9KP9282eke608^Q2E%H-xm|oJ8=*SyEo} z@&;TQ3K)jgspgKHyGiKVMCz>xmC=H5Fy3!=TP)-R3|&1S-B)!6q50wfLHKM@7Bq6E z44CY%G;GY>tC`~yh!qv~YdXw! zSkquvYNs6k1r7>Eza?Vkkxo6XRS$W7EzL&A`o>=$HXgBp{L(i^$}t`NcnAxzbH8Ht z2!;`bhKIh`f1hIFcI5bHI=ueKdzmB9)!z$s-BT4ItyY|NaA_+o=jO%MU5as9 zc2)aLP>N%u>wlaXTK!p)r?+~)L+0eCGb5{8WIk7K52$nufnQ+m8YF+GQc&{^(zh-$ z#wyWV*Zh@d!b(WwXqvfhQX)^aoHTBkc;4ossV3&Ut*k>AI|m+{#kh4B!`3*<)EJVj zwrxK>99v^k4&Y&`Awm>|exo}NvewV%E+@vOc>5>%H#BK9uaE2$vje zWYM5fKuOTtn96B_2~~!xJPIcXF>E_;yO8AwpJ4)V`Hht#wbO3Ung~@c%%=FX4)q+9 z99#>VC2!4l`~0WHs9FI$Nz+abUq# zz`Of97})Su=^rGp2S$)7N3rQCj#0%2YO<R&p>$<#lgXcUj=4H_{oAYiT3 z44*xDn-$wEzRw7#@6aD)EGO$0{!C5Z^7#yl1o;k0PhN=aVUQu~eTQ^Xy{z8Ow6tk83 z4{5xe%(hx)%nD&|e*6sTWH`4W&U!Jae#U4TnICheJmsw{l|CH?UA{a6?2GNgpZLyzU2UlFu1ZVwlALmh_DOs03J^Cjh1im`E3?9&zvNmg(MuMw&0^Lu$(#CJ*q6DjlKsY-RMJ^8yIY|{SQZ*9~CH|u9L z`R78^r=EbbR*_>5?-)I+$6i}G)%mN(`!X72KaV(MNUP7Nv3MS9S|Pe!%N2AeOt5zG zVJ;jI4HZ$W->Ai_4X+`9c(~m=@ek*m`ZQbv3ryI-AD#AH=`x$~WeW~M{Js57(K7(v ze5`};LG|%C_tmd>bkufMWmAo&B+DT9ZV~h(4jg0>^aeAqL`PEUzJJtI8W1M!bQWpv zvN(d}E1@nlYa!L!!A*RN!(Q3F%J?5PvQ0udu?q-T)j3JKV~NL>KRb~w-lWc685uS6 z=S#aR&B8Sc8>cGJ!!--?kwsJTUUm`Jk?7`H z7PrO~xgBrSW2_tTlCq1LH8*!o?pj?qxy8}(=r_;G18POrFh#;buWR0qU24+XUaVZ0 z?(sXcr@-YqvkCmHr{U2oPogHL{r#3r49TeR<{SJX1pcUqyWPrkYz^X8#QW~?F)R5i z>p^!i<;qM8Nf{-fd6!_&V*e_9qP6q(s<--&1Ttj01j0w>bXY7y1W*%Auu&p|XSOH=)V7Bd4fUKh&T1)@cvqhuD-d=?w}O zjI%i(f|thk0Go*!d7D%0^ztBfE*V=(ZIN84f5HU}T9?ulmEYzT5usi=DeuI*d|;M~ zp_=Cx^!4k#=m_qSPBr5EK~E?3J{dWWPH&oCcNepYVqL?nh4D5ynfWip$m*YlZ8r^Z zuFEUL-nW!3qjRCLIWPT0x)FDL7>Yt7@8dA?R2kF@WE>ysMY+)lTsgNM#3VbXVGL}F z1O(>q>2a+_`6r5Xv$NZAnp=Kgnr3)cL(^=8ypEeOf3q8(HGe@7Tt59;yFl||w|mnO zHDxg2G3z8=(6wjj9kbcEY@Z0iOd7Gq5GiPS5% z*sF1J<#daxDV2Z8H>wxOF<;yKzMeTaSOp_|XkS9Sfn6Mpe9UBi1cSTieGG5$O;ZLIIJ60Y>SN4vC?=yE_CWlo(EEE$e4j?z&^FM%kNmRtlbEL^dPPgvs9sbK5fGw*r@ z+!EU@u$T8!nZh?Fdf_qk$VuHk^yVw`h`_#KoS*N%epIIOfQUy_&V}VWDGp3tplMbf z5Se1sJUC$7N0F1-9jdV2mmGK{-}fu|Nv;12jDy0<-kf^AmkDnu6j~TPWOgy1MT68|D z=4=50jVbUKdKaQgD`eWGr3I&^<6uhkjz$YwItY8%Yp9{z4-{6g{73<_b*@XJ4Nm3-3z z?BW3{aY_ccRjb@W1)i5nLg|7BnWS!B`_Uo9CWaE`Ij327QH?i)9A}4Ug4wmxVVa^b z-4+m%-wwOl7cKH7+=x&nrCrbEC)Q$fpg&V83#uEH;C=GNMz`ps@^RxK%T*8%OPnC` z{WO~J%nxYJ`x|N%?&i7?;{_8t^jM&=50HlaOQj8fS}_`moH$c;vI<|cruPFnpT8yU zS%rPOCUSd5Zdb(zwk`hqwTQn)*&n)uYsP*F_(~xEWq}C= zv30kFmZFwJZ@ELVX3?$dXQh|icO7UrL*_5G=I^xXjImz`ZPp>?g#tf(ej~KaIU0algsG!IS09;>?MvqGg#c{i+}qY|{P8W~O%#>|gFd z<1dr$-oxyRGN17yZo1OwLnzwYs0|;IS_nymNB0IlSzPQ%-r`?T=;_XQ^~&#}b|AB} zkNbN5uB?-sUB-T5QLlg%Uk3)uHB;>VIzGe9_J9 zaeISkQm!v(9d(0ML^b9fR^sfHFlH?7Mvddt37OuR{|O0{uv)(&-6<87W4 zyO>s!=cPgP3O&7xxU5DlIPw_o3O>6o6Qb?JWs3qw#p3sBc3g$?Dx zi(6D+DYgV;GrUis-CL%Qe{nvZnwaVXmbhH(|GFh|Q)k=1uvA$I@1DXI7bKlQ@8D6P zS?(*?><>)G49q0wr;NajpxP4W2G)kHl6^=Z>hrNEI4Mwd_$O6$1dXF;Q#hE(-eeW6 zz03GJF%Wl?HO=_ztv5*zRlcU~{+{k%#N59mgm~eK>P!QZ6E?#Cu^2)+K8m@ySvZ*5 z|HDT}BkF@3!l(0%75G=1u2hETXEj!^1Z$!)!lyGXlWD!_vqGE$Z)#cUVBqlORW>0^ zDjyVTxwKHKG|0}j-`;!R-p>}qQfBl(?($7pP<+Y8QE#M8SCDq~k<+>Q^Zf@cT_WdX3~BSe z+|KK|7OL5Hm5(NFP~j>Ct3*$wi0n0!xl=(C61`q&cec@mFlH(sy%+RH<=s)8aAPN`SfJdkAQjdv82G5iRdv8 zh{9wHUZaniSEpslXl^_ODh}mypC?b*9FzLjb~H@3DFSe;D(A-K3t3eOTB(m~I6C;(-lKAvit(70k`%@+O*Ztdz;}|_TS~B?Tpmi=QKC^m_ z2YpEaT3iiz*;T~ap1yiA)a`dKMwu`^UhIUeltNQ1Yjo=q@bI@&3zH?rVUg=IxLy-ni zyxDu%-Fr{H6owTjZU2O5>nDb=q&Jz_TjeSq%!2m40x&U6w~GQ({quPL73IsJS;f`$ zsuhioqCBj(gJ>2hoo)Gou7(WP*pX)f=Y=!=k!&1K?EYY%jJ~X&DnK{^saPQK<1BJ z_A`_{%ZozcB(3w$z^To^6d|XuT@=X~wtW!+{4ID@N{AB~J6AL5vuY>JwvWCNFKsKh zd}@>q@_WV#QZ&UJ0#?X(pXR!oyXOEG3rqzHbCzGLONDb042i$})fM@XF)uSP(DHUc z^&{|$*xe{cs?Gp8=B%RY3L7#$ve$?TWh>MZdxF1zH1v}1z+$Ov#G7?%D)bBCyDe*% zSeKSpETC2V1){II>@UwJi>4uBN+iAx+82E~gb|Cr&8E^i&)A!uv-g?jzH99wU}8+# z$nh>yvb;TwZmS@7LrvuCu_d0-WxFNI&C7%sWuTL%YU!l|I1{|->=dlOeHOCtUO#zkS3ESO8LHV4hTdQL5EdV zuWD33fFPH}HPrW^s$Qn1Xgp&AT6<-He{{4%eIu3rN=iK|9mURdKXfB&Q?qGok%!cs ze53UP{Z!TO-Y@q2;;k2avA3`lm4OoN4@S*k=UA)7H;qZ`d8`XaYFCv?Ba+uGW@r5v z&&{nf(24WSBOhc7!qF^@0cz;XcUynNaj6w2349;s!K{KVqs5yS{ z7VubS`2OzT^5#1~6Tt^RTvt9-J|D2F>y~>2;jeF>g`hx5l%B3H=aLExQihuYngzlnBTYOTHJQMzl>kwqN5JYs)Ej zblA@ntkUS~xi+}y6|(81helS}Q~&VB37qyV|S3Y=><^1wh%msQM?fz z<58MX(=|PSUKCF#)dbhR%D&xgCD?$aR0qen+wpp6 zst}vX18!Be96TD??j1HsHTUx(a&@F?=gT`Q$oJFFyrh^;zgz!(NlAHGn0cJy@us=w zNhC#l5G;H}+>49Nsh12=ZPO2r*2OBQe5kpb&1?*PIBFitK8}FUfb~S-#hKfF0o#&d z#3aPkB$9scYku&kA6{0xHnBV#&Wei5J>5T-XX-gUXEPo+9b7WL=*XESc(3BshL`aj zXp}QIp*40}oWJt*l043e8_5;H5PI5c)U&IEw5dF(4zjX0y_lk9 zAp@!mK>WUqHo)-jop=DoK>&no>kAD=^qIE7qis&_*4~ z6q^EF$D@R~3_xseCG>Ikb6Gfofb$g|75PPyyZN&tiRxqovo_k zO|HA|sgy#B<32gyU9x^&)H$1jvw@qp+1b(eGAb)O%O!&pyX@^nQd^9BQ4{(F8<}|A zhF&)xusQhtoXOOhic=8#Xtt5&slLia3c*a?dIeczyTbC#>FTfiLST57nc3@Y#v_Eg#VUv zT8cKH#f3=1PNj!Oroz_MAR*pow%Y0*6YCYmUy^7`^r|j23Q~^*TW#cU7CHf0eAD_0 zEWEVddxFgQ7=!nEBQ|ibaScslvhuUk^*%b#QUNrEB{3PG@uTxNwW}Bs4$nS9wc(~O zG7Iq>aMsYkcr!9#A;HNsJrwTDYkK8ikdj{M;N$sN6BqJ<8~z>T20{J8Z2rRUuH7~3 z=tgS`AgxbBOMg87UT4Lwge`*Y=01Dvk>)^{Iu+n6fuVX4%}>?3czOGR$0 zpp*wp>bsFFSV`V;r_m+TZns$ZprIi`OUMhe^cLE$2O+pP3nP!YB$ry}2THx2QJs3< za1;>d-AggCarrQ>&Z!d@;mW+!q6eXhb&`GbzUDSxpl8AJ#Cm#tuc)_xh(2NV=5XMs zrf_ozRYO$NkC=pKFX5OH8v1>0i9Z$ec`~Mf+_jQ68spn(CJwclDhEEkH2Qw;${J$clv__nUjn5jA0wCLEnu1j;v!0vB>Ri6m9`;R{JMS%^)4FC zU0Z44+u$I$w=Bj|iu4DT5h~sS`C*zbmX?@-crY}E+hy>}2~C0Nn(EKk@5^qO4@l@! z6O0lr%tzGC`D^)8xU3FnMZVm0kX1sBWhaQyzVoXFWwr%Ny?=2M{5s#5i7fTu3gEkG zc{(Pr$v=;`Y#&`y*J}#M9ux>0?xu!`$9cUKm#Bdd_&S#LPTS?ZPV6zN6>W6JTS~-LfjL{mB=b(KMk3 z2HjBSlJeyUVqDd=Mt!=hpYsvby2GL&3~zm;0{^nZJq+4vb?5HH4wufvr}IX42sHeK zm@x?HN$8TsTavXs)tLDFJtY9b)y~Tl@7z4^I8oUQq4JckH@~CVQ;FoK(+e0XAM>1O z(ei}h?)JQp>)d=6ng-BZF1Z5hsAKW@mXq+hU?r8I(*%`tnIIOXw7V6ZK(T9RFJJe@ zZS!aC+p)Gf2Ujc=a6hx4!A1Th%YH!Lb^xpI!Eu` zmJO{9rw){B1Ql18d%F%da+Tbu1()?o(zT7StYqK6_w`e+fjXq5L^y(0 z09QA6H4oFj59c2wR~{~>jUoDzDdKz}5#onYPJRwa`SUO)Pd4)?(ENBaFVLJr6Kvz= zhTtXqbx09C1z~~iZt;g^9_2nCZ{};-b4dQJbv8HsWHXPVg^@(*!@xycp#R?a|L!+` zY5w))JWV`Gls(=}shH0#r*;~>_+-P5Qc978+QUd>J%`fyn{*TsiG-dWMiJXNgwBaT zJ=wgYFt+1ACW)XwtNx)Q9tA2LPoB&DkL16P)ERWQlY4%Y`-5aM9mZ{eKPUgI!~J3Z zkMd5A_p&v?V-o-6TUa8BndiX?ooviev(DKw=*bBVOW|=zps9=Yl|-R5@yJe*BPzN}a0mUsLn{4LfjB_oxpv(mwq# zSY*%E{iB)sNvWfzg-B!R!|+x(Q|b@>{-~cFvdDHA{F2sFGA5QGiIWy#3?P2JIpPKg6ncI^)dvqe`_|N=8 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/week4/demo/gradlew.bat b/week4/demo/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/week4/demo/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/week4/demo/settings.gradle b/week4/demo/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/week4/demo/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/week4/demo/src/main/java/com/example/demo/DemoApplication.java b/week4/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/week4/demo/src/main/java/com/example/demo/ddl/market.sql b/week4/demo/src/main/java/com/example/demo/ddl/market.sql new file mode 100644 index 0000000..83e0a0e --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/ddl/market.sql @@ -0,0 +1,151 @@ + +CREATE TABLE favorate_food +( + id long NOT NULL COMMENT '유저선호음식코드', + food_id long NOT NULL COMMENT '음식 카테고리를 정하고 함', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + PRIMARY KEY (id) +) COMMENT '선호음식'; + +CREATE TABLE food +( + id long NOT NULL DEFAULT autoincrement COMMENT '음식 카테고리를 정하고 함', + name VARCHAR(40) NOT NULL COMMENT '음식카테고리 이름', + PRIMARY KEY (id) +) COMMENT '푸드카테고리'; + +CREATE TABLE foodmarket +( + id long NOT NULL DEFAULT autoincrement COMMENT '가게 id', + name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', + address VARCHAR(50) NOT NULL COMMENT '가게주소', + open BOOLEAN NOT NULL COMMENT '영업중이냐?', + content VARCHAR(200) NOT NULL COMMENT '가계 내용', + PRIMARY KEY (id) +); + +CREATE TABLE mission +( + id long NOT NULL DEFAULT autoincrement COMMENT '고유미션_id', + market_id long NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '미션내용', + mission_point INTEGER NOT NULL COMMENT '미션포인트', + PRIMARY KEY (id) +) COMMENT '마켓과 유저 사이의 미션'; + +CREATE TABLE mission+user +( + id long NOT NULL DEFAULT autoincrement, + mission_id long NOT NULL COMMENT '고유미션_id', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + content VARCHAR NOT NULL COMMENT '새 미션에 대한 내용', + PRIMARY KEY (id) + ) COMMENT '신규 미션 받아라 유저!'; + +CREATE TABLE permission_mission +( + id long NOT NULL DEFAULT autoincrement COMMENT '유저 미션할당번호(이거 사장님한테 보여주면 댐)', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + mission_id long NOT NULL COMMENT '고유미션_id', + PRIMARY KEY (id) +); + +CREATE TABLE review +( + id long NOT NULL DEFAULT autoincrement COMMENT '리뷰 고유(id)', + user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + market_id long NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '리뷰내용', + star FLOAT NOT NULL COMMENT '0~5까지', + PRIMARY KEY (id) +) COMMENT '마켓과 유저사이의 리뷰'; + +CREATE TABLE review_alram +( + id long NOT NULL DEFAULT autoincrement, + user_id long NOT NULL COMMENT '가게 id', + foodmarket_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', + content VARCHAR NOT NULL COMMENT '알람내용(리뷰관련 내용)', + PRIMARY KEY (id) +) COMMENT '리뷰해주세용'; + +CREATE TABLE review_image +( + id long NOT NULL DEFAULT autoincrement COMMENT '고유이미지_id', + review_id long NOT NULL COMMENT '리뷰 고유(id)', + url VARCHAR(200) NOT NULL COMMENT '이미지 uri', + PRIMARY KEY (id) +) COMMENT '리뷰에 쓰이는 이미지들'; + +CREATE TABLE user +( + id long NOT NULL DEFAULT autoincrement COMMENT '유저 (id)db내에서의 불변고유식별자', + email VARCHAR(50) NOT NULL COMMENT '로그인할때 이메일(유니크 속성주기)', + password VARCHAR(30) NULL COMMENT '8자리이상 영문 숫자 특수문자 조합하셈', + name VARCHAR(20) NOT NULL COMMENT '이름임', + gender INTEGER NOT NULL COMMENT '남자0,여자1, 제삼의 성(?)3', + birth DATETIME NOT NULL COMMENT '8자리', + address VARCHAR(50) NOT NULL COMMENT '주소', + point INTEGER NOT NULL COMMENT '총 point', + PRIMARY KEY (id) +) COMMENT 'user_information'; + +ALTER TABLE review_image + ADD CONSTRAINT FK_review_TO_review_image + FOREIGN KEY (review_id) + REFERENCES review (id); + +ALTER TABLE permission_mission + ADD CONSTRAINT FK_user_TO_permission_mission + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE review + ADD CONSTRAINT FK_foodmarket_TO_review + FOREIGN KEY (market_id) + REFERENCES foodmarket (id); + +ALTER TABLE review + ADD CONSTRAINT FK_user_TO_review + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE mission + ADD CONSTRAINT FK_foodmarket_TO_mission + FOREIGN KEY (market_id) + REFERENCES foodmarket (id); + +ALTER TABLE permission_mission + ADD CONSTRAINT FK_mission_TO_permission_mission + FOREIGN KEY (mission_id) + REFERENCES mission (id); + +ALTER TABLE favorate_food + ADD CONSTRAINT FK_food_TO_favorate_food + FOREIGN KEY (food_id) + REFERENCES food (id); + +ALTER TABLE favorate_food + ADD CONSTRAINT FK_user_TO_favorate_food + FOREIGN KEY (user_id) + REFERENCES user (id); + +ALTER TABLE review_alram + ADD CONSTRAINT FK_foodmarket_TO_review_alram + FOREIGN KEY (user_id) + REFERENCES foodmarket (id); + +ALTER TABLE review_alram + ADD CONSTRAINT FK_user_TO_review_alram + FOREIGN KEY (foodmarket_id) + REFERENCES user (id); + +ALTER TABLE mission+user + ADD CONSTRAINT FK_mission_TO_mission+user + FOREIGN KEY (mission_id) + REFERENCES mission (id); + +ALTER TABLE mission+user + ADD CONSTRAINT FK_user_TO_mission+user + FOREIGN KEY (user_id) + REFERENCES user (id); diff --git a/week4/demo/src/main/resources/application.properties b/week4/demo/src/main/resources/application.properties new file mode 100644 index 0000000..2109a44 --- /dev/null +++ b/week4/demo/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/week4/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/week4/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/week4/demo/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} From 025df9748a5647d7209a86a431c89f8396dc74cf Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:56:52 +0900 Subject: [PATCH 04/30] add ddl --- .idea/dataSources.xml | 18 ++ .idea/misc.xml | 2 +- .../main/java/com/example/demo/ddl/market.sql | 294 +++++++++--------- 3 files changed, 162 insertions(+), 152 deletions(-) create mode 100644 .idea/dataSources.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..201656c --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,18 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306 + + + + + + + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..20f033c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/ddl/market.sql b/week4/demo/src/main/java/com/example/demo/ddl/market.sql index 83e0a0e..39fec43 100644 --- a/week4/demo/src/main/java/com/example/demo/ddl/market.sql +++ b/week4/demo/src/main/java/com/example/demo/ddl/market.sql @@ -1,151 +1,143 @@ - -CREATE TABLE favorate_food -( - id long NOT NULL COMMENT '유저선호음식코드', - food_id long NOT NULL COMMENT '음식 카테고리를 정하고 함', - user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', - PRIMARY KEY (id) -) COMMENT '선호음식'; - -CREATE TABLE food -( - id long NOT NULL DEFAULT autoincrement COMMENT '음식 카테고리를 정하고 함', - name VARCHAR(40) NOT NULL COMMENT '음식카테고리 이름', - PRIMARY KEY (id) -) COMMENT '푸드카테고리'; - -CREATE TABLE foodmarket -( - id long NOT NULL DEFAULT autoincrement COMMENT '가게 id', - name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', - address VARCHAR(50) NOT NULL COMMENT '가게주소', - open BOOLEAN NOT NULL COMMENT '영업중이냐?', - content VARCHAR(200) NOT NULL COMMENT '가계 내용', - PRIMARY KEY (id) -); - -CREATE TABLE mission -( - id long NOT NULL DEFAULT autoincrement COMMENT '고유미션_id', - market_id long NOT NULL COMMENT '가게 id', - content VARCHAR(100) NOT NULL COMMENT '미션내용', - mission_point INTEGER NOT NULL COMMENT '미션포인트', - PRIMARY KEY (id) -) COMMENT '마켓과 유저 사이의 미션'; - -CREATE TABLE mission+user -( - id long NOT NULL DEFAULT autoincrement, - mission_id long NOT NULL COMMENT '고유미션_id', - user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', - content VARCHAR NOT NULL COMMENT '새 미션에 대한 내용', - PRIMARY KEY (id) - ) COMMENT '신규 미션 받아라 유저!'; - -CREATE TABLE permission_mission -( - id long NOT NULL DEFAULT autoincrement COMMENT '유저 미션할당번호(이거 사장님한테 보여주면 댐)', - user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', - mission_id long NOT NULL COMMENT '고유미션_id', - PRIMARY KEY (id) -); - -CREATE TABLE review -( - id long NOT NULL DEFAULT autoincrement COMMENT '리뷰 고유(id)', - user_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', - market_id long NOT NULL COMMENT '가게 id', - content VARCHAR(100) NOT NULL COMMENT '리뷰내용', - star FLOAT NOT NULL COMMENT '0~5까지', - PRIMARY KEY (id) -) COMMENT '마켓과 유저사이의 리뷰'; - -CREATE TABLE review_alram -( - id long NOT NULL DEFAULT autoincrement, - user_id long NOT NULL COMMENT '가게 id', - foodmarket_id long NOT NULL COMMENT '유저 (id)db내에서의 불변고유식별자', - content VARCHAR NOT NULL COMMENT '알람내용(리뷰관련 내용)', - PRIMARY KEY (id) -) COMMENT '리뷰해주세용'; - -CREATE TABLE review_image -( - id long NOT NULL DEFAULT autoincrement COMMENT '고유이미지_id', - review_id long NOT NULL COMMENT '리뷰 고유(id)', - url VARCHAR(200) NOT NULL COMMENT '이미지 uri', - PRIMARY KEY (id) -) COMMENT '리뷰에 쓰이는 이미지들'; - -CREATE TABLE user -( - id long NOT NULL DEFAULT autoincrement COMMENT '유저 (id)db내에서의 불변고유식별자', - email VARCHAR(50) NOT NULL COMMENT '로그인할때 이메일(유니크 속성주기)', - password VARCHAR(30) NULL COMMENT '8자리이상 영문 숫자 특수문자 조합하셈', - name VARCHAR(20) NOT NULL COMMENT '이름임', - gender INTEGER NOT NULL COMMENT '남자0,여자1, 제삼의 성(?)3', - birth DATETIME NOT NULL COMMENT '8자리', - address VARCHAR(50) NOT NULL COMMENT '주소', - point INTEGER NOT NULL COMMENT '총 point', - PRIMARY KEY (id) -) COMMENT 'user_information'; - -ALTER TABLE review_image - ADD CONSTRAINT FK_review_TO_review_image - FOREIGN KEY (review_id) - REFERENCES review (id); - -ALTER TABLE permission_mission - ADD CONSTRAINT FK_user_TO_permission_mission - FOREIGN KEY (user_id) - REFERENCES user (id); - -ALTER TABLE review - ADD CONSTRAINT FK_foodmarket_TO_review - FOREIGN KEY (market_id) - REFERENCES foodmarket (id); - -ALTER TABLE review - ADD CONSTRAINT FK_user_TO_review - FOREIGN KEY (user_id) - REFERENCES user (id); - -ALTER TABLE mission - ADD CONSTRAINT FK_foodmarket_TO_mission - FOREIGN KEY (market_id) - REFERENCES foodmarket (id); - -ALTER TABLE permission_mission - ADD CONSTRAINT FK_mission_TO_permission_mission - FOREIGN KEY (mission_id) - REFERENCES mission (id); - -ALTER TABLE favorate_food - ADD CONSTRAINT FK_food_TO_favorate_food - FOREIGN KEY (food_id) - REFERENCES food (id); - -ALTER TABLE favorate_food - ADD CONSTRAINT FK_user_TO_favorate_food - FOREIGN KEY (user_id) - REFERENCES user (id); - -ALTER TABLE review_alram - ADD CONSTRAINT FK_foodmarket_TO_review_alram - FOREIGN KEY (user_id) - REFERENCES foodmarket (id); - -ALTER TABLE review_alram - ADD CONSTRAINT FK_user_TO_review_alram - FOREIGN KEY (foodmarket_id) - REFERENCES user (id); - -ALTER TABLE mission+user - ADD CONSTRAINT FK_mission_TO_mission+user - FOREIGN KEY (mission_id) - REFERENCES mission (id); - -ALTER TABLE mission+user - ADD CONSTRAINT FK_user_TO_mission+user - FOREIGN KEY (user_id) - REFERENCES user (id); +CREATE TABLE users ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 고유 식별자', + email VARCHAR(50) NOT NULL COMMENT '로그인 이메일(유니크)', + password VARCHAR(100) NOT NULL COMMENT '비밀번호 해시(예: bcrypt 60자)', + name VARCHAR(20) NOT NULL COMMENT '이름', + gender TINYINT NOT NULL COMMENT '0:남, 1:여, 2:기타 등', + birth DATE NOT NULL COMMENT '생년월일', + address VARCHAR(50) NOT NULL COMMENT '주소', + point INT NOT NULL DEFAULT 0 COMMENT '총 포인트', + PRIMARY KEY (id), + UNIQUE KEY UK_users_email (email) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='user_information'; + +-- 음식 카테고리 +CREATE TABLE food ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '음식 카테고리 ID', + name VARCHAR(40) NOT NULL COMMENT '음식 카테고리 이름', + PRIMARY KEY (id), + UNIQUE KEY UK_food_name (name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드카테고리'; + +-- 선호 음식 (유저-음식) +CREATE TABLE favorite_food ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저선호음식코드', + food_id BIGINT NOT NULL COMMENT '음식 카테고리 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + PRIMARY KEY (id), + UNIQUE KEY UK_favorite_food_user_food (user_id, food_id), + KEY IDX_favorite_food_food (food_id), + CONSTRAINT FK_favorite_food_food + FOREIGN KEY (food_id) REFERENCES food (id) + ON UPDATE CASCADE ON DELETE RESTRICT, + CONSTRAINT FK_favorite_food_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='선호음식'; + +-- 가게 +CREATE TABLE foodmarket ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '가게 id', + name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', + address VARCHAR(50) NOT NULL COMMENT '가게주소', + open BOOLEAN NOT NULL COMMENT '영업중 여부', + content VARCHAR(200) NOT NULL COMMENT '가게 소개', + PRIMARY KEY (id), + KEY IDX_foodmarket_name (name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드 마켓'; + +-- 미션(가게별) +CREATE TABLE mission ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 미션 ID', + market_id BIGINT NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '미션 내용', + mission_point INT NOT NULL COMMENT '미션 포인트', + PRIMARY KEY (id), + KEY IDX_mission_market (market_id), + CONSTRAINT FK_mission_foodmarket + FOREIGN KEY (market_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 미션'; + +-- 유저가 받은 미션(신규 신청 등) +CREATE TABLE mission_user ( + id BIGINT NOT NULL AUTO_INCREMENT, + mission_id BIGINT NOT NULL COMMENT '미션 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + content VARCHAR(200) NOT NULL COMMENT '새 미션에 대한 내용', + PRIMARY KEY (id), + UNIQUE KEY UK_mission_user (mission_id, user_id), + KEY IDX_mission_user_mission (mission_id), + KEY IDX_mission_user_user (user_id), + CONSTRAINT FK_mission_user_mission + FOREIGN KEY (mission_id) REFERENCES mission (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_mission_user_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='신규 미션 배정 내역'; + +-- 미션 권한/배정 토큰(사장님 확인용 번호) +CREATE TABLE permission_mission ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 미션할당번호(제시용)', + user_id BIGINT NOT NULL COMMENT '유저 ID', + mission_id BIGINT NOT NULL COMMENT '미션 ID', + PRIMARY KEY (id), + UNIQUE KEY UK_permission_mission (user_id, mission_id), + KEY IDX_permission_mission_user (user_id), + KEY IDX_permission_mission_mission (mission_id), + CONSTRAINT FK_permission_mission_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_permission_mission_mission + FOREIGN KEY (mission_id) REFERENCES mission (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='미션 권한 배정'; + +-- 리뷰 +CREATE TABLE review ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '리뷰 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + market_id BIGINT NOT NULL COMMENT '가게 ID', + content VARCHAR(100) NOT NULL COMMENT '리뷰 내용', + star DECIMAL(2,1) NOT NULL COMMENT '0.0~5.0', + PRIMARY KEY (id), + KEY IDX_review_user (user_id), + KEY IDX_review_market (market_id), + CONSTRAINT CHK_review_star CHECK (star >= 0.0 AND star <= 5.0), + CONSTRAINT FK_review_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_review_foodmarket + FOREIGN KEY (market_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 리뷰'; + +-- 리뷰 알림 +CREATE TABLE review_alarm ( + id BIGINT NOT NULL AUTO_INCREMENT, + user_id BIGINT NOT NULL COMMENT '유저 ID', + foodmarket_id BIGINT NOT NULL COMMENT '가게 ID', + content VARCHAR(200) NOT NULL COMMENT '알람 내용(리뷰 관련)', + PRIMARY KEY (id), + KEY IDX_review_alarm_user (user_id), + KEY IDX_review_alarm_market (foodmarket_id), + CONSTRAINT FK_review_alarm_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_review_alarm_foodmarket + FOREIGN KEY (foodmarket_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 알림'; + +-- 리뷰 이미지 +CREATE TABLE review_image ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 이미지 ID', + review_id BIGINT NOT NULL COMMENT '리뷰 ID', + url VARCHAR(200) NOT NULL COMMENT '이미지 URL', + PRIMARY KEY (id), + KEY IDX_review_image_review (review_id), + CONSTRAINT FK_review_image_review + FOREIGN KEY (review_id) REFERENCES review (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 이미지들'; \ No newline at end of file From 81f3b2a3639f7550cb3347b2dfbee44d47c8f6df Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:14:36 +0900 Subject: [PATCH 05/30] d --- .idea/compiler.xml | 14 ++ .idea/gradle.xml | 15 ++ .idea/jarRepositories.xml | 20 +++ .idea/misc.xml | 4 + .idea/modules.xml | 1 + .idea/modules/demo.main.iml | 8 + out/production/Spring/application.properties | 1 + .../Spring/com/example/demo/ddl/market.sql | 143 ++++++++++++++++++ 8 files changed, 206 insertions(+) create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/modules/demo.main.iml create mode 100644 out/production/Spring/application.properties create mode 100644 out/production/Spring/com/example/demo/ddl/market.sql diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..cb71b67 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..6226378 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 20f033c..1edb17c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,9 @@ + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml index b2041a1..374fdf8 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/.idea/modules/demo.main.iml b/.idea/modules/demo.main.iml new file mode 100644 index 0000000..ff34cbd --- /dev/null +++ b/.idea/modules/demo.main.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/out/production/Spring/application.properties b/out/production/Spring/application.properties new file mode 100644 index 0000000..2109a44 --- /dev/null +++ b/out/production/Spring/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/out/production/Spring/com/example/demo/ddl/market.sql b/out/production/Spring/com/example/demo/ddl/market.sql new file mode 100644 index 0000000..39fec43 --- /dev/null +++ b/out/production/Spring/com/example/demo/ddl/market.sql @@ -0,0 +1,143 @@ +CREATE TABLE users ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 고유 식별자', + email VARCHAR(50) NOT NULL COMMENT '로그인 이메일(유니크)', + password VARCHAR(100) NOT NULL COMMENT '비밀번호 해시(예: bcrypt 60자)', + name VARCHAR(20) NOT NULL COMMENT '이름', + gender TINYINT NOT NULL COMMENT '0:남, 1:여, 2:기타 등', + birth DATE NOT NULL COMMENT '생년월일', + address VARCHAR(50) NOT NULL COMMENT '주소', + point INT NOT NULL DEFAULT 0 COMMENT '총 포인트', + PRIMARY KEY (id), + UNIQUE KEY UK_users_email (email) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='user_information'; + +-- 음식 카테고리 +CREATE TABLE food ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '음식 카테고리 ID', + name VARCHAR(40) NOT NULL COMMENT '음식 카테고리 이름', + PRIMARY KEY (id), + UNIQUE KEY UK_food_name (name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드카테고리'; + +-- 선호 음식 (유저-음식) +CREATE TABLE favorite_food ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저선호음식코드', + food_id BIGINT NOT NULL COMMENT '음식 카테고리 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + PRIMARY KEY (id), + UNIQUE KEY UK_favorite_food_user_food (user_id, food_id), + KEY IDX_favorite_food_food (food_id), + CONSTRAINT FK_favorite_food_food + FOREIGN KEY (food_id) REFERENCES food (id) + ON UPDATE CASCADE ON DELETE RESTRICT, + CONSTRAINT FK_favorite_food_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='선호음식'; + +-- 가게 +CREATE TABLE foodmarket ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '가게 id', + name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', + address VARCHAR(50) NOT NULL COMMENT '가게주소', + open BOOLEAN NOT NULL COMMENT '영업중 여부', + content VARCHAR(200) NOT NULL COMMENT '가게 소개', + PRIMARY KEY (id), + KEY IDX_foodmarket_name (name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드 마켓'; + +-- 미션(가게별) +CREATE TABLE mission ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 미션 ID', + market_id BIGINT NOT NULL COMMENT '가게 id', + content VARCHAR(100) NOT NULL COMMENT '미션 내용', + mission_point INT NOT NULL COMMENT '미션 포인트', + PRIMARY KEY (id), + KEY IDX_mission_market (market_id), + CONSTRAINT FK_mission_foodmarket + FOREIGN KEY (market_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 미션'; + +-- 유저가 받은 미션(신규 신청 등) +CREATE TABLE mission_user ( + id BIGINT NOT NULL AUTO_INCREMENT, + mission_id BIGINT NOT NULL COMMENT '미션 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + content VARCHAR(200) NOT NULL COMMENT '새 미션에 대한 내용', + PRIMARY KEY (id), + UNIQUE KEY UK_mission_user (mission_id, user_id), + KEY IDX_mission_user_mission (mission_id), + KEY IDX_mission_user_user (user_id), + CONSTRAINT FK_mission_user_mission + FOREIGN KEY (mission_id) REFERENCES mission (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_mission_user_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='신규 미션 배정 내역'; + +-- 미션 권한/배정 토큰(사장님 확인용 번호) +CREATE TABLE permission_mission ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 미션할당번호(제시용)', + user_id BIGINT NOT NULL COMMENT '유저 ID', + mission_id BIGINT NOT NULL COMMENT '미션 ID', + PRIMARY KEY (id), + UNIQUE KEY UK_permission_mission (user_id, mission_id), + KEY IDX_permission_mission_user (user_id), + KEY IDX_permission_mission_mission (mission_id), + CONSTRAINT FK_permission_mission_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_permission_mission_mission + FOREIGN KEY (mission_id) REFERENCES mission (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='미션 권한 배정'; + +-- 리뷰 +CREATE TABLE review ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '리뷰 ID', + user_id BIGINT NOT NULL COMMENT '유저 ID', + market_id BIGINT NOT NULL COMMENT '가게 ID', + content VARCHAR(100) NOT NULL COMMENT '리뷰 내용', + star DECIMAL(2,1) NOT NULL COMMENT '0.0~5.0', + PRIMARY KEY (id), + KEY IDX_review_user (user_id), + KEY IDX_review_market (market_id), + CONSTRAINT CHK_review_star CHECK (star >= 0.0 AND star <= 5.0), + CONSTRAINT FK_review_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_review_foodmarket + FOREIGN KEY (market_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 리뷰'; + +-- 리뷰 알림 +CREATE TABLE review_alarm ( + id BIGINT NOT NULL AUTO_INCREMENT, + user_id BIGINT NOT NULL COMMENT '유저 ID', + foodmarket_id BIGINT NOT NULL COMMENT '가게 ID', + content VARCHAR(200) NOT NULL COMMENT '알람 내용(리뷰 관련)', + PRIMARY KEY (id), + KEY IDX_review_alarm_user (user_id), + KEY IDX_review_alarm_market (foodmarket_id), + CONSTRAINT FK_review_alarm_users + FOREIGN KEY (user_id) REFERENCES users (id) + ON UPDATE CASCADE ON DELETE CASCADE, + CONSTRAINT FK_review_alarm_foodmarket + FOREIGN KEY (foodmarket_id) REFERENCES foodmarket (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 알림'; + +-- 리뷰 이미지 +CREATE TABLE review_image ( + id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 이미지 ID', + review_id BIGINT NOT NULL COMMENT '리뷰 ID', + url VARCHAR(200) NOT NULL COMMENT '이미지 URL', + PRIMARY KEY (id), + KEY IDX_review_image_review (review_id), + CONSTRAINT FK_review_image_review + FOREIGN KEY (review_id) REFERENCES review (id) + ON UPDATE CASCADE ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 이미지들'; \ No newline at end of file From 205470964fbad673763ef4225ffb3e0966c30962 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:16:24 +0900 Subject: [PATCH 06/30] d --- .idea/gradle.xml | 1 + .idea/modules/demo.main.iml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6226378..1a324e0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ + \ No newline at end of file From 4682f02cff74112d18e391f395034fe0c1f862ec Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:45:51 +0900 Subject: [PATCH 07/30] jpa entity commit 1/5 --- .../java/com/example/demo/entity/Food.java | 20 ++++++++++ .../java/com/example/demo/entity/User.java | 39 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 week4/demo/src/main/java/com/example/demo/entity/Food.java create mode 100644 week4/demo/src/main/java/com/example/demo/entity/User.java diff --git a/week4/demo/src/main/java/com/example/demo/entity/Food.java b/week4/demo/src/main/java/com/example/demo/entity/Food.java new file mode 100644 index 0000000..5581996 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/entity/Food.java @@ -0,0 +1,20 @@ +package com.example.demo.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Table(name = "Food") +@Entity@Getter@Setter +@NoArgsConstructor@AllArgsConstructor +public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column(nullable = false,length = 40) + private String name; +} diff --git a/week4/demo/src/main/java/com/example/demo/entity/User.java b/week4/demo/src/main/java/com/example/demo/entity/User.java new file mode 100644 index 0000000..eac86b4 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/entity/User.java @@ -0,0 +1,39 @@ +package com.example.demo.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDate; + +@Entity +@Table(name = "users") +@Getter@Setter@NoArgsConstructor@AllArgsConstructor +public class User { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @Column(nullable = false,length = 50) + private String email; + + @Column(nullable = false,length =100) + private String password; + + @Column(nullable = false,length = 20) + private String name; + + @Column(nullable = false) + private Byte gender; + + @Column(nullable = false) + private LocalDate birth; + + @Column(nullable = false,length = 50) + private String address; + + @Column(nullable = false) + private String point; +} From d2d1ab4b39580dd5697d2eda5a9462eaad0cb5cb Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 17:03:39 +0900 Subject: [PATCH 08/30] jpa entity commit 2/5 --- .idea/sqldialects.xml | 6 +++++ .../main/java/com/example/demo/ddl/market.sql | 1 + .../com/example/demo/entity/FavoriteFood.java | 27 +++++++++++++++++++ .../java/com/example/demo/entity/Food.java | 2 +- 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .idea/sqldialects.xml create mode 100644 week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..dbac908 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/ddl/market.sql b/week4/demo/src/main/java/com/example/demo/ddl/market.sql index 39fec43..9de3b7f 100644 --- a/week4/demo/src/main/java/com/example/demo/ddl/market.sql +++ b/week4/demo/src/main/java/com/example/demo/ddl/market.sql @@ -1,3 +1,4 @@ +use market; CREATE TABLE users ( id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 고유 식별자', email VARCHAR(50) NOT NULL COMMENT '로그인 이메일(유니크)', diff --git a/week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java new file mode 100644 index 0000000..bdbc9d4 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java @@ -0,0 +1,27 @@ +package com.example.demo.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Table(name ="favorite_food") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class FavoriteFood { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @ManyToOne(optional = false,fetch = FetchType.LAZY) + @JoinColumn(name = "food_id",nullable = false) + private Food food; + + @ManyToOne(optional = false,fetch = FetchType.LAZY) + @JoinColumn(name = "user_id",nullable = false) + private User user; +} diff --git a/week4/demo/src/main/java/com/example/demo/entity/Food.java b/week4/demo/src/main/java/com/example/demo/entity/Food.java index 5581996..9a2b93c 100644 --- a/week4/demo/src/main/java/com/example/demo/entity/Food.java +++ b/week4/demo/src/main/java/com/example/demo/entity/Food.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; -@Table(name = "Food") +@Table(name = "food") @Entity@Getter@Setter @NoArgsConstructor@AllArgsConstructor public class Food { From 983590eec4fce58f4dcd1dd05867f60356d1672f Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 17:26:45 +0900 Subject: [PATCH 09/30] jpa entity commit 3/5 --- .../demo/{entity => domain}/FavoriteFood.java | 3 +- .../example/demo/{entity => domain}/Food.java | 2 +- .../com/example/demo/domain/FoodMarket.java | 23 ++++++++++++++ .../java/com/example/demo/domain/Mission.java | 21 +++++++++++++ .../com/example/demo/domain/MissionUser.java | 22 ++++++++++++++ .../demo/domain/PermissionMission.java | 19 ++++++++++++ .../java/com/example/demo/domain/Review.java | 30 +++++++++++++++++++ .../com/example/demo/domain/ReviewAlarm.java | 22 ++++++++++++++ .../com/example/demo/domain/ReviewImage.java | 18 +++++++++++ .../{entity/User.java => domain/Users.java} | 4 +-- 10 files changed, 160 insertions(+), 4 deletions(-) rename week4/demo/src/main/java/com/example/demo/{entity => domain}/FavoriteFood.java (90%) rename week4/demo/src/main/java/com/example/demo/{entity => domain}/Food.java (92%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/Mission.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/MissionUser.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/Review.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java rename week4/demo/src/main/java/com/example/demo/{entity/User.java => domain/Users.java} (93%) diff --git a/week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java similarity index 90% rename from week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java rename to week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java index bdbc9d4..0d1eb16 100644 --- a/week4/demo/src/main/java/com/example/demo/entity/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java @@ -1,10 +1,11 @@ -package com.example.demo.entity; +package com.example.demo.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.apache.catalina.User; @Entity @Table(name ="favorite_food") diff --git a/week4/demo/src/main/java/com/example/demo/entity/Food.java b/week4/demo/src/main/java/com/example/demo/domain/Food.java similarity index 92% rename from week4/demo/src/main/java/com/example/demo/entity/Food.java rename to week4/demo/src/main/java/com/example/demo/domain/Food.java index 9a2b93c..d1dddba 100644 --- a/week4/demo/src/main/java/com/example/demo/entity/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/Food.java @@ -1,4 +1,4 @@ -package com.example.demo.entity; +package com.example.demo.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java b/week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java new file mode 100644 index 0000000..65dc465 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java @@ -0,0 +1,23 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "foodmarket") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class FoodMarket { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable=false, length=40) + private String name; + + @Column(nullable=false, length=50) + private String address; + + @Column(nullable=false) + private Boolean open; + + @Column(nullable=false, length=200) + private String content; +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/Mission.java b/week4/demo/src/main/java/com/example/demo/domain/Mission.java new file mode 100644 index 0000000..49e3f15 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/Mission.java @@ -0,0 +1,21 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "mission") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class Mission { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="market_id", nullable=false) + private FoodMarket market; + + @Column(nullable=false, length=100) + private String content; + + @Column(name="mission_point", nullable=false) + private Integer missionPoint; +} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/MissionUser.java new file mode 100644 index 0000000..e6484f0 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/MissionUser.java @@ -0,0 +1,22 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "mission_user") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class MissionUser { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="mission_id", nullable=false) + private Mission mission; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="user_id", nullable=false) + private Users user; + + @Column(nullable=false, length=200) + private String content; +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java b/week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java new file mode 100644 index 0000000..206b1c8 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java @@ -0,0 +1,19 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "permission_mission") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class PermissionMission { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="user_id", nullable=false) + private Users user; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="mission_id", nullable=false) + private Mission mission; +} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/Review.java b/week4/demo/src/main/java/com/example/demo/domain/Review.java new file mode 100644 index 0000000..dbd3abb --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/Review.java @@ -0,0 +1,30 @@ +package com.example.demo.domain; + + +import jakarta.persistence.*; +import lombok.*; + +import java.math.BigDecimal; + +@Entity @Table(name = "review") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class Review { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="user_id", nullable=false) + private Users user; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="market_id", nullable=false) + private FoodMarket market; + + @Column(nullable=false, length=100) + private String content; + + // DB는 DECIMAL(2,1), JPA는 BigDecimal로 매핑 + @Column(nullable=false, precision=2, scale=1) + private BigDecimal star; +} + diff --git a/week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java b/week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java new file mode 100644 index 0000000..54fde7b --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java @@ -0,0 +1,22 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "review_alarm") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class ReviewAlarm { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="user_id", nullable=false) + private Users user; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="foodmarket_id", nullable=false) + private FoodMarket foodmarket; + + @Column(nullable=false, length=200) + private String content; +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java b/week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java new file mode 100644 index 0000000..6511f5f --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java @@ -0,0 +1,18 @@ +package com.example.demo.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity @Table(name = "review_image") +@Getter @Setter @NoArgsConstructor @AllArgsConstructor +public class ReviewImage { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(optional=false, fetch=FetchType.LAZY) + @JoinColumn(name="review_id", nullable=false) + private Review review; + + @Column(nullable=false, length=200) + private String url; +} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/entity/User.java b/week4/demo/src/main/java/com/example/demo/domain/Users.java similarity index 93% rename from week4/demo/src/main/java/com/example/demo/entity/User.java rename to week4/demo/src/main/java/com/example/demo/domain/Users.java index eac86b4..e5d9679 100644 --- a/week4/demo/src/main/java/com/example/demo/entity/User.java +++ b/week4/demo/src/main/java/com/example/demo/domain/Users.java @@ -1,4 +1,4 @@ -package com.example.demo.entity; +package com.example.demo.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -11,7 +11,7 @@ @Entity @Table(name = "users") @Getter@Setter@NoArgsConstructor@AllArgsConstructor -public class User { +public class Users { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; From 19e6a23621fedcaf574af9a50e3d4531dec1d213 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 18:20:49 +0900 Subject: [PATCH 10/30] Spring connet test --- .idea/dataSources.xml | 4 ++-- week4/demo/build.gradle | 2 ++ .../com/example/demo/domain/FavoriteFood.java | 4 ++-- .../main/java/com/example/demo/domain/Users.java | 2 +- .../src/main/resources/application.properties | 1 - week4/demo/src/main/resources/application.yml | 16 ++++++++++++++++ 6 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 week4/demo/src/main/resources/application.properties create mode 100644 week4/demo/src/main/resources/application.yml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 201656c..b3abbcd 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,11 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver - jdbc:mysql://localhost:3306 + jdbc:mysql://localhost:3306/market diff --git a/week4/demo/build.gradle b/week4/demo/build.gradle index 3a91725..4cad089 100644 --- a/week4/demo/build.gradle +++ b/week4/demo/build.gradle @@ -30,6 +30,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + runtimeOnly 'com.mysql:mysql-connector-j' } tasks.named('test') { diff --git a/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java index 0d1eb16..1f25df6 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.apache.catalina.User; + @Entity @Table(name ="favorite_food") @@ -24,5 +24,5 @@ public class FavoriteFood { @ManyToOne(optional = false,fetch = FetchType.LAZY) @JoinColumn(name = "user_id",nullable = false) - private User user; + private Users user; } diff --git a/week4/demo/src/main/java/com/example/demo/domain/Users.java b/week4/demo/src/main/java/com/example/demo/domain/Users.java index e5d9679..755d79d 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/Users.java @@ -35,5 +35,5 @@ public class Users { private String address; @Column(nullable = false) - private String point; + private Integer point; } diff --git a/week4/demo/src/main/resources/application.properties b/week4/demo/src/main/resources/application.properties deleted file mode 100644 index 2109a44..0000000 --- a/week4/demo/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=demo diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml new file mode 100644 index 0000000..9cc90c0 --- /dev/null +++ b/week4/demo/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + application: + name :demo + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver #mysql???.. + url: ${DB_URL} + username: ${DB_USERNAME}X + password: ${DB_PASSWORD} + + jpa: + hibernate: + ddl-auto: validate + database: mysql + database-platform: org.hibernate.dialect.MySQLDialect + show-sql: true \ No newline at end of file From 156a6c8368af22b264b2af2f5d0063701bbaccc9 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Fri, 17 Oct 2025 19:46:11 +0900 Subject: [PATCH 11/30] dd --- .idea/dataSources.xml | 2 +- week4/demo/src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index b3abbcd..cf03916 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index 9cc90c0..aa8e997 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver #mysql???.. url: ${DB_URL} - username: ${DB_USERNAME}X + username: ${DB_USERNAME} password: ${DB_PASSWORD} jpa: From 044492f299a11b2d3bf22f29c2759d1dfd923b25 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Sun, 2 Nov 2025 18:51:52 +0900 Subject: [PATCH 12/30] refactoring entitiy --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../demo/domain/{ => alarm}/ReviewAlarm.java | 4 +- .../domain/{ => member}/FavoriteFood.java | 2 +- .../demo/domain/{ => member}/Food.java | 2 +- .../demo/domain/{ => member}/Users.java | 2 +- .../demo/domain/{ => mission}/Mission.java | 3 +- .../domain/{ => mission}/MissionUser.java | 3 +- .../{ => mission}/PermissionMission.java | 3 +- .../domain/{ => restruant}/FoodMarket.java | 2 +- .../demo/domain/{ => review}/Review.java | 4 +- .../demo/domain/{ => review}/ReviewImage.java | 2 +- 11 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 .idea/uiDesigner.xml rename week4/demo/src/main/java/com/example/demo/domain/{ => alarm}/ReviewAlarm.java (81%) rename week4/demo/src/main/java/com/example/demo/domain/{ => member}/FavoriteFood.java (93%) rename week4/demo/src/main/java/com/example/demo/domain/{ => member}/Food.java (90%) rename week4/demo/src/main/java/com/example/demo/domain/{ => member}/Users.java (95%) rename week4/demo/src/main/java/com/example/demo/domain/{ => mission}/Mission.java (84%) rename week4/demo/src/main/java/com/example/demo/domain/{ => mission}/MissionUser.java (87%) rename week4/demo/src/main/java/com/example/demo/domain/{ => mission}/PermissionMission.java (85%) rename week4/demo/src/main/java/com/example/demo/domain/{ => restruant}/FoodMarket.java (92%) rename week4/demo/src/main/java/com/example/demo/domain/{ => review}/Review.java (84%) rename week4/demo/src/main/java/com/example/demo/domain/{ => review}/ReviewImage.java (91%) diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java b/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java similarity index 81% rename from week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java rename to week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java index 54fde7b..07e2c05 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/ReviewAlarm.java +++ b/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java @@ -1,5 +1,7 @@ -package com.example.demo.domain; +package com.example.demo.domain.alarm; +import com.example.demo.domain.member.Users; +import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java similarity index 93% rename from week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java rename to week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java index 1f25df6..1e5c82b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.domain.member; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/week4/demo/src/main/java/com/example/demo/domain/Food.java b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java similarity index 90% rename from week4/demo/src/main/java/com/example/demo/domain/Food.java rename to week4/demo/src/main/java/com/example/demo/domain/member/Food.java index d1dddba..9e00f97 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.domain.member; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/week4/demo/src/main/java/com/example/demo/domain/Users.java b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java similarity index 95% rename from week4/demo/src/main/java/com/example/demo/domain/Users.java rename to week4/demo/src/main/java/com/example/demo/domain/member/Users.java index 755d79d..ec3359f 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.domain.member; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/week4/demo/src/main/java/com/example/demo/domain/Mission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java similarity index 84% rename from week4/demo/src/main/java/com/example/demo/domain/Mission.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java index 49e3f15..260cecc 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/Mission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java @@ -1,5 +1,6 @@ -package com.example.demo.domain; +package com.example.demo.domain.mission; +import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java similarity index 87% rename from week4/demo/src/main/java/com/example/demo/domain/MissionUser.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java index e6484f0..d818ba1 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java @@ -1,5 +1,6 @@ -package com.example.demo.domain; +package com.example.demo.domain.mission; +import com.example.demo.domain.member.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java similarity index 85% rename from week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java index 206b1c8..95fb51b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/PermissionMission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java @@ -1,5 +1,6 @@ -package com.example.demo.domain; +package com.example.demo.domain.mission; +import com.example.demo.domain.member.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java b/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java similarity index 92% rename from week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java rename to week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java index 65dc465..dcead73 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/FoodMarket.java +++ b/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.domain.restruant; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/Review.java b/week4/demo/src/main/java/com/example/demo/domain/review/Review.java similarity index 84% rename from week4/demo/src/main/java/com/example/demo/domain/Review.java rename to week4/demo/src/main/java/com/example/demo/domain/review/Review.java index dbd3abb..ed2408c 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/Review.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Review.java @@ -1,6 +1,8 @@ -package com.example.demo.domain; +package com.example.demo.domain.review; +import com.example.demo.domain.member.Users; +import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java b/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java similarity index 91% rename from week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java rename to week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java index 6511f5f..2d0ab6f 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/ReviewImage.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.domain.review; import jakarta.persistence.*; import lombok.*; From 9bfbad21b37e38558db941a19dc17c7f85975288 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Sun, 2 Nov 2025 20:18:29 +0900 Subject: [PATCH 13/30] misson/week#5 --- .../com/example/demo/domain/BaseEntity.java | 25 +++++++++++++++++++ .../demo/domain/alarm/ReviewAlarm.java | 3 ++- .../demo/domain/member/FavoriteFood.java | 3 ++- .../com/example/demo/domain/member/Food.java | 3 ++- .../com/example/demo/domain/member/Users.java | 3 ++- .../example/demo/domain/mission/Mission.java | 3 ++- .../demo/domain/mission/MissionUser.java | 3 ++- .../domain/mission/PermissionMission.java | 3 ++- .../demo/domain/restruant/FoodMarket.java | 3 ++- .../example/demo/domain/review/Review.java | 4 +-- .../demo/domain/review/ReviewImage.java | 3 ++- .../member/FavoriteFoodRepository.java | 9 +++++++ .../repository/member/UsersRepository.java | 14 +++++++++++ .../repository/mission/MissionRepository.java | 13 ++++++++++ .../mission/MissionUserRepository.java | 13 ++++++++++ .../repository/reveiw/ReviewRepository.java | 14 +++++++++++ week4/demo/src/main/resources/application.yml | 2 +- 17 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java create mode 100644 week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java create mode 100644 week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java create mode 100644 week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java create mode 100644 week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java create mode 100644 week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java diff --git a/week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java b/week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java new file mode 100644 index 0000000..0208bcb --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java @@ -0,0 +1,25 @@ +package com.example.demo.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.Instant; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + @Column(nullable = false, updatable = false) + private Instant createdAt; + + @LastModifiedDate + @Column(nullable = false) + private Instant updatedAt; +} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java b/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java index 07e2c05..894a9b1 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java +++ b/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java @@ -1,5 +1,6 @@ package com.example.demo.domain.alarm; +import com.example.demo.domain.BaseEntity; import com.example.demo.domain.member.Users; import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; @@ -7,7 +8,7 @@ @Entity @Table(name = "review_alarm") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class ReviewAlarm { +public class ReviewAlarm extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java index 1e5c82b..2efa8d2 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java @@ -1,5 +1,6 @@ package com.example.demo.domain.member; +import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; @@ -13,7 +14,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class FavoriteFood { +public class FavoriteFood extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java index 9e00f97..084c4e9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java @@ -1,5 +1,6 @@ package com.example.demo.domain.member; +import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; @@ -9,7 +10,7 @@ @Table(name = "food") @Entity@Getter@Setter @NoArgsConstructor@AllArgsConstructor -public class Food { +public class Food extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java index ec3359f..e240761 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java @@ -1,5 +1,6 @@ package com.example.demo.domain.member; +import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; @@ -11,7 +12,7 @@ @Entity @Table(name = "users") @Getter@Setter@NoArgsConstructor@AllArgsConstructor -public class Users { +public class Users extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private int id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java index 260cecc..7a109e7 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java @@ -1,12 +1,13 @@ package com.example.demo.domain.mission; +import com.example.demo.domain.BaseEntity; import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; import lombok.*; @Entity @Table(name = "mission") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class Mission { +public class Mission extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java index d818ba1..2c027f0 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java @@ -1,12 +1,13 @@ package com.example.demo.domain.mission; +import com.example.demo.domain.BaseEntity; import com.example.demo.domain.member.Users; import jakarta.persistence.*; import lombok.*; @Entity @Table(name = "mission_user") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class MissionUser { +public class MissionUser extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java index 95fb51b..22fca02 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java @@ -1,12 +1,13 @@ package com.example.demo.domain.mission; +import com.example.demo.domain.BaseEntity; import com.example.demo.domain.member.Users; import jakarta.persistence.*; import lombok.*; @Entity @Table(name = "permission_mission") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class PermissionMission { +public class PermissionMission extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java b/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java index dcead73..72fc41c 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java +++ b/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java @@ -1,11 +1,12 @@ package com.example.demo.domain.restruant; +import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; import lombok.*; @Entity @Table(name = "foodmarket") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class FoodMarket { +public class FoodMarket extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Review.java b/week4/demo/src/main/java/com/example/demo/domain/review/Review.java index ed2408c..3d68756 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Review.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Review.java @@ -1,6 +1,7 @@ package com.example.demo.domain.review; +import com.example.demo.domain.BaseEntity; import com.example.demo.domain.member.Users; import com.example.demo.domain.restruant.FoodMarket; import jakarta.persistence.*; @@ -10,7 +11,7 @@ @Entity @Table(name = "review") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class Review { +public class Review extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -25,7 +26,6 @@ public class Review { @Column(nullable=false, length=100) private String content; - // DB는 DECIMAL(2,1), JPA는 BigDecimal로 매핑 @Column(nullable=false, precision=2, scale=1) private BigDecimal star; } diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java b/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java index 2d0ab6f..4351d65 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java @@ -1,11 +1,12 @@ package com.example.demo.domain.review; +import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; import lombok.*; @Entity @Table(name = "review_image") @Getter @Setter @NoArgsConstructor @AllArgsConstructor -public class ReviewImage { +public class ReviewImage extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; diff --git a/week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java b/week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java new file mode 100644 index 0000000..b183842 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.repository.member; + +import com.example.demo.domain.member.FavoriteFood; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface FavoriteFoodRepository extends JpaRepository { + +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java b/week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java new file mode 100644 index 0000000..11cfa8e --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java @@ -0,0 +1,14 @@ +package com.example.demo.repository.member; + +import com.example.demo.domain.member.Users; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.Optional; + +public interface UsersRepository extends JpaRepository { + Optional findById(Long userId); + + @Query("select u from Users u WHERE u.id=:userId") + Optional findById2(Long userId); +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java b/week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java new file mode 100644 index 0000000..b3a7961 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.repository.mission; + +import com.example.demo.domain.mission.Mission; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface MissionRepository extends JpaRepository { + List findMissionsByContentOrderByUpdatedAt(String Content); + @Query("select m from Mission m where m.content=:Content order by m.updatedAt desc") + List findMissionsByContentOrderByUpdatedAt2(String Content); +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java b/week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java new file mode 100644 index 0000000..7a37872 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java @@ -0,0 +1,13 @@ +package com.example.demo.repository.mission; + +import com.example.demo.domain.mission.MissionUser; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface MissionUserRepository extends JpaRepository { + List findByUser_IdOrderByUpdatedAtDesc(int userId); + @Query("select mu from MissionUser mu join fetch mu.mission where mu.user.id = :userId order by mu.updatedAt desc ") + List findByUser_IdOrderByUpdatedAtDesc2(int userId); +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java b/week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java new file mode 100644 index 0000000..dcea8c8 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java @@ -0,0 +1,14 @@ +package com.example.demo.repository.reveiw; + +import com.example.demo.domain.review.Review; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface ReviewRepository extends JpaRepository { + List findReviewsByMarket_IdOrderByUpdatedAtDesc(Long marketId); + @Query("SELECT r from Review r join fetch r.user where r.market.id=:marketId order by r.updatedAt desc ") + List findReviewsByMarket_IdOrderByUpdatedAtDesc2(@Param("marketId") Long marketId); +} diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index aa8e997..3beec84 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: jpa: hibernate: - ddl-auto: validate + ddl-auto: create database: mysql database-platform: org.hibernate.dialect.MySQLDialect show-sql: true \ No newline at end of file From 4f3bbf44838ab05eedf84c5716c3996fbc491ce1 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 11 Nov 2025 12:52:15 +0900 Subject: [PATCH 14/30] made a qQDsl api --- .idea/compiler.xml | 11 ++++ .idea/dataSources.xml | 2 +- .idea/modules/demo.main.iml | 3 -- week4/demo/build.gradle | 24 +++++++++ .../com/example/demo/DemoApplication.java | 2 + .../java/com/example/demo/QuerydslConfig.java | 15 ++++++ .../demo/controller/ReviewController.java | 29 +++++++++++ .../demo/domain/member/FavoriteFood.java | 2 +- .../com/example/demo/domain/member/Food.java | 2 +- .../com/example/demo/domain/member/Users.java | 2 +- .../java/com/example/demo/dto/ReviewDto.java | 12 +++++ .../{reveiw => review}/ReviewRepository.java | 2 +- .../example/demo/service/ReviewService.java | 52 +++++++++++++++++++ week4/demo/src/main/resources/application.yml | 2 +- 14 files changed, 151 insertions(+), 9 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/QuerydslConfig.java create mode 100644 week4/demo/src/main/java/com/example/demo/controller/ReviewController.java create mode 100644 week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java rename week4/demo/src/main/java/com/example/demo/repository/{reveiw => review}/ReviewRepository.java (93%) create mode 100644 week4/demo/src/main/java/com/example/demo/service/ReviewService.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cb71b67..23e1696 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,6 +6,17 @@ + + + + + + + + + + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index cf03916..b3abbcd 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/.idea/modules/demo.main.iml b/.idea/modules/demo.main.iml index 18e4245..71cefaf 100644 --- a/.idea/modules/demo.main.iml +++ b/.idea/modules/demo.main.iml @@ -1,9 +1,6 @@ - - - diff --git a/week4/demo/build.gradle b/week4/demo/build.gradle index 4cad089..18f8f51 100644 --- a/week4/demo/build.gradle +++ b/week4/demo/build.gradle @@ -32,8 +32,32 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'com.mysql:mysql-connector-j' + + // QueryDSL : OpenFeign + implementation "io.github.openfeign.querydsl:querydsl-jpa:7.0" + implementation "io.github.openfeign.querydsl:querydsl-core:7.0" + annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + } tasks.named('test') { useJUnitPlatform() } +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +// 소스 세트에 생성 경로 추가 (구체적인 경로 지정) +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +// 컴파일 시 생성 경로 지정 +tasks.withType(JavaCompile).configureEach { + options.generatedSourceOutputDirectory.set(querydslDir) +} + +// clean 태스크에 생성 폴더 삭제 로직 추가 +clean.doLast { + file(querydslDir).deleteDir() +} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/DemoApplication.java b/week4/demo/src/main/java/com/example/demo/DemoApplication.java index 64b538a..773eff3 100644 --- a/week4/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/week4/demo/src/main/java/com/example/demo/DemoApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication public class DemoApplication { diff --git a/week4/demo/src/main/java/com/example/demo/QuerydslConfig.java b/week4/demo/src/main/java/com/example/demo/QuerydslConfig.java new file mode 100644 index 0000000..b5181aa --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/QuerydslConfig.java @@ -0,0 +1,15 @@ +package com.example.demo; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QuerydslConfig { + + @Bean + public JPAQueryFactory jpaQueryFactory(EntityManager entityManager) { + return new JPAQueryFactory(entityManager); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/controller/ReviewController.java new file mode 100644 index 0000000..f23b743 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/controller/ReviewController.java @@ -0,0 +1,29 @@ +// src/main/java/com/example/demo/controller/ReviewController.java +package com.example.demo.controller; + +import com.example.demo.dto.ReviewDto; +import com.example.demo.service.ReviewService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/reviews") +public class ReviewController { + + private final ReviewService service; + + public ReviewController(ReviewService service) { + this.service = service; + } + + // GET /api/reviews/my?userId=1&marketName=반이학생마라탕마라반&starBand=4 + @GetMapping("/my") + public List myReviews( + @RequestParam Long userId, + @RequestParam(required = false) String marketName, + @RequestParam(required = false) Integer starBand + ) { + return service.findMyReviews(userId, marketName, starBand); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java index 2efa8d2..725c3c9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java @@ -17,7 +17,7 @@ public class FavoriteFood extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; + private Long id; @ManyToOne(optional = false,fetch = FetchType.LAZY) @JoinColumn(name = "food_id",nullable = false) diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java index 084c4e9..2c3cf3b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Food.java @@ -14,7 +14,7 @@ public class Food extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; + private Long id; @Column(nullable = false,length = 40) private String name; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java index e240761..6a2fbfd 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/Users.java @@ -15,7 +15,7 @@ public class Users extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; + private Long id; @Column(nullable = false,length = 50) private String email; diff --git a/week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java b/week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java new file mode 100644 index 0000000..04ec54a --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java @@ -0,0 +1,12 @@ +package com.example.demo.dto; + +import java.math.BigDecimal; + +public record ReviewDto( + Long reviewId, + String marketName, + String content, + BigDecimal star +) { + +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java b/week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java similarity index 93% rename from week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java rename to week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java index dcea8c8..c1e8cd3 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/reveiw/ReviewRepository.java +++ b/week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java @@ -1,4 +1,4 @@ -package com.example.demo.repository.reveiw; +package com.example.demo.repository.review; import com.example.demo.domain.review.Review; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/week4/demo/src/main/java/com/example/demo/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/service/ReviewService.java new file mode 100644 index 0000000..0f9faae --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/service/ReviewService.java @@ -0,0 +1,52 @@ +package com.example.demo.service; + +import com.example.demo.dto.ReviewDto; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; + +import java.util.List; + +import static com.example.demo.domain.restruant.QFoodMarket.foodMarket; +import static com.example.demo.domain.review.QReview.review; + +@Service +public class ReviewService { + private final JPAQueryFactory qf; + + public ReviewService(JPAQueryFactory qf) { this.qf = qf; } + + public List findMyReviews(Long userId, String marketName, Integer starBand) { + // userId should be required; validate if needed + return qf.select(Projections.constructor(ReviewDto.class, + review.id, + review.market.name, + review.content, + review.star)) + .from(review) + .join(review.market, foodMarket) + .where( + review.user.id.eq(userId), + review.market.name.eq(marketName), + starBandPredicate(starBand) + ) + .orderBy(review.id.desc()) + .fetch(); + } + + + private BooleanExpression starBandPredicate(Integer band) { + if (band == null) return null; + if (band == 5) return review.star.eq(new BigDecimal("5.0")); + if (band >= 0 && band <= 4) { + BigDecimal min = new BigDecimal(band + ".0"); + BigDecimal max = new BigDecimal((band + 1) + ".0"); + return review.star.goe(min).and(review.star.lt(max)); + } + return null; + } +} + diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index 3beec84..244a159 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: jpa: hibernate: - ddl-auto: create + ddl-auto: create-drop database: mysql database-platform: org.hibernate.dialect.MySQLDialect show-sql: true \ No newline at end of file From 7e33c17f5f9069aa819568ae6727c2347dff6a92 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 18 Nov 2025 00:59:29 +0900 Subject: [PATCH 15/30] Create copilot.data.migration.agent.xml --- .idea/copilot.data.migration.agent.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .idea/copilot.data.migration.agent.xml diff --git a/.idea/copilot.data.migration.agent.xml b/.idea/copilot.data.migration.agent.xml new file mode 100644 index 0000000..4ea72a9 --- /dev/null +++ b/.idea/copilot.data.migration.agent.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file From a6dcd16f3e5f72060771ffac1bc2c74ec5548a2d Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 18 Nov 2025 02:50:00 +0900 Subject: [PATCH 16/30] service add --- .idea/copilot.data.migration.ask.xml | 6 + .idea/copilot.data.migration.ask2agent.xml | 6 + .idea/copilot.data.migration.edit.xml | 6 + .idea/dataSources.xml | 2 +- .../demo/{ => config}/QuerydslConfig.java | 2 +- .../alarm/{ => entity}/ReviewAlarm.java | 6 +- .../member/{ => entity}/FavoriteFood.java | 2 +- .../demo/domain/member/{ => entity}/Food.java | 2 +- .../domain/member/{ => entity}/Users.java | 2 +- .../repository}/FavoriteFoodRepository.java | 4 +- .../member/repository}/UsersRepository.java | 4 +- .../domain/mission/{ => entity}/Mission.java | 4 +- .../mission/{ => entity}/MissionUser.java | 4 +- .../{ => entity}/PermissionMission.java | 4 +- .../repository}/MissionRepository.java | 4 +- .../repository}/MissionUserRepository.java | 4 +- .../restruant/{ => entity}/FoodMarket.java | 2 +- .../entity/FoodMarketRepository.java | 6 + .../review}/controller/ReviewController.java | 6 +- .../review/dto/ReviewCreateRequest.java | 12 ++ .../{ => domain/review}/dto/ReviewDto.java | 7 +- .../domain/review/dto/ReviewResponse.java | 14 ++ .../domain/review/{ => entity}/Review.java | 6 +- .../review/{ => entity}/ReviewImage.java | 2 +- .../repository/ReviewImageRepository.java | 12 ++ .../review/repository}/ReviewRepository.java | 4 +- .../domain/review/service/ReviewService.java | 132 ++++++++++++++++++ .../example/demo/service/ReviewService.java | 52 ------- 28 files changed, 229 insertions(+), 88 deletions(-) create mode 100644 .idea/copilot.data.migration.ask.xml create mode 100644 .idea/copilot.data.migration.ask2agent.xml create mode 100644 .idea/copilot.data.migration.edit.xml rename week4/demo/src/main/java/com/example/demo/{ => config}/QuerydslConfig.java (92%) rename week4/demo/src/main/java/com/example/demo/domain/alarm/{ => entity}/ReviewAlarm.java (80%) rename week4/demo/src/main/java/com/example/demo/domain/member/{ => entity}/FavoriteFood.java (93%) rename week4/demo/src/main/java/com/example/demo/domain/member/{ => entity}/Food.java (90%) rename week4/demo/src/main/java/com/example/demo/domain/member/{ => entity}/Users.java (94%) rename week4/demo/src/main/java/com/example/demo/{repository/member => domain/member/repository}/FavoriteFoodRepository.java (57%) rename week4/demo/src/main/java/com/example/demo/{repository/member => domain/member/repository}/UsersRepository.java (77%) rename week4/demo/src/main/java/com/example/demo/domain/mission/{ => entity}/Mission.java (84%) rename week4/demo/src/main/java/com/example/demo/domain/mission/{ => entity}/MissionUser.java (86%) rename week4/demo/src/main/java/com/example/demo/domain/mission/{ => entity}/PermissionMission.java (85%) rename week4/demo/src/main/java/com/example/demo/{repository/mission => domain/mission/repository}/MissionRepository.java (80%) rename week4/demo/src/main/java/com/example/demo/{repository/mission => domain/mission/repository}/MissionUserRepository.java (81%) rename week4/demo/src/main/java/com/example/demo/domain/restruant/{ => entity}/FoodMarket.java (91%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarketRepository.java rename week4/demo/src/main/java/com/example/demo/{ => domain/review}/controller/ReviewController.java (82%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java rename week4/demo/src/main/java/com/example/demo/{ => domain/review}/dto/ReviewDto.java (75%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java rename week4/demo/src/main/java/com/example/demo/domain/review/{ => entity}/Review.java (82%) rename week4/demo/src/main/java/com/example/demo/domain/review/{ => entity}/ReviewImage.java (91%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java rename week4/demo/src/main/java/com/example/demo/{repository/review => domain/review/repository}/ReviewRepository.java (84%) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java delete mode 100644 week4/demo/src/main/java/com/example/demo/service/ReviewService.java diff --git a/.idea/copilot.data.migration.ask.xml b/.idea/copilot.data.migration.ask.xml new file mode 100644 index 0000000..7ef04e2 --- /dev/null +++ b/.idea/copilot.data.migration.ask.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/copilot.data.migration.ask2agent.xml b/.idea/copilot.data.migration.ask2agent.xml new file mode 100644 index 0000000..1f2ea11 --- /dev/null +++ b/.idea/copilot.data.migration.ask2agent.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/copilot.data.migration.edit.xml b/.idea/copilot.data.migration.edit.xml new file mode 100644 index 0000000..8648f94 --- /dev/null +++ b/.idea/copilot.data.migration.edit.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index b3abbcd..cf03916 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/week4/demo/src/main/java/com/example/demo/QuerydslConfig.java b/week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java similarity index 92% rename from week4/demo/src/main/java/com/example/demo/QuerydslConfig.java rename to week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java index b5181aa..dbc9701 100644 --- a/week4/demo/src/main/java/com/example/demo/QuerydslConfig.java +++ b/week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.example.demo.config; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; diff --git a/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java b/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java similarity index 80% rename from week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java rename to week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java index 894a9b1..ba967ff 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/alarm/ReviewAlarm.java +++ b/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java @@ -1,8 +1,8 @@ -package com.example.demo.domain.alarm; +package com.example.demo.domain.alarm.entity; import com.example.demo.domain.BaseEntity; -import com.example.demo.domain.member.Users; -import com.example.demo.domain.restruant.FoodMarket; +import com.example.demo.domain.member.entity.Users; +import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java similarity index 93% rename from week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java rename to week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java index 725c3c9..7141a6f 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.member; +package com.example.demo.domain.member.entity; import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java similarity index 90% rename from week4/demo/src/main/java/com/example/demo/domain/member/Food.java rename to week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java index 2c3cf3b..75711a8 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.member; +package com.example.demo.domain.member.entity; import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java similarity index 94% rename from week4/demo/src/main/java/com/example/demo/domain/member/Users.java rename to week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java index 6a2fbfd..ffc5222 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.member; +package com.example.demo.domain.member.entity; import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java similarity index 57% rename from week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java rename to week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java index b183842..0f6debc 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/member/FavoriteFoodRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository.member; +package com.example.demo.domain.member.repository; -import com.example.demo.domain.member.FavoriteFood; +import com.example.demo.domain.member.entity.FavoriteFood; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java b/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java similarity index 77% rename from week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java rename to week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java index 11cfa8e..18a1525 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/member/UsersRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository.member; +package com.example.demo.domain.member.repository; -import com.example.demo.domain.member.Users; +import com.example.demo.domain.member.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java similarity index 84% rename from week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java index 7a109e7..ffa8d2d 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/Mission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java @@ -1,7 +1,7 @@ -package com.example.demo.domain.mission; +package com.example.demo.domain.mission.entity; import com.example.demo.domain.BaseEntity; -import com.example.demo.domain.restruant.FoodMarket; +import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java similarity index 86% rename from week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java index 2c027f0..11ae1a0 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java @@ -1,7 +1,7 @@ -package com.example.demo.domain.mission; +package com.example.demo.domain.mission.entity; import com.example.demo.domain.BaseEntity; -import com.example.demo.domain.member.Users; +import com.example.demo.domain.member.entity.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java similarity index 85% rename from week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java index 22fca02..73f0054 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/PermissionMission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java @@ -1,7 +1,7 @@ -package com.example.demo.domain.mission; +package com.example.demo.domain.mission.entity; import com.example.demo.domain.BaseEntity; -import com.example.demo.domain.member.Users; +import com.example.demo.domain.member.entity.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java similarity index 80% rename from week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java index b3a7961..76b69bf 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository.mission; +package com.example.demo.domain.mission.repository; -import com.example.demo.domain.mission.Mission; +import com.example.demo.domain.mission.entity.Mission; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java similarity index 81% rename from week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java rename to week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java index 7a37872..f1d4445 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/mission/MissionUserRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository.mission; +package com.example.demo.domain.mission.repository; -import com.example.demo.domain.mission.MissionUser; +import com.example.demo.domain.mission.entity.MissionUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java similarity index 91% rename from week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java rename to week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java index 72fc41c..2731400 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/restruant/FoodMarket.java +++ b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.restruant; +package com.example.demo.domain.restruant.entity; import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarketRepository.java b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarketRepository.java new file mode 100644 index 0000000..5b715b6 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarketRepository.java @@ -0,0 +1,6 @@ +package com.example.demo.domain.restruant.entity; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FoodMarketRepository extends JpaRepository { +} diff --git a/week4/demo/src/main/java/com/example/demo/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java similarity index 82% rename from week4/demo/src/main/java/com/example/demo/controller/ReviewController.java rename to week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index f23b743..091c04f 100644 --- a/week4/demo/src/main/java/com/example/demo/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -1,8 +1,8 @@ // src/main/java/com/example/demo/controller/ReviewController.java -package com.example.demo.controller; +package com.example.demo.domain.review.controller; -import com.example.demo.dto.ReviewDto; -import com.example.demo.service.ReviewService; +import com.example.demo.domain.review.dto.ReviewDto; +import com.example.demo.domain.review.service.ReviewService; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java new file mode 100644 index 0000000..347f909 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java @@ -0,0 +1,12 @@ +package com.example.demo.domain.review.dto; + +import java.math.BigDecimal; +import java.util.List; + +public record ReviewCreateRequest( + Long userId, + Long marketId, + String content, + BigDecimal star, + List imageUrls // optional +) {} diff --git a/week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java similarity index 75% rename from week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java rename to week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java index 04ec54a..64406ad 100644 --- a/week4/demo/src/main/java/com/example/demo/dto/ReviewDto.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java @@ -1,12 +1,11 @@ -package com.example.demo.dto; +package com.example.demo.domain.review.dto; import java.math.BigDecimal; + public record ReviewDto( Long reviewId, String marketName, String content, BigDecimal star -) { - -} +) {} diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java new file mode 100644 index 0000000..96d38ea --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java @@ -0,0 +1,14 @@ +package com.example.demo.domain.review.dto; + +import java.math.BigDecimal; +import java.util.List; + +public record ReviewResponse( + Long reviewId, + Long userId, + Long marketId, + String marketName, + String content, + BigDecimal star, + List imageUrls +) {} \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Review.java b/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java similarity index 82% rename from week4/demo/src/main/java/com/example/demo/domain/review/Review.java rename to week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java index 3d68756..137dde2 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Review.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java @@ -1,9 +1,9 @@ -package com.example.demo.domain.review; +package com.example.demo.domain.review.entity; import com.example.demo.domain.BaseEntity; -import com.example.demo.domain.member.Users; -import com.example.demo.domain.restruant.FoodMarket; +import com.example.demo.domain.member.entity.Users; +import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java b/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java similarity index 91% rename from week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java rename to week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java index 4351d65..e4df0ab 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/ReviewImage.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.review; +package com.example.demo.domain.review.entity; import com.example.demo.domain.BaseEntity; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java new file mode 100644 index 0000000..67af6e2 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java @@ -0,0 +1,12 @@ +package com.example.demo.domain.review.repository; + +import com.example.demo.domain.review.entity.Review; +import com.example.demo.domain.review.entity.ReviewImage; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface ReviewImageRepository extends JpaRepository { + List findByReview(Review review); + void deleteByReview(Review review); +} diff --git a/week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java similarity index 84% rename from week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java rename to week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java index c1e8cd3..c34e66e 100644 --- a/week4/demo/src/main/java/com/example/demo/repository/review/ReviewRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository.review; +package com.example.demo.domain.review.repository; -import com.example.demo.domain.review.Review; +import com.example.demo.domain.review.entity.Review; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java new file mode 100644 index 0000000..3275d47 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -0,0 +1,132 @@ +package com.example.demo.domain.review.service; + +import com.example.demo.domain.member.entity.Users; +import com.example.demo.domain.member.repository.UsersRepository; +import com.example.demo.domain.restruant.entity.FoodMarket; +import com.example.demo.domain.restruant.entity.FoodMarketRepository; +import com.example.demo.domain.review.dto.ReviewCreateRequest; +import com.example.demo.domain.review.dto.ReviewDto; +import com.example.demo.domain.review.dto.ReviewResponse; +import com.example.demo.domain.review.entity.Review; +import com.example.demo.domain.review.entity.ReviewImage; +import com.example.demo.domain.review.repository.ReviewImageRepository; +import com.example.demo.domain.review.repository.ReviewRepository; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.transaction.Transactional; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; + +import java.util.Collections; +import java.util.List; + +import static com.example.demo.domain.restruant.QFoodMarket.foodMarket; +import static com.example.demo.domain.review.QReview.review; + +@Service +@AllArgsConstructor +public class ReviewService { + private final JPAQueryFactory qf; + private final ReviewRepository reviewRepository; + private final ReviewImageRepository reviewImageRepository; + private final UsersRepository usersRepository; + private final FoodMarketRepository foodMarketRepository; + + @Transactional + public ReviewResponse createReview(ReviewCreateRequest request){ + Users user=usersRepository.findById(request.userId()) + .orElseThrow(()->new IllegalArgumentException("User not found: "+request.userId())); + FoodMarket market = foodMarketRepository.findById(request.marketId()) + .orElseThrow(()->new IllegalArgumentException("market not found :"+request.marketId())); + Review reviewEntity = new Review(); + reviewEntity.setUser(user); + reviewEntity.setMarket(market); + reviewEntity.setContent(request.content()); + reviewEntity.setStar(request.star()); + + Review saved = reviewRepository.save(reviewEntity); + + if(request.imageUrls()!=null&& !request.imageUrls().isEmpty()){ + for(String url:request.imageUrls()){ + ReviewImage reviewImage=new ReviewImage(); + reviewImage.setReview(saved); + reviewImage.setUrl(url); + reviewImageRepository.save(reviewImage); + } + } + + return toResponse(saved); + } + + + public List findMyReviews(Long userId, String marketName, Integer starBand) { + // userId should be required; validate if needed + return qf.select(Projections.constructor(ReviewDto.class, + review.id, + review.market.name, + review.content, + review.star)) + .from(review) + .join(review.market, foodMarket) + .where( + review.user.id.eq(userId), + marketNameEquals(marketName), + starBandPredicate(starBand) + ) + .orderBy(review.id.desc()) + .fetch(); + } + public List findReviewsByMarket(Long marketId, Integer starBand) { + List reviews = qf.selectFrom(review) + .leftJoin(review.market).fetchJoin() + .leftJoin(review.user).fetchJoin() + .where( + review.market.id.eq(marketId), + starBandPredicate(starBand) + ) + .orderBy(review.id.desc()) + .fetch(); + + return reviews.stream() + .map(this::toResponse) + .toList(); + } + + private BooleanExpression starBandPredicate(Integer band) { + if (band == null) return null; + if (band == 5) return review.star.eq(new BigDecimal("5.0")); + if (band >= 0 && band <= 4) { + BigDecimal min = new BigDecimal(band + ".0"); + BigDecimal max = new BigDecimal((band + 1) + ".0"); + return review.star.goe(min).and(review.star.lt(max)); + } + return null; + } + private BooleanExpression marketNameEquals(String marketName) { + return (marketName == null || marketName.isBlank()) + ? null + : review.market.name.eq(marketName); + } + private ReviewResponse toResponse(Review reviewEntity) { + List urls = reviewEntity.getId() == null + ? Collections.emptyList() + : reviewImageRepository.findByReview(reviewEntity) + .stream() + .map(ReviewImage::getUrl) + .toList(); + + return new ReviewResponse( + reviewEntity.getId(), + reviewEntity.getUser().getId(), + reviewEntity.getMarket().getId(), + reviewEntity.getMarket().getName(), + reviewEntity.getContent(), + reviewEntity.getStar(), + urls + ); + } +} + diff --git a/week4/demo/src/main/java/com/example/demo/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/service/ReviewService.java deleted file mode 100644 index 0f9faae..0000000 --- a/week4/demo/src/main/java/com/example/demo/service/ReviewService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.example.demo.service; - -import com.example.demo.dto.ReviewDto; -import com.querydsl.core.types.Projections; -import com.querydsl.core.types.dsl.BooleanExpression; -import com.querydsl.jpa.impl.JPAQueryFactory; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -import java.util.List; - -import static com.example.demo.domain.restruant.QFoodMarket.foodMarket; -import static com.example.demo.domain.review.QReview.review; - -@Service -public class ReviewService { - private final JPAQueryFactory qf; - - public ReviewService(JPAQueryFactory qf) { this.qf = qf; } - - public List findMyReviews(Long userId, String marketName, Integer starBand) { - // userId should be required; validate if needed - return qf.select(Projections.constructor(ReviewDto.class, - review.id, - review.market.name, - review.content, - review.star)) - .from(review) - .join(review.market, foodMarket) - .where( - review.user.id.eq(userId), - review.market.name.eq(marketName), - starBandPredicate(starBand) - ) - .orderBy(review.id.desc()) - .fetch(); - } - - - private BooleanExpression starBandPredicate(Integer band) { - if (band == null) return null; - if (band == 5) return review.star.eq(new BigDecimal("5.0")); - if (band >= 0 && band <= 4) { - BigDecimal min = new BigDecimal(band + ".0"); - BigDecimal max = new BigDecimal((band + 1) + ".0"); - return review.star.goe(min).and(review.star.lt(max)); - } - return null; - } -} - From 053d6a66d035257d5acfc5f7ad44e7352fb19bcf Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 18 Nov 2025 16:14:02 +0900 Subject: [PATCH 17/30] creating success cords --- .idea/dataSources.xml | 2 +- .idea/modules/demo.main.iml | 3 + .../repository/FavoriteFoodRepository.java | 3 +- .../member/repository/FoodRepository.java | 9 +++ .../member/repository/UsersRepository.java | 3 +- .../review/controller/ReviewController.java | 33 +++++++++-- .../review/dto/ReviewCreateRequest.java | 4 +- .../demo/domain/review/dto/ReviewDto.java | 4 +- .../domain/review/dto/ReviewResponse.java | 4 +- .../repository/ReviewImageRepository.java | 3 +- .../review/repository/ReviewRepository.java | 3 +- .../domain/review/service/ReviewService.java | 42 +++++++++++++- .../demo/global/response/ApiResponse.java | 58 +++++++++++++++++++ .../demo/global/response/SuccessCode.java | 35 +++++++++++ 14 files changed, 191 insertions(+), 15 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/member/repository/FoodRepository.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index cf03916..b3abbcd 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/.idea/modules/demo.main.iml b/.idea/modules/demo.main.iml index 71cefaf..8b055e7 100644 --- a/.idea/modules/demo.main.iml +++ b/.idea/modules/demo.main.iml @@ -1,6 +1,9 @@ + + + diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java index 0f6debc..0a1c94b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FavoriteFoodRepository.java @@ -2,8 +2,9 @@ import com.example.demo.domain.member.entity.FavoriteFood; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; - +@Repository public interface FavoriteFoodRepository extends JpaRepository { } diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/repository/FoodRepository.java b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FoodRepository.java new file mode 100644 index 0000000..a7aec29 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/member/repository/FoodRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.domain.member.repository; + +import com.example.demo.domain.member.entity.Food; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FoodRepository extends JpaRepository { +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java b/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java index 18a1525..10de128 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/repository/UsersRepository.java @@ -3,9 +3,10 @@ import com.example.demo.domain.member.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; import java.util.Optional; - +@Repository public interface UsersRepository extends JpaRepository { Optional findById(Long userId); diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index 091c04f..d842841 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -1,23 +1,46 @@ // src/main/java/com/example/demo/controller/ReviewController.java package com.example.demo.domain.review.controller; +import com.example.demo.domain.review.dto.ReviewCreateRequest; import com.example.demo.domain.review.dto.ReviewDto; +import com.example.demo.domain.review.dto.ReviewResponse; import com.example.demo.domain.review.service.ReviewService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; - +@RequiredArgsConstructor @RestController @RequestMapping("/api/reviews") public class ReviewController { private final ReviewService service; - public ReviewController(ReviewService service) { - this.service = service; - } - // GET /api/reviews/my?userId=1&marketName=반이학생마라탕마라반&starBand=4 + @PostMapping + public ResponseEntity createReview( + @RequestBody ReviewCreateRequest request + ){ + ReviewResponse reviewResponse=service.createReview(request); + return ResponseEntity.ok(reviewResponse); + } + @PutMapping("/{reviewId}") + public ResponseEntity updateReview( + @PathVariable Long reviewId, + @RequestBody ReviewCreateRequest request + ){ + ReviewResponse reviewResponse = service.updateReview(request.userId(), reviewId, request); + return ResponseEntity.ok(reviewResponse); + } + @DeleteMapping("/{reviewId}") + public ResponseEntity deleteReview( + @PathVariable Long reviewId, + @RequestParam Long userId + ) { + service.deleteReview(reviewId, userId); + return ResponseEntity.noContent().build(); + } @GetMapping("/my") public List myReviews( @RequestParam Long userId, diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java index 347f909..45af9e6 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java @@ -2,7 +2,9 @@ import java.math.BigDecimal; import java.util.List; - +/* +* 나는 이 친구로 받을 데이터를 정의 +*/ public record ReviewCreateRequest( Long userId, Long marketId, diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java index 64406ad..75adff9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java @@ -2,7 +2,9 @@ import java.math.BigDecimal; - +/* +* 이친구는 이미지는 안뿌려주는 dto에요. +*/ public record ReviewDto( Long reviewId, String marketName, diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java index 96d38ea..872e9a7 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewResponse.java @@ -2,7 +2,9 @@ import java.math.BigDecimal; import java.util.List; - +/* +* 나는 이 친구로 이미지까지 뿌려줄 가장 디테일한 dto를 정의 +* */ public record ReviewResponse( Long reviewId, Long userId, diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java index 67af6e2..661c52c 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewImageRepository.java @@ -3,9 +3,10 @@ import com.example.demo.domain.review.entity.Review; import com.example.demo.domain.review.entity.ReviewImage; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; import java.util.List; - +@Repository public interface ReviewImageRepository extends JpaRepository { List findByReview(Review review); void deleteByReview(Review review); diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java index c34e66e..8c2d098 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java @@ -4,9 +4,10 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import java.util.List; - +@Repository public interface ReviewRepository extends JpaRepository { List findReviewsByMarket_IdOrderByUpdatedAtDesc(Long marketId); @Query("SELECT r from Review r join fetch r.user where r.market.id=:marketId order by r.updatedAt desc ") diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java index 3275d47..13744f7 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -23,8 +23,9 @@ import java.util.Collections; import java.util.List; -import static com.example.demo.domain.restruant.QFoodMarket.foodMarket; -import static com.example.demo.domain.review.QReview.review; +import static com.example.demo.domain.restruant.entity.QFoodMarket.foodMarket; +import static com.example.demo.domain.review.entity.QReview.review; + @Service @AllArgsConstructor @@ -61,6 +62,42 @@ public ReviewResponse createReview(ReviewCreateRequest request){ return toResponse(saved); } + @Transactional + public ReviewResponse updateReview(Long reviewId, Long userId,ReviewCreateRequest request) { + + Review reviewEntity = reviewRepository.findById(reviewId) + .orElseThrow(()->new IllegalArgumentException("review not found :"+reviewId)); + + if(!reviewEntity.getUser().getId().equals(userId)){ + throw new IllegalArgumentException("user not found :"+userId); + } + + reviewEntity.setContent(request.content()); + reviewEntity.setStar(request.star()); + + reviewImageRepository.deleteByReview(reviewEntity); + + if(request.imageUrls()!=null&& !request.imageUrls().isEmpty()){ + for(String url:request.imageUrls()){ + ReviewImage reviewImage=new ReviewImage(); + reviewImage.setReview(reviewEntity); + reviewImage.setUrl(url); + reviewImageRepository.save(reviewImage); + } + } + return toResponse(reviewEntity); + } + public void deleteReview(Long reviewId,Long userId) { + + Review reviewEntity = reviewRepository.findById(reviewId) + .orElseThrow(()->new IllegalArgumentException("review not found :"+reviewId)); + + if(!reviewEntity.getUser().getId().equals(userId)){ + throw new IllegalArgumentException("user not found :"+userId); + } + reviewRepository.delete(reviewEntity); + reviewImageRepository.deleteByReview(reviewEntity); + } public List findMyReviews(Long userId, String marketName, Integer starBand) { // userId should be required; validate if needed @@ -79,6 +116,7 @@ public List findMyReviews(Long userId, String marketName, Integer sta .orderBy(review.id.desc()) .fetch(); } + public List findReviewsByMarket(Long marketId, Integer starBand) { List reviews = qf.selectFrom(review) .leftJoin(review.market).fetchJoin() diff --git a/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java b/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java new file mode 100644 index 0000000..4169ac1 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java @@ -0,0 +1,58 @@ + +package com.example.demo.global.response; +import org.springframework.http.ResponseEntity; + +public class ApiResponse { + + private final boolean success; // 성공 여부 + private final String code; // 비즈니스 코드 (예: R001) + private final String message; // 기본 메시지 + private final T data; // 실제 데이터 (ReviewResponse, List 등) + + private ApiResponse(boolean success, String code, String message, T data) { + this.success = success; + this.code = code; + this.message = message; + this.data = data; + } + + public boolean isSuccess() { + return success; + } + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } + + public T getData() { + return data; + } + + // ========= 성공 응답용 정적 메서드 ========= + + // data 있는 경우 + public static ResponseEntity> success(SuccessCode code, T data) { + ApiResponse body = new ApiResponse<>( + true, + code.getCode(), + code.getMessage(), + data + ); + return ResponseEntity.status(code.getHttpStatus()).body(body); + } + + // data 없는 경우 (DELETE 등) + public static ResponseEntity> success(SuccessCode code) { + ApiResponse body = new ApiResponse<>( + true, + code.getCode(), + code.getMessage(), + null + ); + return ResponseEntity.status(code.getHttpStatus()).body(body); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java b/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java new file mode 100644 index 0000000..d187986 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java @@ -0,0 +1,35 @@ +// src/main/java/com/example/demo/global/response/SuccessCode.java +package com.example.demo.global.response; + +import org.springframework.http.HttpStatus; + +public enum SuccessCode { + + // === Review 도메인 관련 응답 코드 === + REVIEW_CREATE_SUCCESS(HttpStatus.OK, "R001", "리뷰가 성공적으로 등록되었습니다."), + REVIEW_UPDATE_SUCCESS(HttpStatus.OK, "R002", "리뷰가 성공적으로 수정되었습니다."), + REVIEW_DELETE_SUCCESS(HttpStatus.NO_CONTENT,"R003", "리뷰가 성공적으로 삭제되었습니다."), + REVIEW_MY_LIST_SUCCESS(HttpStatus.OK, "R004", "내 리뷰 목록 조회에 성공했습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + SuccessCode(HttpStatus httpStatus, String code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } + + public HttpStatus getHttpStatus() { + return httpStatus; + } + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } +} From 19ccf47ddb4c9586e6eed09ebdbe9c37c0404291 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 18 Nov 2025 22:13:00 +0900 Subject: [PATCH 18/30] modify code --- .../review/controller/ReviewController.java | 19 ++++--- .../demo/global/response/ApiResponse.java | 54 ++++++++++--------- .../demo/global/response/ErrorCode.java | 18 +++++++ .../demo/global/response/SuccessCode.java | 19 ++----- 4 files changed, 61 insertions(+), 49 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index d842841..94a23d5 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -5,6 +5,8 @@ import com.example.demo.domain.review.dto.ReviewDto; import com.example.demo.domain.review.dto.ReviewResponse; import com.example.demo.domain.review.service.ReviewService; +import com.example.demo.global.response.ApiResponse; +import com.example.demo.global.response.SuccessCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -19,34 +21,35 @@ public class ReviewController { @PostMapping - public ResponseEntity createReview( + public ResponseEntity> createReview( @RequestBody ReviewCreateRequest request ){ ReviewResponse reviewResponse=service.createReview(request); - return ResponseEntity.ok(reviewResponse); + return ApiResponse.success(SuccessCode.REVIEW_CREATE_SUCCESS,reviewResponse); } @PutMapping("/{reviewId}") - public ResponseEntity updateReview( + public ResponseEntity> updateReview( @PathVariable Long reviewId, @RequestBody ReviewCreateRequest request ){ ReviewResponse reviewResponse = service.updateReview(request.userId(), reviewId, request); - return ResponseEntity.ok(reviewResponse); + return ApiResponse.success(SuccessCode.REVIEW_UPDATE_SUCCESS,reviewResponse); } @DeleteMapping("/{reviewId}") - public ResponseEntity deleteReview( + public ResponseEntity> deleteReview( @PathVariable Long reviewId, @RequestParam Long userId ) { service.deleteReview(reviewId, userId); - return ResponseEntity.noContent().build(); + return ApiResponse.success(SuccessCode.REVIEW_DELETE_SUCCESS); } @GetMapping("/my") - public List myReviews( + public ResponseEntity>> myReviews( @RequestParam Long userId, @RequestParam(required = false) String marketName, @RequestParam(required = false) Integer starBand ) { - return service.findMyReviews(userId, marketName, starBand); + List result = service.findMyReviews(userId, marketName, starBand); + return ApiResponse.success(SuccessCode.REVIEW_MY_LIST_SUCCESS, result); } } diff --git a/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java b/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java index 4169ac1..6277146 100644 --- a/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java +++ b/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java @@ -1,7 +1,10 @@ package com.example.demo.global.response; +import lombok.AllArgsConstructor; +import lombok.Getter; import org.springframework.http.ResponseEntity; - +@Getter +@AllArgsConstructor public class ApiResponse { private final boolean success; // 성공 여부 @@ -9,32 +12,9 @@ public class ApiResponse { private final String message; // 기본 메시지 private final T data; // 실제 데이터 (ReviewResponse, List 등) - private ApiResponse(boolean success, String code, String message, T data) { - this.success = success; - this.code = code; - this.message = message; - this.data = data; - } - - public boolean isSuccess() { - return success; - } - public String getCode() { - return code; - } - - public String getMessage() { - return message; - } - public T getData() { - return data; - } - - // ========= 성공 응답용 정적 메서드 ========= - - // data 있는 경우 + // data 있는 성공 public static ResponseEntity> success(SuccessCode code, T data) { ApiResponse body = new ApiResponse<>( true, @@ -45,7 +25,7 @@ public static ResponseEntity> success(SuccessCode code, T dat return ResponseEntity.status(code.getHttpStatus()).body(body); } - // data 없는 경우 (DELETE 등) + // data 없는 성공 (DELETE 등) public static ResponseEntity> success(SuccessCode code) { ApiResponse body = new ApiResponse<>( true, @@ -55,4 +35,26 @@ public static ResponseEntity> success(SuccessCode code) { ); return ResponseEntity.status(code.getHttpStatus()).body(body); } + // data 있는 실패 + public static ResponseEntity> ERROR(ErrorCode code, T data) { + ApiResponse body = new ApiResponse<>( + false, + code.getCode(), + code.getMessage(), + data + ); + + return ResponseEntity.status(code.getHttpStatus()).body(body); + } + + // data 없는 실패(DELETE 등) + public static ResponseEntity> ERROR(ErrorCode code) { + ApiResponse body = new ApiResponse<>( + false, + code.getCode(), + code.getMessage(), + null + ); + return ResponseEntity.status(code.getHttpStatus()).body(body); + } } diff --git a/week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java b/week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java new file mode 100644 index 0000000..8ca03f6 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java @@ -0,0 +1,18 @@ +package com.example.demo.global.response; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@AllArgsConstructor +@Getter +public enum ErrorCode { + REVIEW_CREATE_ERROR(HttpStatus.BAD_REQUEST, "R001", "리뷰 등록을 실패했습니다."), + REVIEW_UPDATE_ERROR(HttpStatus.BAD_REQUEST, "R002", "리뷰 수정이 실패했습니다."), + REVIEW_DELETE_ERROR(HttpStatus.BAD_REQUEST,"R003", "리뷰가 삭제에 실패했습니다."), + REVIEW_MY_LIST_ERROR(HttpStatus.BAD_REQUEST, "R004", "내 리뷰 목록 조회에 실패했습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; +} diff --git a/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java b/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java index d187986..ba25d56 100644 --- a/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java +++ b/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java @@ -1,8 +1,11 @@ // src/main/java/com/example/demo/global/response/SuccessCode.java package com.example.demo.global.response; +import lombok.AllArgsConstructor; +import lombok.Getter; import org.springframework.http.HttpStatus; - +@Getter +@AllArgsConstructor public enum SuccessCode { // === Review 도메인 관련 응답 코드 === @@ -15,21 +18,7 @@ public enum SuccessCode { private final String code; private final String message; - SuccessCode(HttpStatus httpStatus, String code, String message) { - this.httpStatus = httpStatus; - this.code = code; - this.message = message; - } - public HttpStatus getHttpStatus() { - return httpStatus; - } - public String getCode() { - return code; - } - public String getMessage() { - return message; - } } From 7d193c4426fca005f147ba2da93d40b67f007815 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:09:18 +0900 Subject: [PATCH 19/30] add handler --- .../review/controller/ReviewController.java | 4 ++-- .../domain/review/service/ReviewService.java | 14 ++++++++------ .../apiPayload/Exception/ReviewException.java | 16 ++++++++++++++++ .../Handler/ReviewExceptionHandler.java | 19 +++++++++++++++++++ .../response/ApiResponse.java | 2 +- .../{ => apiPayload}/response/ErrorCode.java | 2 +- .../response/SuccessCode.java | 2 +- .../{ => global}/config/QuerydslConfig.java | 2 +- 8 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java rename week4/demo/src/main/java/com/example/demo/global/{ => apiPayload}/response/ApiResponse.java (97%) rename week4/demo/src/main/java/com/example/demo/global/{ => apiPayload}/response/ErrorCode.java (92%) rename week4/demo/src/main/java/com/example/demo/global/{ => apiPayload}/response/SuccessCode.java (93%) rename week4/demo/src/main/java/com/example/demo/{ => global}/config/QuerydslConfig.java (90%) diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index 94a23d5..d5f8ec1 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -5,8 +5,8 @@ import com.example.demo.domain.review.dto.ReviewDto; import com.example.demo.domain.review.dto.ReviewResponse; import com.example.demo.domain.review.service.ReviewService; -import com.example.demo.global.response.ApiResponse; -import com.example.demo.global.response.SuccessCode; +import com.example.demo.global.apiPayload.response.ApiResponse; +import com.example.demo.global.apiPayload.response.SuccessCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java index 13744f7..1adc1c1 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -11,6 +11,8 @@ import com.example.demo.domain.review.entity.ReviewImage; import com.example.demo.domain.review.repository.ReviewImageRepository; import com.example.demo.domain.review.repository.ReviewRepository; +import com.example.demo.global.apiPayload.Exception.ReviewException; +import com.example.demo.global.apiPayload.response.ErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -39,9 +41,9 @@ public class ReviewService { @Transactional public ReviewResponse createReview(ReviewCreateRequest request){ Users user=usersRepository.findById(request.userId()) - .orElseThrow(()->new IllegalArgumentException("User not found: "+request.userId())); + .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_CREATE_ERROR)); FoodMarket market = foodMarketRepository.findById(request.marketId()) - .orElseThrow(()->new IllegalArgumentException("market not found :"+request.marketId())); + .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_CREATE_ERROR)); Review reviewEntity = new Review(); reviewEntity.setUser(user); reviewEntity.setMarket(market); @@ -66,10 +68,10 @@ public ReviewResponse createReview(ReviewCreateRequest request){ public ReviewResponse updateReview(Long reviewId, Long userId,ReviewCreateRequest request) { Review reviewEntity = reviewRepository.findById(reviewId) - .orElseThrow(()->new IllegalArgumentException("review not found :"+reviewId)); + .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_UPDATE_ERROR)); if(!reviewEntity.getUser().getId().equals(userId)){ - throw new IllegalArgumentException("user not found :"+userId); + new ReviewException(ErrorCode.REVIEW_UPDATE_ERROR); } reviewEntity.setContent(request.content()); @@ -90,10 +92,10 @@ public ReviewResponse updateReview(Long reviewId, Long userId,ReviewCreateReques public void deleteReview(Long reviewId,Long userId) { Review reviewEntity = reviewRepository.findById(reviewId) - .orElseThrow(()->new IllegalArgumentException("review not found :"+reviewId)); + .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_DELETE_ERROR)); if(!reviewEntity.getUser().getId().equals(userId)){ - throw new IllegalArgumentException("user not found :"+userId); + throw new ReviewException(ErrorCode.REVIEW_DELETE_ERROR); } reviewRepository.delete(reviewEntity); reviewImageRepository.deleteByReview(reviewEntity); diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java new file mode 100644 index 0000000..41592d9 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java @@ -0,0 +1,16 @@ +package com.example.demo.global.apiPayload.Exception; + +import com.example.demo.global.apiPayload.response.ErrorCode; +import lombok.Getter; + +@Getter +public class ReviewException extends RuntimeException { + + private final ErrorCode errorCode; + + public ReviewException(ErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } + +} diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java new file mode 100644 index 0000000..0a86b19 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java @@ -0,0 +1,19 @@ +package com.example.demo.global.apiPayload.Handler; + +import com.example.demo.global.apiPayload.Exception.ReviewException; +import com.example.demo.global.apiPayload.response.ApiResponse; +import com.example.demo.global.apiPayload.response.ErrorCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +@RestControllerAdvice +public class ReviewExceptionHandler { + + @ExceptionHandler(ReviewException.class) + public ResponseEntity> handleReviewException(ReviewException e) { + ErrorCode errorCode =e.getErrorCode(); + return ApiResponse.ERROR(errorCode); + } + + +} diff --git a/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java similarity index 97% rename from week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java rename to week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java index 6277146..dac967c 100644 --- a/week4/demo/src/main/java/com/example/demo/global/response/ApiResponse.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java @@ -1,5 +1,5 @@ -package com.example.demo.global.response; +package com.example.demo.global.apiPayload.response; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.ResponseEntity; diff --git a/week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java similarity index 92% rename from week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java rename to week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java index 8ca03f6..a918274 100644 --- a/week4/demo/src/main/java/com/example/demo/global/response/ErrorCode.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java @@ -1,4 +1,4 @@ -package com.example.demo.global.response; +package com.example.demo.global.apiPayload.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java similarity index 93% rename from week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java rename to week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java index ba25d56..c91282b 100644 --- a/week4/demo/src/main/java/com/example/demo/global/response/SuccessCode.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java @@ -1,5 +1,5 @@ // src/main/java/com/example/demo/global/response/SuccessCode.java -package com.example.demo.global.response; +package com.example.demo.global.apiPayload.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java b/week4/demo/src/main/java/com/example/demo/global/config/QuerydslConfig.java similarity index 90% rename from week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java rename to week4/demo/src/main/java/com/example/demo/global/config/QuerydslConfig.java index dbc9701..a54c2ed 100644 --- a/week4/demo/src/main/java/com/example/demo/config/QuerydslConfig.java +++ b/week4/demo/src/main/java/com/example/demo/global/config/QuerydslConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.config; +package com.example.demo.global.config; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; From 287e1a1e26c7f8f320021d7e7527fa6d2f3bcfd3 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 19 Nov 2025 18:05:40 +0900 Subject: [PATCH 20/30] code ref --- .../domain/review/Exception/ReviewException.java | 10 ++++++++++ .../review/Exception/code/ReviewErrorCode.java} | 5 +++-- .../Exception/code/ReviewSuccessCode.java} | 5 +++-- .../review}/Handler/ReviewExceptionHandler.java | 8 ++++---- .../review/controller/ReviewController.java | 10 +++++----- .../domain/review/service/ReviewService.java | 16 ++++++++-------- .../apiPayload/Exception/GeneralException.java | 16 ++++++++++++++++ .../apiPayload/Exception/ReviewException.java | 16 ---------------- .../global/apiPayload/response/ApiResponse.java | 8 ++++---- .../apiPayload/response/BaseErrorCode.java | 11 +++++++++++ .../apiPayload/response/BaseSuccessCode.java | 8 ++++++++ 11 files changed, 72 insertions(+), 41 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java rename week4/demo/src/main/java/com/example/demo/{global/apiPayload/response/ErrorCode.java => domain/review/Exception/code/ReviewErrorCode.java} (78%) rename week4/demo/src/main/java/com/example/demo/{global/apiPayload/response/SuccessCode.java => domain/review/Exception/code/ReviewSuccessCode.java} (81%) rename week4/demo/src/main/java/com/example/demo/{global/apiPayload => domain/review}/Handler/ReviewExceptionHandler.java (67%) create mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java delete mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java new file mode 100644 index 0000000..0b9d9fc --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java @@ -0,0 +1,10 @@ +package com.example.demo.domain.review.Exception; + +import com.example.demo.global.apiPayload.Exception.GeneralException; +import com.example.demo.domain.review.Exception.code.ReviewErrorCode; + +public class ReviewException extends GeneralException { + public ReviewException(ReviewErrorCode errorCode) { + super(errorCode); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java similarity index 78% rename from week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java rename to week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java index a918274..150659e 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ErrorCode.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java @@ -1,12 +1,13 @@ -package com.example.demo.global.apiPayload.response; +package com.example.demo.domain.review.Exception.code; +import com.example.demo.global.apiPayload.response.BaseErrorCode; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @AllArgsConstructor @Getter -public enum ErrorCode { +public enum ReviewErrorCode implements BaseErrorCode { REVIEW_CREATE_ERROR(HttpStatus.BAD_REQUEST, "R001", "리뷰 등록을 실패했습니다."), REVIEW_UPDATE_ERROR(HttpStatus.BAD_REQUEST, "R002", "리뷰 수정이 실패했습니다."), REVIEW_DELETE_ERROR(HttpStatus.BAD_REQUEST,"R003", "리뷰가 삭제에 실패했습니다."), diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java similarity index 81% rename from week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java rename to week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java index c91282b..ab6c133 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/SuccessCode.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java @@ -1,12 +1,13 @@ // src/main/java/com/example/demo/global/response/SuccessCode.java -package com.example.demo.global.apiPayload.response; +package com.example.demo.domain.review.Exception.code; +import com.example.demo.global.apiPayload.response.BaseSuccessCode; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter @AllArgsConstructor -public enum SuccessCode { +public enum ReviewSuccessCode implements BaseSuccessCode { // === Review 도메인 관련 응답 코드 === REVIEW_CREATE_SUCCESS(HttpStatus.OK, "R001", "리뷰가 성공적으로 등록되었습니다."), diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java similarity index 67% rename from week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java rename to week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java index 0a86b19..46374b9 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Handler/ReviewExceptionHandler.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java @@ -1,8 +1,8 @@ -package com.example.demo.global.apiPayload.Handler; +package com.example.demo.domain.review.Handler; -import com.example.demo.global.apiPayload.Exception.ReviewException; +import com.example.demo.domain.review.Exception.ReviewException; import com.example.demo.global.apiPayload.response.ApiResponse; -import com.example.demo.global.apiPayload.response.ErrorCode; +import com.example.demo.domain.review.Exception.code.ReviewErrorCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -11,7 +11,7 @@ public class ReviewExceptionHandler { @ExceptionHandler(ReviewException.class) public ResponseEntity> handleReviewException(ReviewException e) { - ErrorCode errorCode =e.getErrorCode(); + ReviewErrorCode errorCode =e.getErrorCode(); return ApiResponse.ERROR(errorCode); } diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index d5f8ec1..5479862 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -6,7 +6,7 @@ import com.example.demo.domain.review.dto.ReviewResponse; import com.example.demo.domain.review.service.ReviewService; import com.example.demo.global.apiPayload.response.ApiResponse; -import com.example.demo.global.apiPayload.response.SuccessCode; +import com.example.demo.domain.review.Exception.code.ReviewSuccessCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ public ResponseEntity> createReview( @RequestBody ReviewCreateRequest request ){ ReviewResponse reviewResponse=service.createReview(request); - return ApiResponse.success(SuccessCode.REVIEW_CREATE_SUCCESS,reviewResponse); + return ApiResponse.success(ReviewSuccessCode.REVIEW_CREATE_SUCCESS,reviewResponse); } @PutMapping("/{reviewId}") public ResponseEntity> updateReview( @@ -33,7 +33,7 @@ public ResponseEntity> updateReview( @RequestBody ReviewCreateRequest request ){ ReviewResponse reviewResponse = service.updateReview(request.userId(), reviewId, request); - return ApiResponse.success(SuccessCode.REVIEW_UPDATE_SUCCESS,reviewResponse); + return ApiResponse.success(ReviewSuccessCode.REVIEW_UPDATE_SUCCESS,reviewResponse); } @DeleteMapping("/{reviewId}") public ResponseEntity> deleteReview( @@ -41,7 +41,7 @@ public ResponseEntity> deleteReview( @RequestParam Long userId ) { service.deleteReview(reviewId, userId); - return ApiResponse.success(SuccessCode.REVIEW_DELETE_SUCCESS); + return ApiResponse.success(ReviewSuccessCode.REVIEW_DELETE_SUCCESS); } @GetMapping("/my") public ResponseEntity>> myReviews( @@ -50,6 +50,6 @@ public ResponseEntity>> myReviews( @RequestParam(required = false) Integer starBand ) { List result = service.findMyReviews(userId, marketName, starBand); - return ApiResponse.success(SuccessCode.REVIEW_MY_LIST_SUCCESS, result); + return ApiResponse.success(ReviewSuccessCode.REVIEW_MY_LIST_SUCCESS, result); } } diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java index 1adc1c1..8d29359 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -11,8 +11,8 @@ import com.example.demo.domain.review.entity.ReviewImage; import com.example.demo.domain.review.repository.ReviewImageRepository; import com.example.demo.domain.review.repository.ReviewRepository; -import com.example.demo.global.apiPayload.Exception.ReviewException; -import com.example.demo.global.apiPayload.response.ErrorCode; +import com.example.demo.domain.review.Exception.ReviewException; +import com.example.demo.domain.review.Exception.code.ReviewErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -41,9 +41,9 @@ public class ReviewService { @Transactional public ReviewResponse createReview(ReviewCreateRequest request){ Users user=usersRepository.findById(request.userId()) - .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_CREATE_ERROR)); + .orElseThrow(()->new ReviewException(ReviewErrorCode.REVIEW_CREATE_ERROR)); FoodMarket market = foodMarketRepository.findById(request.marketId()) - .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_CREATE_ERROR)); + .orElseThrow(()->new ReviewException(ReviewErrorCode.REVIEW_CREATE_ERROR)); Review reviewEntity = new Review(); reviewEntity.setUser(user); reviewEntity.setMarket(market); @@ -68,10 +68,10 @@ public ReviewResponse createReview(ReviewCreateRequest request){ public ReviewResponse updateReview(Long reviewId, Long userId,ReviewCreateRequest request) { Review reviewEntity = reviewRepository.findById(reviewId) - .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_UPDATE_ERROR)); + .orElseThrow(()->new ReviewException(ReviewErrorCode.REVIEW_UPDATE_ERROR)); if(!reviewEntity.getUser().getId().equals(userId)){ - new ReviewException(ErrorCode.REVIEW_UPDATE_ERROR); + new ReviewException(ReviewErrorCode.REVIEW_UPDATE_ERROR); } reviewEntity.setContent(request.content()); @@ -92,10 +92,10 @@ public ReviewResponse updateReview(Long reviewId, Long userId,ReviewCreateReques public void deleteReview(Long reviewId,Long userId) { Review reviewEntity = reviewRepository.findById(reviewId) - .orElseThrow(()->new ReviewException(ErrorCode.REVIEW_DELETE_ERROR)); + .orElseThrow(()->new ReviewException(ReviewErrorCode.REVIEW_DELETE_ERROR)); if(!reviewEntity.getUser().getId().equals(userId)){ - throw new ReviewException(ErrorCode.REVIEW_DELETE_ERROR); + throw new ReviewException(ReviewErrorCode.REVIEW_DELETE_ERROR); } reviewRepository.delete(reviewEntity); reviewImageRepository.deleteByReview(reviewEntity); diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java new file mode 100644 index 0000000..c6ce881 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java @@ -0,0 +1,16 @@ +package com.example.demo.global.apiPayload.Exception; + +import com.example.demo.domain.review.Exception.code.ReviewErrorCode; +import lombok.Getter; + +@Getter +public class GeneralException extends RuntimeException { + + private final ReviewErrorCode errorCode; + + public GeneralException(ReviewErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } + +} diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java deleted file mode 100644 index 41592d9..0000000 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/ReviewException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo.global.apiPayload.Exception; - -import com.example.demo.global.apiPayload.response.ErrorCode; -import lombok.Getter; - -@Getter -public class ReviewException extends RuntimeException { - - private final ErrorCode errorCode; - - public ReviewException(ErrorCode errorCode) { - super(errorCode.getMessage()); - this.errorCode = errorCode; - } - -} diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java index dac967c..7d89a20 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java @@ -15,7 +15,7 @@ public class ApiResponse { // data 있는 성공 - public static ResponseEntity> success(SuccessCode code, T data) { + public static ResponseEntity> success(BaseSuccessCode code, T data) { ApiResponse body = new ApiResponse<>( true, code.getCode(), @@ -26,7 +26,7 @@ public static ResponseEntity> success(SuccessCode code, T dat } // data 없는 성공 (DELETE 등) - public static ResponseEntity> success(SuccessCode code) { + public static ResponseEntity> success(BaseSuccessCode code) { ApiResponse body = new ApiResponse<>( true, code.getCode(), @@ -36,7 +36,7 @@ public static ResponseEntity> success(SuccessCode code) { return ResponseEntity.status(code.getHttpStatus()).body(body); } // data 있는 실패 - public static ResponseEntity> ERROR(ErrorCode code, T data) { + public static ResponseEntity> ERROR(BaseErrorCode code, T data) { ApiResponse body = new ApiResponse<>( false, code.getCode(), @@ -48,7 +48,7 @@ public static ResponseEntity> ERROR(ErrorCode code, T data) { } // data 없는 실패(DELETE 등) - public static ResponseEntity> ERROR(ErrorCode code) { + public static ResponseEntity> ERROR(BaseErrorCode code) { ApiResponse body = new ApiResponse<>( false, code.getCode(), diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java new file mode 100644 index 0000000..bf18391 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java @@ -0,0 +1,11 @@ +package com.example.demo.global.apiPayload.response; + +import org.springframework.http.HttpStatus; + +import java.net.http.HttpRequest; + +public interface BaseErrorCode { + HttpStatus getHttpStatus(); + String getMessage(); + String getCode(); +} diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java new file mode 100644 index 0000000..806cf5a --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java @@ -0,0 +1,8 @@ +package com.example.demo.global.apiPayload.response; +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getHttpStatus(); + String getMessage(); + String getCode(); +} From 2e3f4f2864d0c73b0044875a5cdbed821f08c8dd Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 19 Nov 2025 18:48:47 +0900 Subject: [PATCH 21/30] made @valid --- week4/demo/build.gradle | 3 +++ .../demo/domain/alarm/entity/ReviewAlarm.java | 2 +- .../domain/member/entity/FavoriteFood.java | 2 +- .../demo/domain/member/entity/Food.java | 2 +- .../demo/domain/member/entity/Users.java | 2 +- .../demo/domain/mission/entity/Mission.java | 2 +- .../domain/mission/entity/MissionUser.java | 2 +- .../mission/entity/PermissionMission.java | 2 +- .../domain/restruant/entity/FoodMarket.java | 2 +- .../review/Exception/ReviewException.java | 6 +++--- .../Exception/code/ReviewErrorCode.java | 4 ++-- .../Exception/code/ReviewSuccessCode.java | 4 ++-- .../Handler/ReviewExceptionHandler.java | 8 ++++---- .../review/controller/ReviewController.java | 7 ++++--- .../review/dto/ReviewCreateRequest.java | 7 +++++++ .../demo/domain/review/dto/ReviewDto.java | 4 ++++ .../demo/domain/review/entity/Review.java | 2 +- .../domain/review/entity/ReviewImage.java | 2 +- .../domain/review/service/ReviewService.java | 4 ++-- .../Exception/GeneralException.java | 4 ++-- .../apiPayload/response/ApiResponse.java | 2 +- .../apiPayload/response/BaseErrorCode.java | 4 +--- .../apiPayload/response/BaseSuccessCode.java | 2 +- .../demo/global/config/SwaggerConfig.java | 19 +++++++++++++++++++ .../{domain => global/entity}/BaseEntity.java | 4 ++-- 25 files changed, 67 insertions(+), 35 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/global/config/SwaggerConfig.java rename week4/demo/src/main/java/com/example/demo/{domain => global/entity}/BaseEntity.java (82%) diff --git a/week4/demo/build.gradle b/week4/demo/build.gradle index 18f8f51..a245330 100644 --- a/week4/demo/build.gradle +++ b/week4/demo/build.gradle @@ -39,6 +39,9 @@ dependencies { annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" annotationProcessor "jakarta.persistence:jakarta.persistence-api" annotationProcessor "jakarta.annotation:jakarta.annotation-api" + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' } diff --git a/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java b/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java index ba967ff..2513f2b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java +++ b/week4/demo/src/main/java/com/example/demo/domain/alarm/entity/ReviewAlarm.java @@ -1,6 +1,6 @@ package com.example.demo.domain.alarm.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import com.example.demo.domain.member.entity.Users; import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java index 7141a6f..cc7dac5 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/FavoriteFood.java @@ -1,6 +1,6 @@ package com.example.demo.domain.member.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java index 75711a8..a396207 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Food.java @@ -1,6 +1,6 @@ package com.example.demo.domain.member.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java index ffc5222..c9af3b0 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java +++ b/week4/demo/src/main/java/com/example/demo/domain/member/entity/Users.java @@ -1,6 +1,6 @@ package com.example.demo.domain.member.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java index ffa8d2d..45cac8b 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/Mission.java @@ -1,6 +1,6 @@ package com.example.demo.domain.mission.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java index 11ae1a0..b5a6bae 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java @@ -1,6 +1,6 @@ package com.example.demo.domain.mission.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import com.example.demo.domain.member.entity.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java index 73f0054..5e13ede 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/PermissionMission.java @@ -1,6 +1,6 @@ package com.example.demo.domain.mission.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import com.example.demo.domain.member.entity.Users; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java index 2731400..fa2f740 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java +++ b/week4/demo/src/main/java/com/example/demo/domain/restruant/entity/FoodMarket.java @@ -1,6 +1,6 @@ package com.example.demo.domain.restruant.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java index 0b9d9fc..1160e75 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java @@ -1,7 +1,7 @@ -package com.example.demo.domain.review.Exception; +package com.example.demo.domain.review.exception; -import com.example.demo.global.apiPayload.Exception.GeneralException; -import com.example.demo.domain.review.Exception.code.ReviewErrorCode; +import com.example.demo.global.apipayload.Exception.GeneralException; +import com.example.demo.domain.review.exception.code.ReviewErrorCode; public class ReviewException extends GeneralException { public ReviewException(ReviewErrorCode errorCode) { diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java index 150659e..1639185 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewErrorCode.java @@ -1,6 +1,6 @@ -package com.example.demo.domain.review.Exception.code; +package com.example.demo.domain.review.exception.code; -import com.example.demo.global.apiPayload.response.BaseErrorCode; +import com.example.demo.global.apipayload.response.BaseErrorCode; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java index ab6c133..9b94061 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/code/ReviewSuccessCode.java @@ -1,7 +1,7 @@ // src/main/java/com/example/demo/global/response/SuccessCode.java -package com.example.demo.domain.review.Exception.code; +package com.example.demo.domain.review.exception.code; -import com.example.demo.global.apiPayload.response.BaseSuccessCode; +import com.example.demo.global.apipayload.response.BaseSuccessCode; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java index 46374b9..cf8a6c3 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java @@ -1,8 +1,8 @@ -package com.example.demo.domain.review.Handler; +package com.example.demo.domain.review.handler; -import com.example.demo.domain.review.Exception.ReviewException; -import com.example.demo.global.apiPayload.response.ApiResponse; -import com.example.demo.domain.review.Exception.code.ReviewErrorCode; +import com.example.demo.domain.review.exception.ReviewException; +import com.example.demo.global.apipayload.response.ApiResponse; +import com.example.demo.domain.review.exception.code.ReviewErrorCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java index 5479862..23e12c6 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -5,8 +5,9 @@ import com.example.demo.domain.review.dto.ReviewDto; import com.example.demo.domain.review.dto.ReviewResponse; import com.example.demo.domain.review.service.ReviewService; -import com.example.demo.global.apiPayload.response.ApiResponse; -import com.example.demo.domain.review.Exception.code.ReviewSuccessCode; +import com.example.demo.global.apipayload.response.ApiResponse; +import com.example.demo.domain.review.exception.code.ReviewSuccessCode; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -22,7 +23,7 @@ public class ReviewController { @PostMapping public ResponseEntity> createReview( - @RequestBody ReviewCreateRequest request + @Valid @RequestBody ReviewCreateRequest request ){ ReviewResponse reviewResponse=service.createReview(request); return ApiResponse.success(ReviewSuccessCode.REVIEW_CREATE_SUCCESS,reviewResponse); diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java index 45af9e6..4edb4a5 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewCreateRequest.java @@ -1,13 +1,20 @@ package com.example.demo.domain.review.dto; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + import java.math.BigDecimal; import java.util.List; /* * 나는 이 친구로 받을 데이터를 정의 */ public record ReviewCreateRequest( + @NotNull @Min(0) Long userId, + @NotNull @Min(0) Long marketId, + @NotBlank String content, BigDecimal star, List imageUrls // optional diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java index 75adff9..9b08333 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/dto/ReviewDto.java @@ -1,5 +1,9 @@ package com.example.demo.domain.review.dto; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + import java.math.BigDecimal; /* diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java b/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java index 137dde2..de12504 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/entity/Review.java @@ -1,7 +1,7 @@ package com.example.demo.domain.review.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import com.example.demo.domain.member.entity.Users; import com.example.demo.domain.restruant.entity.FoodMarket; import jakarta.persistence.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java b/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java index e4df0ab..11ff6c4 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/entity/ReviewImage.java @@ -1,6 +1,6 @@ package com.example.demo.domain.review.entity; -import com.example.demo.domain.BaseEntity; +import com.example.demo.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java index 8d29359..172c51a 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -11,8 +11,8 @@ import com.example.demo.domain.review.entity.ReviewImage; import com.example.demo.domain.review.repository.ReviewImageRepository; import com.example.demo.domain.review.repository.ReviewRepository; -import com.example.demo.domain.review.Exception.ReviewException; -import com.example.demo.domain.review.Exception.code.ReviewErrorCode; +import com.example.demo.domain.review.exception.ReviewException; +import com.example.demo.domain.review.exception.code.ReviewErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java index c6ce881..6cb0e3b 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java @@ -1,6 +1,6 @@ -package com.example.demo.global.apiPayload.Exception; +package com.example.demo.global.apipayload.Exception; -import com.example.demo.domain.review.Exception.code.ReviewErrorCode; +import com.example.demo.domain.review.exception.code.ReviewErrorCode; import lombok.Getter; @Getter diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java index 7d89a20..5234e46 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/ApiResponse.java @@ -1,5 +1,5 @@ -package com.example.demo.global.apiPayload.response; +package com.example.demo.global.apipayload.response; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.ResponseEntity; diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java index bf18391..9f1693e 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseErrorCode.java @@ -1,9 +1,7 @@ -package com.example.demo.global.apiPayload.response; +package com.example.demo.global.apipayload.response; import org.springframework.http.HttpStatus; -import java.net.http.HttpRequest; - public interface BaseErrorCode { HttpStatus getHttpStatus(); String getMessage(); diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java index 806cf5a..35e2015 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/response/BaseSuccessCode.java @@ -1,4 +1,4 @@ -package com.example.demo.global.apiPayload.response; +package com.example.demo.global.apipayload.response; import org.springframework.http.HttpStatus; public interface BaseSuccessCode { diff --git a/week4/demo/src/main/java/com/example/demo/global/config/SwaggerConfig.java b/week4/demo/src/main/java/com/example/demo/global/config/SwaggerConfig.java new file mode 100644 index 0000000..914ff7b --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/config/SwaggerConfig.java @@ -0,0 +1,19 @@ +package com.example.demo.global.config; + +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.OpenAPI; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .info(new Info() + .title("Project API") + .description("Project Swagger") + .version("0.0.1")); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java b/week4/demo/src/main/java/com/example/demo/global/entity/BaseEntity.java similarity index 82% rename from week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java rename to week4/demo/src/main/java/com/example/demo/global/entity/BaseEntity.java index 0208bcb..282a93e 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/BaseEntity.java +++ b/week4/demo/src/main/java/com/example/demo/global/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package com.example.demo.global.entity; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; @@ -11,7 +11,7 @@ import java.time.Instant; @MappedSuperclass -@EntityListeners(AuditingEntityListener.class) +@EntityListeners(AuditingEntityListener.class)//이걸 해야 저게 자동 기록됨. @Getter public abstract class BaseEntity { From 91b7707feb30ff1d1d05c2d61c798cbf11c54f10 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:06:12 +0900 Subject: [PATCH 22/30] d --- week4/demo/build.gradle | 4 + .../mission/controller/MissionController.java | 68 +++++++++++ .../demo/domain/mission/dto/MissionDtos.java | 69 ++++++++++++ .../domain/mission/entity/MissionStatus.java | 7 ++ .../domain/mission/entity/MissionUser.java | 4 + .../repository/MissionUserRepository.java | 5 + .../mission/service/MissionService.java | 106 ++++++++++++++++++ 7 files changed, 263 insertions(+) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionStatus.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java diff --git a/week4/demo/build.gradle b/week4/demo/build.gradle index a245330..a75d209 100644 --- a/week4/demo/build.gradle +++ b/week4/demo/build.gradle @@ -43,6 +43,10 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' + } tasks.named('test') { diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..227b466 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java @@ -0,0 +1,68 @@ +package com.example.demo.domain.mission.controller; + +import com.example.demo.domain.mission.dto.MissionDtos; +import com.example.demo.domain.mission.entity.Mission; +import com.example.demo.domain.mission.entity.MissionUser; +import com.example.demo.domain.mission.service.MissionService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +public class MissionController { + + private final MissionService missionService; + + // ========================= + // [1] 가게 미션 등록 + // ========================= + @PostMapping("/markets/{marketId}/missions") + public ResponseEntity createMission( + @PathVariable Long marketId, + @RequestBody MissionDtos.MissionCreateRequest request + ) { + Mission mission = missionService.createMission(marketId, request); + return ResponseEntity.ok(MissionDtos.MissionResponse.from(mission)); + } + + // ========================= + // [2] 가게 미션 목록 조회 + // ========================= + @GetMapping("/markets/{marketId}/missions") + public ResponseEntity> getMissionsByMarket( + @PathVariable Long marketId + ) { + List missions = missionService.getMissionsByMarket(marketId); + List result = missions.stream() + .map(MissionDtos.MissionResponse::from) + .toList(); + + return ResponseEntity.ok(result); + } + + // ========================= + // [3] 유저가 미션 수락 + // ========================= + @PostMapping("/missions/accept") + public ResponseEntity acceptMission( + @RequestBody MissionDtos.AcceptRequest request + ) { + MissionUser mu = missionService.acceptMission(request); + return ResponseEntity.ok(MissionDtos.MissionUserResponse.from(mu)); + } + + // ========================= + // [4] 유저가 미션 완료 + // ========================= + @PostMapping("/missions/complete") + public ResponseEntity completeMission( + @RequestBody MissionDtos.CompleteRequest request + ) { + MissionUser mu = missionService.completeMission(request); + return ResponseEntity.ok(MissionDtos.MissionUserResponse.from(mu)); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java new file mode 100644 index 0000000..ad73db4 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java @@ -0,0 +1,69 @@ +package com.example.demo.domain.mission.dto; + +import com.example.demo.domain.mission.entity.Mission; +import com.example.demo.domain.mission.entity.MissionUser; +import com.example.demo.domain.mission.entity.MissionStatus; + +public class MissionDtos { + + // ========== [가게 미션 등록 / 조회] ========== + + // 가게 미션 생성 요청용 DTO + public record MissionCreateRequest( + String content, + Integer missionPoint + ) {} + + // 가게 미션 응답 DTO + public record MissionResponse( + Long id, + Long marketId, + String marketName, + String content, + Integer missionPoint + ) { + public static MissionResponse from(Mission mission) { + return new MissionResponse( + mission.getId(), + mission.getMarket().getId(), + mission.getMarket().getName(), // FoodMarket에 getName() 있다고 가정 + mission.getContent(), + mission.getMissionPoint() + ); + } + } + + // ========== [유저 미션 수락 / 완료] ========== + + // 미션 수락 요청 + public record AcceptRequest( + Long missionId, + Long userId + ) {} + + // 미션 완료 요청 + public record CompleteRequest( + Long missionId, + Long userId, + String content // 인증 내용 + ) {} + + // 유저 미션 상태 응답 + public record MissionUserResponse( + Long missionUserId, + Long missionId, + Long userId, + MissionStatus status, + String content + ) { + public static MissionUserResponse from(MissionUser mu) { + return new MissionUserResponse( + mu.getId(), + mu.getMission().getId(), + mu.getUser().getId(), + mu.getMissionStatus(), + mu.getContent() + ); + } + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionStatus.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionStatus.java new file mode 100644 index 0000000..d706f0f --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionStatus.java @@ -0,0 +1,7 @@ +package com.example.demo.domain.mission.entity; + +public enum MissionStatus { + ACCEPTED, + COMPLETED, + CANCELLED, +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java index b5a6bae..9e195a9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java @@ -19,6 +19,10 @@ public class MissionUser extends BaseEntity { @JoinColumn(name="user_id", nullable=false) private Users user; + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private MissionStatus missionStatus; + @Column(nullable=false, length=200) private String content; } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java index f1d4445..ea36a2a 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java @@ -1,13 +1,18 @@ package com.example.demo.domain.mission.repository; +import com.example.demo.domain.member.entity.Users; +import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.mission.entity.MissionUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import java.util.List; +import java.util.Optional; public interface MissionUserRepository extends JpaRepository { List findByUser_IdOrderByUpdatedAtDesc(int userId); @Query("select mu from MissionUser mu join fetch mu.mission where mu.user.id = :userId order by mu.updatedAt desc ") List findByUser_IdOrderByUpdatedAtDesc2(int userId); + Optional findByMissionAndUser(Mission mission, Users user); + boolean existsByMissionAndUser(Mission mission, Users user); } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java new file mode 100644 index 0000000..c0f9609 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -0,0 +1,106 @@ +package com.example.demo.domain.mission.service; + +import com.example.demo.domain.member.entity.Users; +import com.example.demo.domain.member.repository.UsersRepository; +import com.example.demo.domain.mission.dto.MissionDtos; +import com.example.demo.domain.mission.entity.Mission; +import com.example.demo.domain.mission.entity.MissionStatus; +import com.example.demo.domain.mission.entity.MissionUser; +import com.example.demo.domain.mission.repository.MissionRepository; +import com.example.demo.domain.mission.repository.MissionUserRepository; +import com.example.demo.domain.restruant.entity.FoodMarket; +import com.example.demo.domain.restruant.entity.FoodMarketRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MissionService { + + private final MissionRepository missionRepository; + private final MissionUserRepository missionUserRepository; + private final UsersRepository usersRepository; + private final FoodMarketRepository foodMarketRepository; + + // ========================= + // [1] 가게 미션 등록 + // ========================= + @Transactional + public Mission createMission(Long marketId, MissionDtos.MissionCreateRequest request) { + FoodMarket market = foodMarketRepository.findById(marketId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); + + Mission mission = new Mission(); + mission.setMarket(market); + mission.setContent(request.content()); + mission.setMissionPoint(request.missionPoint()); + + return missionRepository.save(mission); + } + + // ========================= + // [2] 가게의 미션 리스트 조회 + // ========================= + @Transactional + public List getMissionsByMarket(Long marketId) { + FoodMarket market = foodMarketRepository.findById(marketId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); + + // 단순 예시: market 기준으로 필터 + // (MissionRepository에 findByMarket(...) 를 추가하는 게 더 깔끔) + return missionRepository.findAll().stream() + .filter(m -> m.getMarket().equals(market)) + .toList(); + } + + // ========================= + // [3] 미션 수락 + // ========================= + @Transactional + public MissionUser acceptMission(MissionDtos.AcceptRequest request) { + Mission mission = missionRepository.findById(request.missionId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 미션입니다.")); + + Users user = usersRepository.findById(request.userId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + + if (missionUserRepository.existsByMissionAndUser(mission, user)) { + throw new IllegalStateException("이미 이 미션을 수락했거나 완료했습니다."); + } + + MissionUser mu = new MissionUser(); + mu.setMission(mission); + mu.setUser(user); + mu.setMissionStatus(MissionStatus.ACCEPTED); + + return missionUserRepository.save(mu); + } + + // ========================= + // [4] 미션 완료 + // ========================= + @Transactional + public MissionUser completeMission(MissionDtos.CompleteRequest request) { + Mission mission = missionRepository.findById(request.missionId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 미션입니다.")); + + Users user = usersRepository.findById(request.userId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + + MissionUser mu = missionUserRepository.findByMissionAndUser(mission, user) + .orElseThrow(() -> new IllegalStateException("아직 이 미션을 수락하지 않았습니다.")); + + if (mu.getMissionStatus() == MissionStatus.COMPLETED) { + throw new IllegalStateException("이미 완료된 미션입니다."); + } + + mu.setMissionStatus(MissionStatus.COMPLETED);; + mu.setContent(request.content()); + + return mu; + } +} From ff7cda2853bad1f23e0e1d49d75e137704193044 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 25 Nov 2025 18:52:52 +0900 Subject: [PATCH 23/30] mission controller --- .idea/dataSources.xml | 15 ++++++++++++++- .../mission/controller/MissionController.java | 15 +++------------ .../demo/domain/mission/dto/MissionDtos.java | 14 ++++---------- .../mission/service/MissionService.java | 19 +++++-------------- week4/demo/src/main/resources/application.yml | 2 +- 5 files changed, 27 insertions(+), 38 deletions(-) diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index b3abbcd..100ada2 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver @@ -14,5 +14,18 @@ $ProjectFileDir$ + + mysql.8 + true + true + com.mysql.cj.jdbc.Driver + ${DB_URL} + + + + + + $ProjectFileDir$ + \ No newline at end of file diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java index 227b466..ac33cc9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java @@ -17,9 +17,6 @@ public class MissionController { private final MissionService missionService; - // ========================= - // [1] 가게 미션 등록 - // ========================= @PostMapping("/markets/{marketId}/missions") public ResponseEntity createMission( @PathVariable Long marketId, @@ -29,9 +26,7 @@ public ResponseEntity createMission( return ResponseEntity.ok(MissionDtos.MissionResponse.from(mission)); } - // ========================= - // [2] 가게 미션 목록 조회 - // ========================= + @GetMapping("/markets/{marketId}/missions") public ResponseEntity> getMissionsByMarket( @PathVariable Long marketId @@ -44,9 +39,7 @@ public ResponseEntity> getMissionsByMarket( return ResponseEntity.ok(result); } - // ========================= - // [3] 유저가 미션 수락 - // ========================= + @PostMapping("/missions/accept") public ResponseEntity acceptMission( @RequestBody MissionDtos.AcceptRequest request @@ -55,9 +48,7 @@ public ResponseEntity acceptMission( return ResponseEntity.ok(MissionDtos.MissionUserResponse.from(mu)); } - // ========================= - // [4] 유저가 미션 완료 - // ========================= + @PostMapping("/missions/complete") public ResponseEntity completeMission( @RequestBody MissionDtos.CompleteRequest request diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java index ad73db4..f9c95ec 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java @@ -6,15 +6,12 @@ public class MissionDtos { - // ========== [가게 미션 등록 / 조회] ========== - - // 가게 미션 생성 요청용 DTO public record MissionCreateRequest( String content, Integer missionPoint ) {} - // 가게 미션 응답 DTO + public record MissionResponse( Long id, Long marketId, @@ -26,29 +23,26 @@ public static MissionResponse from(Mission mission) { return new MissionResponse( mission.getId(), mission.getMarket().getId(), - mission.getMarket().getName(), // FoodMarket에 getName() 있다고 가정 + mission.getMarket().getName(), mission.getContent(), mission.getMissionPoint() ); } } - // ========== [유저 미션 수락 / 완료] ========== - - // 미션 수락 요청 public record AcceptRequest( Long missionId, Long userId ) {} - // 미션 완료 요청 + public record CompleteRequest( Long missionId, Long userId, String content // 인증 내용 ) {} - // 유저 미션 상태 응답 + public record MissionUserResponse( Long missionUserId, Long missionId, diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java index c0f9609..83895eb 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -26,9 +26,7 @@ public class MissionService { private final UsersRepository usersRepository; private final FoodMarketRepository foodMarketRepository; - // ========================= - // [1] 가게 미션 등록 - // ========================= + @Transactional public Mission createMission(Long marketId, MissionDtos.MissionCreateRequest request) { FoodMarket market = foodMarketRepository.findById(marketId) @@ -42,24 +40,19 @@ public Mission createMission(Long marketId, MissionDtos.MissionCreateRequest req return missionRepository.save(mission); } - // ========================= - // [2] 가게의 미션 리스트 조회 - // ========================= + @Transactional public List getMissionsByMarket(Long marketId) { FoodMarket market = foodMarketRepository.findById(marketId) .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); - // 단순 예시: market 기준으로 필터 - // (MissionRepository에 findByMarket(...) 를 추가하는 게 더 깔끔) + return missionRepository.findAll().stream() .filter(m -> m.getMarket().equals(market)) .toList(); } - // ========================= - // [3] 미션 수락 - // ========================= + @Transactional public MissionUser acceptMission(MissionDtos.AcceptRequest request) { Mission mission = missionRepository.findById(request.missionId()) @@ -80,9 +73,7 @@ public MissionUser acceptMission(MissionDtos.AcceptRequest request) { return missionUserRepository.save(mu); } - // ========================= - // [4] 미션 완료 - // ========================= + @Transactional public MissionUser completeMission(MissionDtos.CompleteRequest request) { Mission mission = missionRepository.findById(request.missionId()) diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index 244a159..121d4b0 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: name :demo datasource: - driver-class-name: com.mysql.cj.jdbc.Driver #mysql???.. + driver-class-name: com.mysql.cj.jdbc.Driver url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} From 95579d670e43ebe000468c0646f975a777668a03 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 26 Nov 2025 16:06:27 +0900 Subject: [PATCH 24/30] modifying names.. --- .../example/demo/domain/review/Exception/ReviewException.java | 2 +- .../demo/global/apiPayload/Exception/GeneralException.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java index 1160e75..e5cc449 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Exception/ReviewException.java @@ -1,6 +1,6 @@ package com.example.demo.domain.review.exception; -import com.example.demo.global.apipayload.Exception.GeneralException; +import com.example.demo.global.apipayload.exception.GeneralException; import com.example.demo.domain.review.exception.code.ReviewErrorCode; public class ReviewException extends GeneralException { diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java index 6cb0e3b..dbfc34e 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java @@ -1,4 +1,4 @@ -package com.example.demo.global.apipayload.Exception; +package com.example.demo.global.apipayload.exception; import com.example.demo.domain.review.exception.code.ReviewErrorCode; import lombok.Getter; From 0b10cd7203602c92751ee938c4f86186724ecb0c Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 26 Nov 2025 18:14:48 +0900 Subject: [PATCH 25/30] modify con --- .idea/dataSources.xml | 2 +- .../mission/controller/MissionController.java | 59 +++++++---- .../mission/exception/MissionException.java | 10 ++ .../exception/code/MissionErrorCode.java | 22 +++++ .../exception/code/MissionSuccessCode.java | 20 ++++ .../mission/repository/MissionRepository.java | 2 + .../mission/service/MissionService.java | 98 ++++++++++++++----- .../Exception/GeneralException.java | 6 +- 8 files changed, 167 insertions(+), 52 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/exception/MissionException.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionSuccessCode.java diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 100ada2..913392e 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java index ac33cc9..33c03cf 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java @@ -1,9 +1,9 @@ package com.example.demo.domain.mission.controller; +import com.example.demo.domain.mission.exception.code.MissionSuccessCode; import com.example.demo.domain.mission.dto.MissionDtos; -import com.example.demo.domain.mission.entity.Mission; -import com.example.demo.domain.mission.entity.MissionUser; import com.example.demo.domain.mission.service.MissionService; +import com.example.demo.global.apipayload.response.*; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -17,43 +17,60 @@ public class MissionController { private final MissionService missionService; + // ========================= + // [1] 가게 미션 등록 (사장/관리자용) + // ========================= @PostMapping("/markets/{marketId}/missions") - public ResponseEntity createMission( + public ResponseEntity> createMission( @PathVariable Long marketId, @RequestBody MissionDtos.MissionCreateRequest request ) { - Mission mission = missionService.createMission(marketId, request); - return ResponseEntity.ok(MissionDtos.MissionResponse.from(mission)); + MissionDtos.MissionResponse body = missionService.createMission(marketId, request); + return ApiResponse.success(MissionSuccessCode.MISSION_CREATED, body); } - + // ========================= + // [2] 가게 미션 목록 조회 + // ========================= @GetMapping("/markets/{marketId}/missions") - public ResponseEntity> getMissionsByMarket( + public ResponseEntity>> getMissionsByMarket( @PathVariable Long marketId ) { - List missions = missionService.getMissionsByMarket(marketId); - List result = missions.stream() - .map(MissionDtos.MissionResponse::from) - .toList(); - - return ResponseEntity.ok(result); + List body = missionService.getMissionsByMarket(marketId); + return ApiResponse.success(MissionSuccessCode.MISSION_LIST, body); } - + // ========================= + // [3] 유저가 미션 수락 + // ========================= @PostMapping("/missions/accept") - public ResponseEntity acceptMission( + public ResponseEntity> acceptMission( @RequestBody MissionDtos.AcceptRequest request ) { - MissionUser mu = missionService.acceptMission(request); - return ResponseEntity.ok(MissionDtos.MissionUserResponse.from(mu)); + MissionDtos.MissionUserResponse body = missionService.acceptMission(request); + return ApiResponse.success(MissionSuccessCode.MISSION_ACCEPTED, body); } - + // ========================= + // [4] 유저가 미션 완료 + // ========================= @PostMapping("/missions/complete") - public ResponseEntity completeMission( + public ResponseEntity> completeMission( @RequestBody MissionDtos.CompleteRequest request ) { - MissionUser mu = missionService.completeMission(request); - return ResponseEntity.ok(MissionDtos.MissionUserResponse.from(mu)); + MissionDtos.MissionUserResponse body = missionService.completeMission(request); + return ApiResponse.success(MissionSuccessCode.MISSION_COMPLETED, body); + } + + // ========================= + // [5] 유저별 특정 미션 상태 조회 + // ========================= + @GetMapping("/missions/{missionId}/users/{userId}") + public ResponseEntity> getMissionUser( + @PathVariable Long missionId, + @PathVariable Long userId + ) { + MissionDtos.MissionUserResponse body = missionService.getMissionUser(missionId, userId); + return ApiResponse.success(MissionSuccessCode.MISSION_DETAIL, body); } } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/exception/MissionException.java b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..e817c5f --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.example.demo.domain.mission.exception; + +import com.example.demo.domain.mission.exception.code.MissionErrorCode; +import com.example.demo.global.apipayload.exception.GeneralException; + +public class MissionException extends GeneralException { + public MissionException(MissionErrorCode errorCode) { + super(errorCode); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..91d304e --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.mission.exception.code; + +import com.example.demo.global.apipayload.response.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +@Getter +@AllArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "M4001", "존재하지 않는 미션입니다."), + MARKET_NOT_FOUND(HttpStatus.NOT_FOUND, "M4002", "존재하지 않는 가게입니다."), + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "M4003", "존재하지 않는 유저입니다."), + + MISSION_ALREADY_ACCEPTED(HttpStatus.CONFLICT, "M4004", "이미 수락한 미션입니다."), + MISSION_NOT_ACCEPTED(HttpStatus.BAD_REQUEST, "M4005", "아직 이 미션을 수락하지 않았습니다."), + MISSION_ALREADY_COMPLETED(HttpStatus.CONFLICT, "M4006", "이미 완료된 미션입니다."), + MISSION_CONDITION_NOT_MET(HttpStatus.BAD_REQUEST, "M4007", "미션 조건을 만족하지 않습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionSuccessCode.java b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..daf514d --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,20 @@ +package com.example.demo.domain.mission.exception.code; + +import com.example.demo.global.apipayload.response.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +@Getter +@AllArgsConstructor +public enum MissionSuccessCode implements BaseSuccessCode { + + MISSION_CREATED(HttpStatus.CREATED, "M001", "미션 생성에 성공했습니다."), + MISSION_LIST(HttpStatus.OK, "M002", "미션 목록 조회에 성공했습니다."), + MISSION_ACCEPTED(HttpStatus.OK, "M003", "미션을 수락했습니다."), + MISSION_COMPLETED(HttpStatus.OK, "M004", "미션을 완료했습니다."), + MISSION_DETAIL(HttpStatus.OK, "M005", "미션 상태 조회에 성공했습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java index 76b69bf..5b95ebd 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java @@ -1,6 +1,7 @@ package com.example.demo.domain.mission.repository; import com.example.demo.domain.mission.entity.Mission; +import com.example.demo.domain.restruant.entity.FoodMarket; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -10,4 +11,5 @@ public interface MissionRepository extends JpaRepository { List findMissionsByContentOrderByUpdatedAt(String Content); @Query("select m from Mission m where m.content=:Content order by m.updatedAt desc") List findMissionsByContentOrderByUpdatedAt2(String Content); + List findByMarket(FoodMarket market); } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java index 83895eb..637446e 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -2,10 +2,12 @@ import com.example.demo.domain.member.entity.Users; import com.example.demo.domain.member.repository.UsersRepository; +import com.example.demo.domain.mission.exception.code.MissionErrorCode; import com.example.demo.domain.mission.dto.MissionDtos; import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.mission.entity.MissionStatus; import com.example.demo.domain.mission.entity.MissionUser; +import com.example.demo.domain.mission.exception.MissionException; import com.example.demo.domain.mission.repository.MissionRepository; import com.example.demo.domain.mission.repository.MissionUserRepository; import com.example.demo.domain.restruant.entity.FoodMarket; @@ -19,6 +21,7 @@ @Service @RequiredArgsConstructor +@Transactional public class MissionService { private final MissionRepository missionRepository; @@ -26,72 +29,113 @@ public class MissionService { private final UsersRepository usersRepository; private final FoodMarketRepository foodMarketRepository; - - @Transactional - public Mission createMission(Long marketId, MissionDtos.MissionCreateRequest request) { + // ========================= + // [1] 가게 미션 등록 (사장/관리자용) + // ========================= + public MissionDtos.MissionResponse createMission( + Long marketId, + MissionDtos.MissionCreateRequest request + ) { FoodMarket market = foodMarketRepository.findById(marketId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.MARKET_NOT_FOUND)); Mission mission = new Mission(); mission.setMarket(market); mission.setContent(request.content()); mission.setMissionPoint(request.missionPoint()); - return missionRepository.save(mission); + Mission saved = missionRepository.save(mission); + return MissionDtos.MissionResponse.from(saved); } - - @Transactional - public List getMissionsByMarket(Long marketId) { + // ========================= + // [2] 가게의 미션 리스트 조회 + // ========================= + public List getMissionsByMarket(Long marketId) { FoodMarket market = foodMarketRepository.findById(marketId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.MARKET_NOT_FOUND)); + // MissionRepository에 아래 메서드가 정의되어 있다고 가정: + // List findByMarket(FoodMarket market); + List missions = missionRepository.findByMarket(market); - return missionRepository.findAll().stream() - .filter(m -> m.getMarket().equals(market)) + return missions.stream() + .map(MissionDtos.MissionResponse::from) .toList(); } - - @Transactional - public MissionUser acceptMission(MissionDtos.AcceptRequest request) { + // ========================= + // [3] 유저가 미션 수락 + // ========================= + public MissionDtos.MissionUserResponse acceptMission(MissionDtos.AcceptRequest request) { Mission mission = missionRepository.findById(request.missionId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 미션입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); Users user = usersRepository.findById(request.userId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); + // 이미 수락/완료한 미션인지 체크 if (missionUserRepository.existsByMissionAndUser(mission, user)) { - throw new IllegalStateException("이미 이 미션을 수락했거나 완료했습니다."); + throw new MissionException(MissionErrorCode.MISSION_ALREADY_ACCEPTED); } + // 필요하다면 조건 체크: + // if (!canAccept(mission, user)) { + // throw new BusinessException(MissionErrorCode.MISSION_CONDITION_NOT_MET); + // } + MissionUser mu = new MissionUser(); mu.setMission(mission); mu.setUser(user); mu.setMissionStatus(MissionStatus.ACCEPTED); - return missionUserRepository.save(mu); + MissionUser saved = missionUserRepository.save(mu); + return MissionDtos.MissionUserResponse.from(saved); } - - @Transactional - public MissionUser completeMission(MissionDtos.CompleteRequest request) { + // ========================= + // [4] 유저가 미션 완료 + // ========================= + public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteRequest request) { Mission mission = missionRepository.findById(request.missionId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 미션입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); Users user = usersRepository.findById(request.userId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 유저입니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); MissionUser mu = missionUserRepository.findByMissionAndUser(mission, user) - .orElseThrow(() -> new IllegalStateException("아직 이 미션을 수락하지 않았습니다.")); + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_ACCEPTED)); if (mu.getMissionStatus() == MissionStatus.COMPLETED) { - throw new IllegalStateException("이미 완료된 미션입니다."); + throw new MissionException(MissionErrorCode.MISSION_ALREADY_COMPLETED); } - mu.setMissionStatus(MissionStatus.COMPLETED);; + // 완료 조건 체크 필요시: + // if (!canComplete(mission, user)) { + // throw new BusinessException(MissionErrorCode.MISSION_CONDITION_NOT_MET); + // } + + mu.setMissionStatus(MissionStatus.COMPLETED); mu.setContent(request.content()); - return mu; + MissionUser updated = missionUserRepository.save(mu); + return MissionDtos.MissionUserResponse.from(updated); + } + + // ========================= + // [5] (선택) 유저의 특정 미션 상태 조회 + // ========================= + public MissionDtos.MissionUserResponse getMissionUser(Long missionId, Long userId) { + Mission mission = missionRepository.findById(missionId) + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); + + Users user = usersRepository.findById(userId) + .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); + + MissionUser mu = missionUserRepository.findByMissionAndUser(mission, user) + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_ACCEPTED) + ); + + return MissionDtos.MissionUserResponse.from(mu); } } diff --git a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java index dbfc34e..5a44549 100644 --- a/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java +++ b/week4/demo/src/main/java/com/example/demo/global/apiPayload/Exception/GeneralException.java @@ -1,14 +1,14 @@ package com.example.demo.global.apipayload.exception; -import com.example.demo.domain.review.exception.code.ReviewErrorCode; +import com.example.demo.global.apipayload.response.BaseErrorCode; import lombok.Getter; @Getter public class GeneralException extends RuntimeException { - private final ReviewErrorCode errorCode; + private final BaseErrorCode errorCode; - public GeneralException(ReviewErrorCode errorCode) { + public GeneralException(BaseErrorCode errorCode) { super(errorCode.getMessage()); this.errorCode = errorCode; } From 5f114f359678478c7f85ec8a3b361deb7b2cac33 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 2 Dec 2025 15:10:59 +0900 Subject: [PATCH 26/30] d --- .../demo/domain/review/Handler/ReviewExceptionHandler.java | 3 ++- week4/demo/src/main/resources/application.yml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java index cf8a6c3..b74005f 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java +++ b/week4/demo/src/main/java/com/example/demo/domain/review/Handler/ReviewExceptionHandler.java @@ -3,6 +3,7 @@ import com.example.demo.domain.review.exception.ReviewException; import com.example.demo.global.apipayload.response.ApiResponse; import com.example.demo.domain.review.exception.code.ReviewErrorCode; +import com.example.demo.global.apipayload.response.BaseErrorCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -11,7 +12,7 @@ public class ReviewExceptionHandler { @ExceptionHandler(ReviewException.class) public ResponseEntity> handleReviewException(ReviewException e) { - ReviewErrorCode errorCode =e.getErrorCode(); + BaseErrorCode errorCode =e.getErrorCode(); return ApiResponse.ERROR(errorCode); } diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index 121d4b0..af2abb9 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ${DB_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} + url: jdbc:mysql://localhost:3306/market + username: root + password: 9897 jpa: hibernate: From 060dd6299d84ce53d3f2e8360f0a82fdde1c887d Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 2 Dec 2025 22:09:16 +0900 Subject: [PATCH 27/30] mission-9 --- .../Handler/PagingExceptionHandler.java | 21 +++++ .../mission/controller/MissionController.java | 34 ++++---- .../demo/domain/mission/dto/MissionDtos.java | 83 +++++++++++++++---- .../domain/mission/entity/MissionUser.java | 2 +- .../exception/code/MissionErrorCode.java | 3 +- .../mission/repository/MissionRepository.java | 4 +- .../repository/MissionUserRepository.java | 3 + .../mission/service/MissionService.java | 77 +++++++++++------ .../demo/global/validation/PageValidator.java | 14 ++++ .../demo/global/validation/ValidPage.java | 19 +++++ week4/demo/src/main/resources/application.yml | 4 +- 11 files changed, 204 insertions(+), 60 deletions(-) create mode 100644 week4/demo/src/main/java/com/example/demo/domain/mission/Handler/PagingExceptionHandler.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/validation/PageValidator.java create mode 100644 week4/demo/src/main/java/com/example/demo/global/validation/ValidPage.java diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/Handler/PagingExceptionHandler.java b/week4/demo/src/main/java/com/example/demo/domain/mission/Handler/PagingExceptionHandler.java new file mode 100644 index 0000000..f375557 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/Handler/PagingExceptionHandler.java @@ -0,0 +1,21 @@ +package com.example.demo.domain.mission.Handler; + +import com.example.demo.domain.mission.exception.code.MissionErrorCode; +import jakarta.validation.ConstraintViolationException; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import com.example.demo.global.apipayload.response.ApiResponse; +import com.example.demo.global.apipayload.response.BaseErrorCode; + + +@RestControllerAdvice +public class PagingExceptionHandler { + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity> handlePagingException(ConstraintViolationException e) { + + BaseErrorCode errorCode = MissionErrorCode.INVALID_PAGE; + return ApiResponse.ERROR(errorCode); + } +} diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java index 33c03cf..b89115f 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java @@ -4,12 +4,14 @@ import com.example.demo.domain.mission.dto.MissionDtos; import com.example.demo.domain.mission.service.MissionService; import com.example.demo.global.apipayload.response.*; +import com.example.demo.global.validation.ValidPage; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - +@Validated @RestController @RequestMapping("/api") @RequiredArgsConstructor @@ -33,10 +35,12 @@ public ResponseEntity> createMission( // [2] 가게 미션 목록 조회 // ========================= @GetMapping("/markets/{marketId}/missions") - public ResponseEntity>> getMissionsByMarket( - @PathVariable Long marketId + public ResponseEntity> getMissionsByMarket( + @PathVariable Long marketId, + @ValidPage + @RequestParam(name = "page", defaultValue = "1") Integer page ) { - List body = missionService.getMissionsByMarket(marketId); + MissionDtos.MissionPageResponse body = missionService.getMissionsByMarket(marketId, page); return ApiResponse.success(MissionSuccessCode.MISSION_LIST, body); } @@ -62,15 +66,17 @@ public ResponseEntity> completeMiss return ApiResponse.success(MissionSuccessCode.MISSION_COMPLETED, body); } - // ========================= - // [5] 유저별 특정 미션 상태 조회 - // ========================= - @GetMapping("/missions/{missionId}/users/{userId}") - public ResponseEntity> getMissionUser( - @PathVariable Long missionId, - @PathVariable Long userId + + + @GetMapping("/users/{userId}/missions") + public ResponseEntity> getMyMissions( + @PathVariable Long userId, + @Valid @ValidPage + @RequestParam(name = "page", defaultValue = "1") Integer page ) { - MissionDtos.MissionUserResponse body = missionService.getMissionUser(missionId, userId); - return ApiResponse.success(MissionSuccessCode.MISSION_DETAIL, body); + MissionDtos.MyMissionPageResponse body = + missionService.getMyMissions(userId, page); + + return ApiResponse.success(MissionSuccessCode.MISSION_LIST, body); } } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java index f9c95ec..7e5eccd 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java @@ -3,15 +3,19 @@ import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.mission.entity.MissionUser; import com.example.demo.domain.mission.entity.MissionStatus; +import lombok.Builder; + +import java.util.List; public class MissionDtos { + @Builder public record MissionCreateRequest( String content, Integer missionPoint ) {} - + @Builder public record MissionResponse( Long id, Long marketId, @@ -20,29 +24,41 @@ public record MissionResponse( Integer missionPoint ) { public static MissionResponse from(Mission mission) { - return new MissionResponse( - mission.getId(), - mission.getMarket().getId(), - mission.getMarket().getName(), - mission.getContent(), - mission.getMissionPoint() - ); + return MissionResponse.builder() + .id(mission.getId()) + .marketId(mission.getMarket().getId()) + .marketName(mission.getMarket().getName()) + .content(mission.getContent()) + .missionPoint(mission.getMissionPoint()) + .build(); } } + // 페이징 응답 DTO (10개씩) + @Builder + public record MissionPageResponse( + List content, + int page, // 현재 페이지 (1-based) + int size, // 페이지 크기 + long totalElements, // 전체 개수 + int totalPages, // 전체 페이지 수 + boolean last // 마지막 페이지 여부 + ) {} + + @Builder public record AcceptRequest( Long missionId, Long userId ) {} - + @Builder public record CompleteRequest( Long missionId, Long userId, String content // 인증 내용 ) {} - + @Builder public record MissionUserResponse( Long missionUserId, Long missionId, @@ -51,13 +67,46 @@ public record MissionUserResponse( String content ) { public static MissionUserResponse from(MissionUser mu) { - return new MissionUserResponse( - mu.getId(), - mu.getMission().getId(), - mu.getUser().getId(), - mu.getMissionStatus(), - mu.getContent() - ); + return MissionUserResponse.builder() + .missionUserId(mu.getId()) + .missionId(mu.getMission().getId()) + .userId(mu.getUser().getId()) + .status(mu.getMissionStatus()) + .content(mu.getContent()) + .build(); } } + @Builder + public record MyMissionItemResponse( + Long missionUserId, + Long missionId, + Long marketId, + String marketName, + String missionContent, + Integer missionPoint, + MissionStatus status + ) { + public static MyMissionItemResponse from(MissionUser mu) { + Mission mission = mu.getMission(); + return MyMissionItemResponse.builder() + .missionUserId(mu.getId()) + .missionId(mission.getId()) + .marketId(mission.getMarket().getId()) + .marketName(mission.getMarket().getName()) + .missionContent(mission.getContent()) + .missionPoint(mission.getMissionPoint()) + .status(mu.getMissionStatus()) + .build(); + } + } + @Builder + public record MyMissionPageResponse( + List content, + int page, + int size, + long totalElements, + int totalPages, + boolean last + ) {} + } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java index 9e195a9..60ec22c 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/entity/MissionUser.java @@ -20,7 +20,7 @@ public class MissionUser extends BaseEntity { private Users user; @Enumerated(EnumType.STRING) - @Column(nullable = false) + @Column(nullable = true) private MissionStatus missionStatus; @Column(nullable=false, length=200) diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java index 91d304e..bf0abc9 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/exception/code/MissionErrorCode.java @@ -10,7 +10,7 @@ public enum MissionErrorCode implements BaseErrorCode { MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "M4001", "존재하지 않는 미션입니다."), MARKET_NOT_FOUND(HttpStatus.NOT_FOUND, "M4002", "존재하지 않는 가게입니다."), USER_NOT_FOUND(HttpStatus.NOT_FOUND, "M4003", "존재하지 않는 유저입니다."), - + INVALID_PAGE(HttpStatus.BAD_REQUEST,"P001", "페이지를 1이상으로 해라"), MISSION_ALREADY_ACCEPTED(HttpStatus.CONFLICT, "M4004", "이미 수락한 미션입니다."), MISSION_NOT_ACCEPTED(HttpStatus.BAD_REQUEST, "M4005", "아직 이 미션을 수락하지 않았습니다."), MISSION_ALREADY_COMPLETED(HttpStatus.CONFLICT, "M4006", "이미 완료된 미션입니다."), @@ -19,4 +19,5 @@ public enum MissionErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String code; private final String message; + } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java index 5b95ebd..bfa46be 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionRepository.java @@ -2,6 +2,8 @@ import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.restruant.entity.FoodMarket; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -11,5 +13,5 @@ public interface MissionRepository extends JpaRepository { List findMissionsByContentOrderByUpdatedAt(String Content); @Query("select m from Mission m where m.content=:Content order by m.updatedAt desc") List findMissionsByContentOrderByUpdatedAt2(String Content); - List findByMarket(FoodMarket market); + Page findByMarket(FoodMarket market, Pageable pageable); } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java index ea36a2a..9435a52 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/repository/MissionUserRepository.java @@ -3,6 +3,8 @@ import com.example.demo.domain.member.entity.Users; import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.mission.entity.MissionUser; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -14,5 +16,6 @@ public interface MissionUserRepository extends JpaRepository { @Query("select mu from MissionUser mu join fetch mu.mission where mu.user.id = :userId order by mu.updatedAt desc ") List findByUser_IdOrderByUpdatedAtDesc2(int userId); Optional findByMissionAndUser(Mission mission, Users user); + Page findByUser_IdOrderByUpdatedAtDesc(Long userId, Pageable pageable); boolean existsByMissionAndUser(Mission mission, Users user); } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java index 637446e..e9ab544 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -2,23 +2,22 @@ import com.example.demo.domain.member.entity.Users; import com.example.demo.domain.member.repository.UsersRepository; -import com.example.demo.domain.mission.exception.code.MissionErrorCode; import com.example.demo.domain.mission.dto.MissionDtos; import com.example.demo.domain.mission.entity.Mission; import com.example.demo.domain.mission.entity.MissionStatus; import com.example.demo.domain.mission.entity.MissionUser; import com.example.demo.domain.mission.exception.MissionException; +import com.example.demo.domain.mission.exception.code.MissionErrorCode; import com.example.demo.domain.mission.repository.MissionRepository; import com.example.demo.domain.mission.repository.MissionUserRepository; import com.example.demo.domain.restruant.entity.FoodMarket; import com.example.demo.domain.restruant.entity.FoodMarketRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional @@ -49,19 +48,32 @@ public MissionDtos.MissionResponse createMission( } // ========================= - // [2] 가게의 미션 리스트 조회 + // [2] 가게의 미션 리스트 조회 (페이징, 한 페이지 10개) + // - 프론트: page >= 1 + // - JPA: 0-based index → page - 1 // ========================= - public List getMissionsByMarket(Long marketId) { + public MissionDtos.MissionPageResponse getMissionsByMarket(Long marketId, int page) { FoodMarket market = foodMarketRepository.findById(marketId) .orElseThrow(() -> new MissionException(MissionErrorCode.MARKET_NOT_FOUND)); - // MissionRepository에 아래 메서드가 정의되어 있다고 가정: - // List findByMarket(FoodMarket market); - List missions = missionRepository.findByMarket(market); - - return missions.stream() - .map(MissionDtos.MissionResponse::from) - .toList(); + int pageIndex = page - 1; // 1-based → 0-based 변환 + PageRequest pageable = PageRequest.of(pageIndex, 10); + + Page missions = missionRepository.findByMarket(market, pageable); + + return MissionDtos.MissionPageResponse.builder() + .content( + missions.getContent() + .stream() + .map(MissionDtos.MissionResponse::from) + .toList() + ) + .page(page) // 1-based 그대로 반환 + .size(missions.getSize()) + .totalElements(missions.getTotalElements()) + .totalPages(missions.getTotalPages()) + .last(missions.isLast()) + .build(); } // ========================= @@ -79,11 +91,6 @@ public MissionDtos.MissionUserResponse acceptMission(MissionDtos.AcceptRequest r throw new MissionException(MissionErrorCode.MISSION_ALREADY_ACCEPTED); } - // 필요하다면 조건 체크: - // if (!canAccept(mission, user)) { - // throw new BusinessException(MissionErrorCode.MISSION_CONDITION_NOT_MET); - // } - MissionUser mu = new MissionUser(); mu.setMission(mission); mu.setUser(user); @@ -110,10 +117,8 @@ public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteReque throw new MissionException(MissionErrorCode.MISSION_ALREADY_COMPLETED); } - // 완료 조건 체크 필요시: - // if (!canComplete(mission, user)) { - // throw new BusinessException(MissionErrorCode.MISSION_CONDITION_NOT_MET); - // } + // 필요하다면 완료 조건 체크 로직 추가 가능 + // ... mu.setMissionStatus(MissionStatus.COMPLETED); mu.setContent(request.content()); @@ -133,9 +138,33 @@ public MissionDtos.MissionUserResponse getMissionUser(Long missionId, Long userI .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); MissionUser mu = missionUserRepository.findByMissionAndUser(mission, user) - .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_ACCEPTED) - ); + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_ACCEPTED)); return MissionDtos.MissionUserResponse.from(mu); } + public MissionDtos.MyMissionPageResponse getMyMissions(Long userId, int page) { + + Users user = usersRepository.findById(userId) + .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); + + int pageIndex = page - 1; // 1-based → 0-based + PageRequest pageable = PageRequest.of(pageIndex, 10); + + Page muPage = + missionUserRepository.findByUser_IdOrderByUpdatedAtDesc(userId, pageable); + + return MissionDtos.MyMissionPageResponse.builder() + .content( + muPage.getContent().stream() + .map(MissionDtos.MyMissionItemResponse::from) + .toList() + ) + .page(page) + .size(muPage.getSize()) + .totalElements(muPage.getTotalElements()) + .totalPages(muPage.getTotalPages()) + .last(muPage.isLast()) + .build(); + } + } diff --git a/week4/demo/src/main/java/com/example/demo/global/validation/PageValidator.java b/week4/demo/src/main/java/com/example/demo/global/validation/PageValidator.java new file mode 100644 index 0000000..83cc097 --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/validation/PageValidator.java @@ -0,0 +1,14 @@ +package com.example.demo.global.validation; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class PageValidator implements ConstraintValidator { + + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + // null 은 defaultValue 로 대체되니까 허용 + if (value == null) return true; + return value >= 1; + } +} diff --git a/week4/demo/src/main/java/com/example/demo/global/validation/ValidPage.java b/week4/demo/src/main/java/com/example/demo/global/validation/ValidPage.java new file mode 100644 index 0000000..798a9df --- /dev/null +++ b/week4/demo/src/main/java/com/example/demo/global/validation/ValidPage.java @@ -0,0 +1,19 @@ +package com.example.demo.global.validation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Target({ ElementType.PARAMETER, ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = PageValidator.class) +public @interface ValidPage { + + String message() default "page must be greater than or equal to 1"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index af2abb9..42c0f79 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -6,11 +6,11 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/market username: root - password: 9897 + password: 123qazasd! jpa: hibernate: - ddl-auto: create-drop + ddl-auto: validate database: mysql database-platform: org.hibernate.dialect.MySQLDialect show-sql: true \ No newline at end of file From 09b3fa8235cd803f05d6263756e6731cc29136a4 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Tue, 2 Dec 2025 22:10:01 +0900 Subject: [PATCH 28/30] dd --- .idea/dataSources.xml | 2 +- out/production/Spring/application.properties | 1 - .../Spring/com/example/demo/ddl/market.sql | 143 ------------------ 3 files changed, 1 insertion(+), 145 deletions(-) delete mode 100644 out/production/Spring/application.properties delete mode 100644 out/production/Spring/com/example/demo/ddl/market.sql diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 913392e..100ada2 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver diff --git a/out/production/Spring/application.properties b/out/production/Spring/application.properties deleted file mode 100644 index 2109a44..0000000 --- a/out/production/Spring/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=demo diff --git a/out/production/Spring/com/example/demo/ddl/market.sql b/out/production/Spring/com/example/demo/ddl/market.sql deleted file mode 100644 index 39fec43..0000000 --- a/out/production/Spring/com/example/demo/ddl/market.sql +++ /dev/null @@ -1,143 +0,0 @@ -CREATE TABLE users ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 고유 식별자', - email VARCHAR(50) NOT NULL COMMENT '로그인 이메일(유니크)', - password VARCHAR(100) NOT NULL COMMENT '비밀번호 해시(예: bcrypt 60자)', - name VARCHAR(20) NOT NULL COMMENT '이름', - gender TINYINT NOT NULL COMMENT '0:남, 1:여, 2:기타 등', - birth DATE NOT NULL COMMENT '생년월일', - address VARCHAR(50) NOT NULL COMMENT '주소', - point INT NOT NULL DEFAULT 0 COMMENT '총 포인트', - PRIMARY KEY (id), - UNIQUE KEY UK_users_email (email) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='user_information'; - --- 음식 카테고리 -CREATE TABLE food ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '음식 카테고리 ID', - name VARCHAR(40) NOT NULL COMMENT '음식 카테고리 이름', - PRIMARY KEY (id), - UNIQUE KEY UK_food_name (name) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드카테고리'; - --- 선호 음식 (유저-음식) -CREATE TABLE favorite_food ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저선호음식코드', - food_id BIGINT NOT NULL COMMENT '음식 카테고리 ID', - user_id BIGINT NOT NULL COMMENT '유저 ID', - PRIMARY KEY (id), - UNIQUE KEY UK_favorite_food_user_food (user_id, food_id), - KEY IDX_favorite_food_food (food_id), - CONSTRAINT FK_favorite_food_food - FOREIGN KEY (food_id) REFERENCES food (id) - ON UPDATE CASCADE ON DELETE RESTRICT, - CONSTRAINT FK_favorite_food_users - FOREIGN KEY (user_id) REFERENCES users (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='선호음식'; - --- 가게 -CREATE TABLE foodmarket ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '가게 id', - name VARCHAR(40) NOT NULL COMMENT '상호명(유니크는 아님)', - address VARCHAR(50) NOT NULL COMMENT '가게주소', - open BOOLEAN NOT NULL COMMENT '영업중 여부', - content VARCHAR(200) NOT NULL COMMENT '가게 소개', - PRIMARY KEY (id), - KEY IDX_foodmarket_name (name) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='푸드 마켓'; - --- 미션(가게별) -CREATE TABLE mission ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 미션 ID', - market_id BIGINT NOT NULL COMMENT '가게 id', - content VARCHAR(100) NOT NULL COMMENT '미션 내용', - mission_point INT NOT NULL COMMENT '미션 포인트', - PRIMARY KEY (id), - KEY IDX_mission_market (market_id), - CONSTRAINT FK_mission_foodmarket - FOREIGN KEY (market_id) REFERENCES foodmarket (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 미션'; - --- 유저가 받은 미션(신규 신청 등) -CREATE TABLE mission_user ( - id BIGINT NOT NULL AUTO_INCREMENT, - mission_id BIGINT NOT NULL COMMENT '미션 ID', - user_id BIGINT NOT NULL COMMENT '유저 ID', - content VARCHAR(200) NOT NULL COMMENT '새 미션에 대한 내용', - PRIMARY KEY (id), - UNIQUE KEY UK_mission_user (mission_id, user_id), - KEY IDX_mission_user_mission (mission_id), - KEY IDX_mission_user_user (user_id), - CONSTRAINT FK_mission_user_mission - FOREIGN KEY (mission_id) REFERENCES mission (id) - ON UPDATE CASCADE ON DELETE CASCADE, - CONSTRAINT FK_mission_user_users - FOREIGN KEY (user_id) REFERENCES users (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='신규 미션 배정 내역'; - --- 미션 권한/배정 토큰(사장님 확인용 번호) -CREATE TABLE permission_mission ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '유저 미션할당번호(제시용)', - user_id BIGINT NOT NULL COMMENT '유저 ID', - mission_id BIGINT NOT NULL COMMENT '미션 ID', - PRIMARY KEY (id), - UNIQUE KEY UK_permission_mission (user_id, mission_id), - KEY IDX_permission_mission_user (user_id), - KEY IDX_permission_mission_mission (mission_id), - CONSTRAINT FK_permission_mission_users - FOREIGN KEY (user_id) REFERENCES users (id) - ON UPDATE CASCADE ON DELETE CASCADE, - CONSTRAINT FK_permission_mission_mission - FOREIGN KEY (mission_id) REFERENCES mission (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='미션 권한 배정'; - --- 리뷰 -CREATE TABLE review ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '리뷰 ID', - user_id BIGINT NOT NULL COMMENT '유저 ID', - market_id BIGINT NOT NULL COMMENT '가게 ID', - content VARCHAR(100) NOT NULL COMMENT '리뷰 내용', - star DECIMAL(2,1) NOT NULL COMMENT '0.0~5.0', - PRIMARY KEY (id), - KEY IDX_review_user (user_id), - KEY IDX_review_market (market_id), - CONSTRAINT CHK_review_star CHECK (star >= 0.0 AND star <= 5.0), - CONSTRAINT FK_review_users - FOREIGN KEY (user_id) REFERENCES users (id) - ON UPDATE CASCADE ON DELETE CASCADE, - CONSTRAINT FK_review_foodmarket - FOREIGN KEY (market_id) REFERENCES foodmarket (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='마켓과 유저 사이의 리뷰'; - --- 리뷰 알림 -CREATE TABLE review_alarm ( - id BIGINT NOT NULL AUTO_INCREMENT, - user_id BIGINT NOT NULL COMMENT '유저 ID', - foodmarket_id BIGINT NOT NULL COMMENT '가게 ID', - content VARCHAR(200) NOT NULL COMMENT '알람 내용(리뷰 관련)', - PRIMARY KEY (id), - KEY IDX_review_alarm_user (user_id), - KEY IDX_review_alarm_market (foodmarket_id), - CONSTRAINT FK_review_alarm_users - FOREIGN KEY (user_id) REFERENCES users (id) - ON UPDATE CASCADE ON DELETE CASCADE, - CONSTRAINT FK_review_alarm_foodmarket - FOREIGN KEY (foodmarket_id) REFERENCES foodmarket (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 알림'; - --- 리뷰 이미지 -CREATE TABLE review_image ( - id BIGINT NOT NULL AUTO_INCREMENT COMMENT '고유 이미지 ID', - review_id BIGINT NOT NULL COMMENT '리뷰 ID', - url VARCHAR(200) NOT NULL COMMENT '이미지 URL', - PRIMARY KEY (id), - KEY IDX_review_image_review (review_id), - CONSTRAINT FK_review_image_review - FOREIGN KEY (review_id) REFERENCES review (id) - ON UPDATE CASCADE ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='리뷰 이미지들'; \ No newline at end of file From 19fac2b29124edaf79dbb327a844cedf2c68874f Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 3 Dec 2025 18:21:45 +0900 Subject: [PATCH 29/30] ad-dto --- .../mission/controller/MissionController.java | 36 ++++-------- .../demo/domain/mission/dto/MissionDtos.java | 57 +++++++------------ .../mission/service/MissionService.java | 39 +++---------- week4/demo/src/main/resources/application.yml | 4 +- 4 files changed, 44 insertions(+), 92 deletions(-) diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java index b89115f..2f3d3be 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/controller/MissionController.java @@ -1,9 +1,9 @@ package com.example.demo.domain.mission.controller; -import com.example.demo.domain.mission.exception.code.MissionSuccessCode; import com.example.demo.domain.mission.dto.MissionDtos; +import com.example.demo.domain.mission.exception.code.MissionSuccessCode; import com.example.demo.domain.mission.service.MissionService; -import com.example.demo.global.apipayload.response.*; +import com.example.demo.global.apipayload.response.ApiResponse; import com.example.demo.global.validation.ValidPage; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -19,64 +19,50 @@ public class MissionController { private final MissionService missionService; - // ========================= - // [1] 가게 미션 등록 (사장/관리자용) - // ========================= @PostMapping("/markets/{marketId}/missions") public ResponseEntity> createMission( @PathVariable Long marketId, - @RequestBody MissionDtos.MissionCreateRequest request + @Valid @RequestBody MissionDtos.MissionCreateRequest request ) { MissionDtos.MissionResponse body = missionService.createMission(marketId, request); return ApiResponse.success(MissionSuccessCode.MISSION_CREATED, body); } - // ========================= - // [2] 가게 미션 목록 조회 - // ========================= @GetMapping("/markets/{marketId}/missions") - public ResponseEntity> getMissionsByMarket( + public ResponseEntity>> getMissionsByMarket( @PathVariable Long marketId, @ValidPage @RequestParam(name = "page", defaultValue = "1") Integer page ) { - MissionDtos.MissionPageResponse body = missionService.getMissionsByMarket(marketId, page); + MissionDtos.PageResponse body = + missionService.getMissionsByMarket(marketId, page); return ApiResponse.success(MissionSuccessCode.MISSION_LIST, body); } - // ========================= - // [3] 유저가 미션 수락 - // ========================= @PostMapping("/missions/accept") public ResponseEntity> acceptMission( - @RequestBody MissionDtos.AcceptRequest request + @Valid @RequestBody MissionDtos.AcceptRequest request ) { MissionDtos.MissionUserResponse body = missionService.acceptMission(request); return ApiResponse.success(MissionSuccessCode.MISSION_ACCEPTED, body); } - // ========================= - // [4] 유저가 미션 완료 - // ========================= @PostMapping("/missions/complete") public ResponseEntity> completeMission( - @RequestBody MissionDtos.CompleteRequest request + @Valid @RequestBody MissionDtos.CompleteRequest request ) { MissionDtos.MissionUserResponse body = missionService.completeMission(request); return ApiResponse.success(MissionSuccessCode.MISSION_COMPLETED, body); } - - @GetMapping("/users/{userId}/missions") - public ResponseEntity> getMyMissions( + public ResponseEntity>> getMyMissions( @PathVariable Long userId, - @Valid @ValidPage + @ValidPage @RequestParam(name = "page", defaultValue = "1") Integer page ) { - MissionDtos.MyMissionPageResponse body = + MissionDtos.PageResponse body = missionService.getMyMissions(userId, page); - return ApiResponse.success(MissionSuccessCode.MISSION_LIST, body); } } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java index 7e5eccd..473a9d8 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/dto/MissionDtos.java @@ -9,12 +9,24 @@ public class MissionDtos { + // 공통 페이지 응답 DTO (제네릭) + @Builder + public record PageResponse( + List content, + int page, + int size, + long totalElements, + int totalPages, + boolean last + ) {} + @Builder public record MissionCreateRequest( String content, Integer missionPoint ) {} + // 미션 기본 정보 (모든 곳에서 재사용) @Builder public record MissionResponse( Long id, @@ -34,17 +46,6 @@ public static MissionResponse from(Mission mission) { } } - // 페이징 응답 DTO (10개씩) - @Builder - public record MissionPageResponse( - List content, - int page, // 현재 페이지 (1-based) - int size, // 페이지 크기 - long totalElements, // 전체 개수 - int totalPages, // 전체 페이지 수 - boolean last // 마지막 페이지 여부 - ) {} - @Builder public record AcceptRequest( Long missionId, @@ -58,10 +59,11 @@ public record CompleteRequest( String content // 인증 내용 ) {} + // 개별 유저-미션 정보 (상세 조회/accept/complete 응답 등에 사용) @Builder public record MissionUserResponse( Long missionUserId, - Long missionId, + MissionResponse mission, // 미션 정보 재사용 Long userId, MissionStatus status, String content @@ -69,44 +71,29 @@ public record MissionUserResponse( public static MissionUserResponse from(MissionUser mu) { return MissionUserResponse.builder() .missionUserId(mu.getId()) - .missionId(mu.getMission().getId()) + .mission(MissionResponse.from(mu.getMission())) .userId(mu.getUser().getId()) .status(mu.getMissionStatus()) .content(mu.getContent()) .build(); } } + + // "내 미션 목록" 한 줄 (리스트용) @Builder public record MyMissionItemResponse( Long missionUserId, - Long missionId, - Long marketId, - String marketName, - String missionContent, - Integer missionPoint, - MissionStatus status + MissionResponse mission, // 동일하게 재사용 + MissionStatus status, + String content ) { public static MyMissionItemResponse from(MissionUser mu) { - Mission mission = mu.getMission(); return MyMissionItemResponse.builder() .missionUserId(mu.getId()) - .missionId(mission.getId()) - .marketId(mission.getMarket().getId()) - .marketName(mission.getMarket().getName()) - .missionContent(mission.getContent()) - .missionPoint(mission.getMissionPoint()) + .mission(MissionResponse.from(mu.getMission())) .status(mu.getMissionStatus()) + .content(mu.getContent()) .build(); } } - @Builder - public record MyMissionPageResponse( - List content, - int page, - int size, - long totalElements, - int totalPages, - boolean last - ) {} - } diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java index e9ab544..a6bfd52 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -28,9 +28,6 @@ public class MissionService { private final UsersRepository usersRepository; private final FoodMarketRepository foodMarketRepository; - // ========================= - // [1] 가게 미션 등록 (사장/관리자용) - // ========================= public MissionDtos.MissionResponse createMission( Long marketId, MissionDtos.MissionCreateRequest request @@ -47,28 +44,23 @@ public MissionDtos.MissionResponse createMission( return MissionDtos.MissionResponse.from(saved); } - // ========================= - // [2] 가게의 미션 리스트 조회 (페이징, 한 페이지 10개) - // - 프론트: page >= 1 - // - JPA: 0-based index → page - 1 - // ========================= - public MissionDtos.MissionPageResponse getMissionsByMarket(Long marketId, int page) { + public MissionDtos.PageResponse getMissionsByMarket(Long marketId, int page) { FoodMarket market = foodMarketRepository.findById(marketId) .orElseThrow(() -> new MissionException(MissionErrorCode.MARKET_NOT_FOUND)); - int pageIndex = page - 1; // 1-based → 0-based 변환 + int pageIndex = page - 1; PageRequest pageable = PageRequest.of(pageIndex, 10); Page missions = missionRepository.findByMarket(market, pageable); - return MissionDtos.MissionPageResponse.builder() + return MissionDtos.PageResponse.builder() .content( missions.getContent() .stream() .map(MissionDtos.MissionResponse::from) .toList() ) - .page(page) // 1-based 그대로 반환 + .page(page) .size(missions.getSize()) .totalElements(missions.getTotalElements()) .totalPages(missions.getTotalPages()) @@ -76,9 +68,6 @@ public MissionDtos.MissionPageResponse getMissionsByMarket(Long marketId, int pa .build(); } - // ========================= - // [3] 유저가 미션 수락 - // ========================= public MissionDtos.MissionUserResponse acceptMission(MissionDtos.AcceptRequest request) { Mission mission = missionRepository.findById(request.missionId()) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); @@ -86,7 +75,6 @@ public MissionDtos.MissionUserResponse acceptMission(MissionDtos.AcceptRequest r Users user = usersRepository.findById(request.userId()) .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); - // 이미 수락/완료한 미션인지 체크 if (missionUserRepository.existsByMissionAndUser(mission, user)) { throw new MissionException(MissionErrorCode.MISSION_ALREADY_ACCEPTED); } @@ -100,9 +88,6 @@ public MissionDtos.MissionUserResponse acceptMission(MissionDtos.AcceptRequest r return MissionDtos.MissionUserResponse.from(saved); } - // ========================= - // [4] 유저가 미션 완료 - // ========================= public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteRequest request) { Mission mission = missionRepository.findById(request.missionId()) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); @@ -117,9 +102,6 @@ public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteReque throw new MissionException(MissionErrorCode.MISSION_ALREADY_COMPLETED); } - // 필요하다면 완료 조건 체크 로직 추가 가능 - // ... - mu.setMissionStatus(MissionStatus.COMPLETED); mu.setContent(request.content()); @@ -127,9 +109,6 @@ public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteReque return MissionDtos.MissionUserResponse.from(updated); } - // ========================= - // [5] (선택) 유저의 특정 미션 상태 조회 - // ========================= public MissionDtos.MissionUserResponse getMissionUser(Long missionId, Long userId) { Mission mission = missionRepository.findById(missionId) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); @@ -142,18 +121,19 @@ public MissionDtos.MissionUserResponse getMissionUser(Long missionId, Long userI return MissionDtos.MissionUserResponse.from(mu); } - public MissionDtos.MyMissionPageResponse getMyMissions(Long userId, int page) { + + public MissionDtos.PageResponse getMyMissions(Long userId, int page) { Users user = usersRepository.findById(userId) .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); - int pageIndex = page - 1; // 1-based → 0-based + int pageIndex = page - 1; PageRequest pageable = PageRequest.of(pageIndex, 10); Page muPage = - missionUserRepository.findByUser_IdOrderByUpdatedAtDesc(userId, pageable); + missionUserRepository.findByUser_IdOrderByUpdatedAtDesc(user.getId(), pageable); - return MissionDtos.MyMissionPageResponse.builder() + return MissionDtos.PageResponse.builder() .content( muPage.getContent().stream() .map(MissionDtos.MyMissionItemResponse::from) @@ -166,5 +146,4 @@ public MissionDtos.MyMissionPageResponse getMyMissions(Long userId, int page) { .last(muPage.isLast()) .build(); } - } diff --git a/week4/demo/src/main/resources/application.yml b/week4/demo/src/main/resources/application.yml index 42c0f79..af2abb9 100644 --- a/week4/demo/src/main/resources/application.yml +++ b/week4/demo/src/main/resources/application.yml @@ -6,11 +6,11 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/market username: root - password: 123qazasd! + password: 9897 jpa: hibernate: - ddl-auto: validate + ddl-auto: create-drop database: mysql database-platform: org.hibernate.dialect.MySQLDialect show-sql: true \ No newline at end of file From 8c978f5562df0dc004cf060f4168c606fb102c54 Mon Sep 17 00:00:00 2001 From: som141 <163431679+som141@users.noreply.github.com> Date: Wed, 3 Dec 2025 18:28:20 +0900 Subject: [PATCH 30/30] d service --- .../demo/domain/mission/service/MissionService.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java index a6bfd52..e740518 100644 --- a/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java +++ b/week4/demo/src/main/java/com/example/demo/domain/mission/service/MissionService.java @@ -109,18 +109,6 @@ public MissionDtos.MissionUserResponse completeMission(MissionDtos.CompleteReque return MissionDtos.MissionUserResponse.from(updated); } - public MissionDtos.MissionUserResponse getMissionUser(Long missionId, Long userId) { - Mission mission = missionRepository.findById(missionId) - .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); - - Users user = usersRepository.findById(userId) - .orElseThrow(() -> new MissionException(MissionErrorCode.USER_NOT_FOUND)); - - MissionUser mu = missionUserRepository.findByMissionAndUser(mission, user) - .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_ACCEPTED)); - - return MissionDtos.MissionUserResponse.from(mu); - } public MissionDtos.PageResponse getMyMissions(Long userId, int page) {