From 0526d509778afe64e805e56da34d8018862f477a Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 14:28:35 +0900 Subject: [PATCH 01/21] =?UTF-8?q?test/#360=20:=20=EB=B0=98=EB=B3=B5=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=9C=84=ED=95=B4=20testData.sql=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EC=9D=98=20CURRENT=5FTIMESTAMP=20=EC=9D=98?= =?UTF-8?q?=EC=A1=B4=EC=84=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/exceed/src/main/resources/db/testData.sql | 283 +++++++++---------- 1 file changed, 141 insertions(+), 142 deletions(-) diff --git a/BE/exceed/src/main/resources/db/testData.sql b/BE/exceed/src/main/resources/db/testData.sql index 96d9c9d8d..820ae2c67 100644 --- a/BE/exceed/src/main/resources/db/testData.sql +++ b/BE/exceed/src/main/resources/db/testData.sql @@ -90,148 +90,147 @@ VALUES (1, 200.0, 30.0, 10.0, '사과', 2.0, 120.0, 3.1, 2.3,500, null), INSERT INTO MEAL_TB (MEAL_PK, CREATED_DATE, UPDATED_DATE, MEAL_TYPE, MEMBER_FK) VALUES - (1, TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (2, TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), 'LUNCH', 1), - (3, TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (4, TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), 'LUNCH', 1), - (5, TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (6, TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), 'LUNCH', 1), - (7, TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (8, TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), 'LUNCH', 1), - (9, TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (10, TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), 'LUNCH', 1), - (11, TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (12, TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), 'LUNCH', 1), - (13, TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (14, TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), 'LUNCH', 1), - (15, TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (16, TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), 'LUNCH', 1), - (17, TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (18, TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), 'LUNCH', 1), - (19, TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (20, TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), 'LUNCH', 1), - (21, TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (22, TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), 'LUNCH', 1), - (23, TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (24, TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), 'LUNCH', 1), - (25, TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (26, TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), 'LUNCH', 1), - (27, TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (28, TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), 'LUNCH', 1), - (29, TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (30, TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), 'LUNCH', 1), - (31, TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (32, TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), 'LUNCH', 1), - (33, TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (34, TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), 'LUNCH', 1), - (35, TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (36, TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), 'LUNCH', 1), - (37, TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (38, TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), 'LUNCH', 1), - (39, TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (40, TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), 'LUNCH', 1), - (41, TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (42, TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), 'LUNCH', 1), - (43, TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (44, TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), 'LUNCH', 1), - (45, TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (46, TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), 'LUNCH', 1), - (47, TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (48, TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), 'LUNCH', 1), - (49, TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (50, TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), 'LUNCH', 1), - (51, TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (52, TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), 'LUNCH', 1), - (53, TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (54, TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), 'LUNCH', 1), - (55, TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (56, TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), 'LUNCH', 1), - (57, TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), 'LUNCH', 1), - (58, TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), 'DINNER', 1), - (59, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 'SNACK', 1), - (60, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 'LUNCH', 1), - (61, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 'DINNER', 1), - (62, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (63, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 'SNACK', 1), - (64, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 'DINNER', 1), - (65, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (66, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 'LUNCH', 1), - (67, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 'DINNER', 1), - (68, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 'BREAKFAST', 1), - (69, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 'LUNCH', 1); - - + (1, '2024-06-04 00:00:00', '2024-06-04 00:00:00', 'BREAKFAST', 1), + (2, '2024-06-04 00:00:00', '2024-06-04 00:00:00', 'LUNCH', 1), + (3, '2024-06-05 00:00:00', '2024-06-05 00:00:00', 'BREAKFAST', 1), + (4, '2024-06-05 00:00:00', '2024-06-05 00:00:00', 'LUNCH', 1), + (5, '2024-06-06 00:00:00', '2024-06-06 00:00:00', 'BREAKFAST', 1), + (6, '2024-06-06 00:00:00', '2024-06-06 00:00:00', 'LUNCH', 1), + (7, '2024-06-07 00:00:00', '2024-06-07 00:00:00', 'BREAKFAST', 1), + (8, '2024-06-07 00:00:00', '2024-06-07 00:00:00', 'LUNCH', 1), + (9, '2024-06-08 00:00:00', '2024-06-08 00:00:00', 'BREAKFAST', 1), + (10, '2024-06-08 00:00:00', '2024-06-08 00:00:00', 'LUNCH', 1), + (11, '2024-06-09 00:00:00', '2024-06-09 00:00:00', 'BREAKFAST', 1), + (12, '2024-06-09 00:00:00', '2024-06-09 00:00:00', 'LUNCH', 1), + (13, '2024-06-10 00:00:00', '2024-06-10 00:00:00', 'BREAKFAST', 1), + (14, '2024-06-10 00:00:00', '2024-06-10 00:00:00', 'LUNCH', 1), + (15, '2024-06-11 00:00:00', '2024-06-11 00:00:00', 'BREAKFAST', 1), + (16, '2024-06-11 00:00:00', '2024-06-11 00:00:00', 'LUNCH', 1), + (17, '2024-06-12 00:00:00', '2024-06-12 00:00:00', 'BREAKFAST', 1), + (18, '2024-06-12 00:00:00', '2024-06-12 00:00:00', 'LUNCH', 1), + (19, '2024-06-13 00:00:00', '2024-06-13 00:00:00', 'BREAKFAST', 1), + (20, '2024-06-13 00:00:00', '2024-06-13 00:00:00', 'LUNCH', 1), + (21, '2024-06-14 00:00:00', '2024-06-14 00:00:00', 'BREAKFAST', 1), + (22, '2024-06-14 00:00:00', '2024-06-14 00:00:00', 'LUNCH', 1), + (23, '2024-06-15 00:00:00', '2024-06-15 00:00:00', 'BREAKFAST', 1), + (24, '2024-06-15 00:00:00', '2024-06-15 00:00:00', 'LUNCH', 1), + (25, '2024-06-16 00:00:00', '2024-06-16 00:00:00', 'BREAKFAST', 1), + (26, '2024-06-16 00:00:00', '2024-06-16 00:00:00', 'LUNCH', 1), + (27, '2024-06-17 00:00:00', '2024-06-17 00:00:00', 'BREAKFAST', 1), + (28, '2024-06-17 00:00:00', '2024-06-17 00:00:00', 'LUNCH', 1), + (29, '2024-06-18 00:00:00', '2024-06-18 00:00:00', 'BREAKFAST', 1), + (30, '2024-06-18 00:00:00', '2024-06-18 00:00:00', 'LUNCH', 1), + (31, '2024-06-19 00:00:00', '2024-06-19 00:00:00', 'BREAKFAST', 1), + (32, '2024-06-19 00:00:00', '2024-06-19 00:00:00', 'LUNCH', 1), + (33, '2024-06-20 00:00:00', '2024-06-20 00:00:00', 'BREAKFAST', 1), + (34, '2024-06-20 00:00:00', '2024-06-20 00:00:00', 'LUNCH', 1), + (35, '2024-06-21 00:00:00', '2024-06-21 00:00:00', 'BREAKFAST', 1), + (36, '2024-06-21 00:00:00', '2024-06-21 00:00:00', 'LUNCH', 1), + (37, '2024-06-22 00:00:00', '2024-06-22 00:00:00', 'BREAKFAST', 1), + (38, '2024-06-22 00:00:00', '2024-06-22 00:00:00', 'LUNCH', 1), + (39, '2024-06-23 00:00:00', '2024-06-23 00:00:00', 'BREAKFAST', 1), + (40, '2024-06-23 00:00:00', '2024-06-23 00:00:00', 'LUNCH', 1), + (41, '2024-06-24 00:00:00', '2024-06-24 00:00:00', 'BREAKFAST', 1), + (42, '2024-06-24 00:00:00', '2024-06-24 00:00:00', 'LUNCH', 1), + (43, '2024-06-25 00:00:00', '2024-06-25 00:00:00', 'BREAKFAST', 1), + (44, '2024-06-25 00:00:00', '2024-06-25 00:00:00', 'LUNCH', 1), + (45, '2024-06-26 00:00:00', '2024-06-26 00:00:00', 'BREAKFAST', 1), + (46, '2024-06-26 00:00:00', '2024-06-26 00:00:00', 'LUNCH', 1), + (47, '2024-06-27 00:00:00', '2024-06-27 00:00:00', 'BREAKFAST', 1), + (48, '2024-06-27 00:00:00', '2024-06-27 00:00:00', 'LUNCH', 1), + (49, '2024-06-28 00:00:00', '2024-06-28 00:00:00', 'BREAKFAST', 1), + (50, '2024-06-28 00:00:00', '2024-06-28 00:00:00', 'LUNCH', 1), + (51, '2024-06-29 00:00:00', '2024-06-29 00:00:00', 'BREAKFAST', 1), + (52, '2024-06-29 00:00:00', '2024-06-29 00:00:00', 'LUNCH', 1), + (53, '2024-06-30 00:00:00', '2024-06-30 00:00:00', 'BREAKFAST', 1), + (54, '2024-06-30 00:00:00', '2024-06-30 00:00:00', 'LUNCH', 1), + (55, '2024-07-01 00:00:00', '2024-07-01 00:00:00', 'BREAKFAST', 1), + (56, '2024-07-01 00:00:00', '2024-07-01 00:00:00', 'LUNCH', 1), + (57, '2024-07-02 00:00:00', '2024-07-02 00:00:00', 'LUNCH', 1), + (58, '2024-07-02 00:00:00', '2024-07-02 00:00:00', 'DINNER', 1), + (59, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 'SNACK', 1), + (60, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 'LUNCH', 1), + (61, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 'DINNER', 1), + (62, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 'BREAKFAST', 1), + (63, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 'SNACK', 1), + (64, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 'DINNER', 1), + (65, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 'BREAKFAST', 1), + (66, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 'LUNCH', 1), + (67, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 'DINNER', 1), + (68, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 'BREAKFAST', 1), + (69, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 'LUNCH', 1); INSERT INTO MEAL_FOOD_TB (MEAL_FOOD_PK, CREATED_DATE, UPDATED_DATE, FOOD_FK, MEAL_FK, MEAL_FOOD_MULTIPLE, MEAL_FOOD_G) VALUES - (1, TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), 1, 1, 1.0, null), - (2, TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -32, CURRENT_TIMESTAMP), 2, 2, null, 200), - (3, TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), 3, 3, 1.5, null), - (4, TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -31, CURRENT_TIMESTAMP), 4, 4, null, 150), - (5, TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), 5, 5, 2.0, null), - (6, TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -30, CURRENT_TIMESTAMP), 6, 6, null, 100), - (7, TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), 7, 7, 0.5, null), - (8, TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -29, CURRENT_TIMESTAMP), 8, 8, null, 250), - (9, TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), 9, 9, 1.2, null), - (10, TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -28, CURRENT_TIMESTAMP), 10, 10, null, 180), - (11, TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), 11, 11, 1.3, null), - (12, TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -27, CURRENT_TIMESTAMP), 12, 12, null, 170), - (13, TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), 12, 13, 1.1, null), - (14, TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -26, CURRENT_TIMESTAMP), 1, 14, null, 210), - (15, TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), 2, 15, 1.4, null), - (16, TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -25, CURRENT_TIMESTAMP), 3, 16, null, 160), - (17, TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), 4, 17, 1.6, null), - (18, TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -24, CURRENT_TIMESTAMP), 5, 18, null, 140), - (19, TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), 6, 19, 1.8, null), - (20, TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -23, CURRENT_TIMESTAMP), 7, 20, null, 120), - (21, TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), 8, 21, 2.0, null), - (22, TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -22, CURRENT_TIMESTAMP), 9, 22, null, 110), - (23, TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), 10, 23, 0.8, null), - (24, TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -21, CURRENT_TIMESTAMP), 11, 24, null, 190), - (25, TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), 12, 25, 1.7, null), - (26, TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -20, CURRENT_TIMESTAMP), 12, 26, null, 130), - (27, TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), 1, 27, 1.2, null), - (28, TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -19, CURRENT_TIMESTAMP), 2, 28, null, 200), - (29, TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), 3, 29, 1.5, null), - (30, TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -18, CURRENT_TIMESTAMP), 4, 30, null, 150), - (31, TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), 5, 31, 2.0, null), - (32, TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -17, CURRENT_TIMESTAMP), 6, 32, null, 100), - (33, TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), 7, 33, 0.5, null), - (34, TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -16, CURRENT_TIMESTAMP), 8, 34, null, 250), - (35, TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), 9, 35, 1.2, null), - (36, TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -15, CURRENT_TIMESTAMP), 10, 36, null, 180), - (37, TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), 11, 37, 1.3, null), - (38, TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -14, CURRENT_TIMESTAMP), 12, 38, null, 170), - (39, TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), 12, 39, 1.1, null), - (40, TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -13, CURRENT_TIMESTAMP), 1, 40, null, 210), - (41, TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), 2, 41, 1.4, null), - (42, TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -12, CURRENT_TIMESTAMP), 3, 42, null, 160), - (43, TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), 4, 43, 1.6, null), - (44, TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -11, CURRENT_TIMESTAMP), 5, 44, null, 140), - (45, TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), 6, 45, 1.8, null), - (46, TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -10, CURRENT_TIMESTAMP), 7, 46, null, 120), - (47, TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), 8, 47, 2.0, null), - (48, TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -9, CURRENT_TIMESTAMP), 9, 48, null, 110), - (49, TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), 10, 49, 0.8, null), - (50, TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -8, CURRENT_TIMESTAMP), 11, 50, null, 190), - (51, TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), 12, 51, 1.7, null), - (52, TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -7, CURRENT_TIMESTAMP), 12, 52, null, 130), - (53, TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), 1, 53, 1.2, null), - (54, TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -6, CURRENT_TIMESTAMP), 2, 54, null, 200), - (55, TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), 3, 55, 1.5, null), - (56, TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -5, CURRENT_TIMESTAMP), 4, 56, null, 150), - (57, TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), 5, 57, 2.0, null), - (58, TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -4, CURRENT_TIMESTAMP), 6, 58, null, 100), - (59, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 7, 59, 0.5, null), - (60, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 8, 60, null, 250), - (61, TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -3, CURRENT_TIMESTAMP), 9, 61, 1.2, null), - (62, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 10, 62, null, 8), - (63, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 11, 63, 0.3, null), - (64, TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -2, CURRENT_TIMESTAMP), 12, 64, null, 7), - (65, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 12, 65, 1.1, null), - (66, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 1, 66, null, 210), - (67, TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, -1, CURRENT_TIMESTAMP), 2, 67, 1.4, null), - (68, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 3, 68, null, 160), - (69, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 4, 69, 1.6, null), - (70, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 5, 69, null, 140), - (71, TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), TIMESTAMPADD(DAY, 0, CURRENT_TIMESTAMP), 6, 69, 1.8, null); + (1, '2024-06-04 00:00:00', '2024-06-04 00:00:00', 1, 1, 1.0, null), + (2, '2024-06-04 00:00:00', '2024-06-04 00:00:00', 2, 2, null, 200), + (3, '2024-06-05 00:00:00', '2024-06-05 00:00:00', 3, 3, 1.5, null), + (4, '2024-06-05 00:00:00', '2024-06-05 00:00:00', 4, 4, null, 150), + (5, '2024-06-06 00:00:00', '2024-06-06 00:00:00', 5, 5, 2.0, null), + (6, '2024-06-06 00:00:00', '2024-06-06 00:00:00', 6, 6, null, 100), + (7, '2024-06-07 00:00:00', '2024-06-07 00:00:00', 7, 7, 0.5, null), + (8, '2024-06-07 00:00:00', '2024-06-07 00:00:00', 8, 8, null, 250), + (9, '2024-06-08 00:00:00', '2024-06-08 00:00:00', 9, 9, 1.2, null), + (10, '2024-06-08 00:00:00', '2024-06-08 00:00:00', 10, 10, null, 180), + (11, '2024-06-09 00:00:00', '2024-06-09 00:00:00', 11, 11, 1.3, null), + (12, '2024-06-09 00:00:00', '2024-06-09 00:00:00', 12, 12, null, 170), + (13, '2024-06-10 00:00:00', '2024-06-10 00:00:00', 12, 13, 1.1, null), + (14, '2024-06-10 00:00:00', '2024-06-10 00:00:00', 1, 14, null, 210), + (15, '2024-06-11 00:00:00', '2024-06-11 00:00:00', 2, 15, 1.4, null), + (16, '2024-06-11 00:00:00', '2024-06-11 00:00:00', 3, 16, null, 160), + (17, '2024-06-12 00:00:00', '2024-06-12 00:00:00', 4, 17, 1.6, null), + (18, '2024-06-12 00:00:00', '2024-06-12 00:00:00', 5, 18, null, 140), + (19, '2024-06-13 00:00:00', '2024-06-13 00:00:00', 6, 19, 1.8, null), + (20, '2024-06-13 00:00:00', '2024-06-13 00:00:00', 7, 20, null, 120), + (21, '2024-06-14 00:00:00', '2024-06-14 00:00:00', 8, 21, 2.0, null), + (22, '2024-06-14 00:00:00', '2024-06-14 00:00:00', 9, 22, null, 110), + (23, '2024-06-15 00:00:00', '2024-06-15 00:00:00', 10, 23, 0.8, null), + (24, '2024-06-15 00:00:00', '2024-06-15 00:00:00', 11, 24, null, 190), + (25, '2024-06-16 00:00:00', '2024-06-16 00:00:00', 12, 25, 1.7, null), + (26, '2024-06-16 00:00:00', '2024-06-16 00:00:00', 12, 26, null, 130), + (27, '2024-06-17 00:00:00', '2024-06-17 00:00:00', 1, 27, 1.2, null), + (28, '2024-06-17 00:00:00', '2024-06-17 00:00:00', 2, 28, null, 200), + (29, '2024-06-18 00:00:00', '2024-06-18 00:00:00', 3, 29, 1.5, null), + (30, '2024-06-18 00:00:00', '2024-06-18 00:00:00', 4, 30, null, 150), + (31, '2024-06-19 00:00:00', '2024-06-19 00:00:00', 5, 31, 2.0, null), + (32, '2024-06-19 00:00:00', '2024-06-19 00:00:00', 6, 32, null, 100), + (33, '2024-06-20 00:00:00', '2024-06-20 00:00:00', 7, 33, 0.5, null), + (34, '2024-06-20 00:00:00', '2024-06-20 00:00:00', 8, 34, null, 250), + (35, '2024-06-21 00:00:00', '2024-06-21 00:00:00', 9, 35, 1.2, null), + (36, '2024-06-21 00:00:00', '2024-06-21 00:00:00', 10, 36, null, 180), + (37, '2024-06-22 00:00:00', '2024-06-22 00:00:00', 11, 37, 1.3, null), + (38, '2024-06-22 00:00:00', '2024-06-22 00:00:00', 12, 38, null, 170), + (39, '2024-06-23 00:00:00', '2024-06-23 00:00:00', 12, 39, 1.1, null), + (40, '2024-06-23 00:00:00', '2024-06-23 00:00:00', 1, 40, null, 210), + (41, '2024-06-24 00:00:00', '2024-06-24 00:00:00', 2, 41, 1.4, null), + (42, '2024-06-24 00:00:00', '2024-06-24 00:00:00', 3, 42, null, 160), + (43, '2024-06-25 00:00:00', '2024-06-25 00:00:00', 4, 43, 1.6, null), + (44, '2024-06-25 00:00:00', '2024-06-25 00:00:00', 5, 44, null, 140), + (45, '2024-06-26 00:00:00', '2024-06-26 00:00:00', 6, 45, 1.8, null), + (46, '2024-06-26 00:00:00', '2024-06-26 00:00:00', 7, 46, null, 120), + (47, '2024-06-27 00:00:00', '2024-06-27 00:00:00', 8, 47, 2.0, null), + (48, '2024-06-27 00:00:00', '2024-06-27 00:00:00', 9, 48, null, 110), + (49, '2024-06-28 00:00:00', '2024-06-28 00:00:00', 10, 49, 0.8, null), + (50, '2024-06-28 00:00:00', '2024-06-28 00:00:00', 11, 50, null, 190), + (51, '2024-06-29 00:00:00', '2024-06-29 00:00:00', 12, 51, 1.7, null), + (52, '2024-06-29 00:00:00', '2024-06-29 00:00:00', 12, 52, null, 130), + (53, '2024-06-30 00:00:00', '2024-06-30 00:00:00', 1, 53, 1.2, null), + (54, '2024-06-30 00:00:00', '2024-06-30 00:00:00', 2, 54, null, 200), + (55, '2024-07-01 00:00:00', '2024-07-01 00:00:00', 3, 55, 1.5, null), + (56, '2024-07-01 00:00:00', '2024-07-01 00:00:00', 4, 56, null, 150), + (57, '2024-07-02 00:00:00', '2024-07-02 00:00:00', 5, 57, 2.0, null), + (58, '2024-07-02 00:00:00', '2024-07-02 00:00:00', 6, 58, null, 100), + (59, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 7, 59, 0.5, null), + (60, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 8, 60, null, 250), + (61, '2024-07-03 00:00:00', '2024-07-03 00:00:00', 9, 61, 1.2, null), + (62, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 10, 62, null, 8), + (63, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 11, 63, 0.3, null), + (64, '2024-07-04 00:00:00', '2024-07-04 00:00:00', 12, 64, null, 7), + (65, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 12, 65, 1.1, null), + (66, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 1, 66, null, 210), + (67, '2024-07-05 00:00:00', '2024-07-05 00:00:00', 2, 67, 1.4, null), + (68, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 3, 68, null, 160), + (69, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 4, 69, 1.6, null), + (70, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 5, 69, null, 140), + (71, '2024-07-06 00:00:00', '2024-07-06 00:00:00', 6, 69, 1.8, null); + From a64b4afd84a6d4e5fa4698286d738ee75154fc30 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 14:29:19 +0900 Subject: [PATCH 02/21] =?UTF-8?q?test/#360=20:=20testData=EA=B0=80=20?= =?UTF-8?q?=ED=8A=B9=EC=A0=95=20=EB=82=A0=EC=A7=9C=EB=A5=BC=20=EB=82=98?= =?UTF-8?q?=ED=83=80=EB=82=B4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exceed/meal/adapter/SpecificMealIntegrationTest.java | 4 ++-- .../exceed/nutritionist/GetAchieveIntegrationTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/meal/adapter/SpecificMealIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/meal/adapter/SpecificMealIntegrationTest.java index 41ddee3ed..1448965e1 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/meal/adapter/SpecificMealIntegrationTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/meal/adapter/SpecificMealIntegrationTest.java @@ -115,7 +115,7 @@ void getMeal() throws Exception { @WithMockUser void getMealFood() throws Exception { - LocalDate testDate = LocalDate.now().minusDays(5); + LocalDate testData = LocalDate.of(2024, 6, 6); given(getPresignedUrlPort.query(any(Long.class), any(Long.class))) .willReturn("http://test.com/test.jpeg"); @@ -123,7 +123,7 @@ void getMealFood() throws Exception { // when ResultActions resultActions = mockMvc.perform( - RestDocumentationRequestBuilders.get("/v1/meal/" + testDate) + RestDocumentationRequestBuilders.get("/v1/meal/" + testData) .contentType(MediaType.APPLICATION_JSON)); String responseBody = resultActions.andReturn().getResponse().getContentAsString(); diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/nutritionist/GetAchieveIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/nutritionist/GetAchieveIntegrationTest.java index 12cc3e69d..88ca9230e 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/nutritionist/GetAchieveIntegrationTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/nutritionist/GetAchieveIntegrationTest.java @@ -26,7 +26,7 @@ public class GetAchieveIntegrationTest extends IntegrationTest { @WithMockUser void getAchieves() throws Exception { // given - LocalDate testData = LocalDate.now(); + LocalDate testData = LocalDate.of(2024, 6, 6); // when ResultActions resultActions = From 08300c909ce587790c3c02547c52a09170b1113b Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 14:29:42 +0900 Subject: [PATCH 03/21] =?UTF-8?q?test/#360=20:=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=EB=90=9C=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/exceed/build.gradle | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/BE/exceed/build.gradle b/BE/exceed/build.gradle index bcfb96657..f0057489f 100644 --- a/BE/exceed/build.gradle +++ b/BE/exceed/build.gradle @@ -58,7 +58,6 @@ dependencies { testImplementation "org.testcontainers:mariadb:1.19.8" testImplementation "org.testcontainers:testcontainers:1.19.8" testImplementation "org.testcontainers:junit-jupiter:1.19.8" - testImplementation "org.junit.jupiter:junit-jupiter:5.8.1" // querydsl @@ -213,7 +212,7 @@ jacocoTestReport { classDirectories.setFrom( files(classDirectories.files.collect{ fileTree(dir: it, excludes: [ - "**/*Application", + "**/ExceedApplication", "**/*Config*", "**/*Request*", "**/*Response*", @@ -222,7 +221,12 @@ jacocoTestReport { "**/*Docs*", "**/*DTO*", "**/common/**", - "**/health/**" + "**/health/**", + "**/*Error*", + "**/*Adapter*", + "**/*Port*", + "**/*Converter*", + "**/Q*" ]) }) ) From 1ba19f89800929508597c15d694037487e22feb2 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 14:30:17 +0900 Subject: [PATCH 04/21] =?UTF-8?q?refactor/#360=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../out/persistence/custom/CustomMemberRepositoryImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/out/persistence/custom/CustomMemberRepositoryImpl.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/out/persistence/custom/CustomMemberRepositoryImpl.java index d349b9b9b..66e831957 100644 --- a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/out/persistence/custom/CustomMemberRepositoryImpl.java +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/out/persistence/custom/CustomMemberRepositoryImpl.java @@ -5,8 +5,6 @@ import java.time.LocalDateTime; import java.util.Optional; -import javax.persistence.EntityManager; - import org.springframework.stereotype.Repository; import com.gaebaljip.exceed.member.adapter.out.persistence.MemberEntity; @@ -19,7 +17,7 @@ @Repository @RequiredArgsConstructor public class CustomMemberRepositoryImpl implements CustomMemberRepository { - private final EntityManager em; + private final JPAQueryFactory queryFactory; @Override From 479d14c3850eb60d6e78dc0ff838ed87534f64bd Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 14:30:44 +0900 Subject: [PATCH 05/21] =?UTF-8?q?test/#360=20:=20ValidateEmailService=20?= =?UTF-8?q?=EB=8B=A8=EC=9C=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/ValidateEmailServiceTest.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java new file mode 100644 index 000000000..d7b8bc5eb --- /dev/null +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java @@ -0,0 +1,66 @@ +package com.gaebaljip.exceed.member.application; + +import static org.mockito.BDDMockito.*; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import com.gaebaljip.exceed.member.application.port.in.ValidateEmailCommand; +import com.gaebaljip.exceed.member.application.port.out.MemberPort; +import com.gaebaljip.exceed.member.exception.AlreadySignUpMemberException; + +@ExtendWith(MockitoExtension.class) +class ValidateEmailServiceTest { + + @Mock private MemberPort memberPort; + @InjectMocks private ValidateEmailService validateEmailService; + + @Test + @DisplayName("이메일이 존재하지 않고, 이메일 인증을 수행하지 않았을 경우") + void when_NotExistEmail_IsNotChecked_then_Void() { + + // given + given(memberPort.existsByEmail(anyString())).willReturn(false); + given(memberPort.isChecked(anyString())).willReturn(false); + ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); + + // when, then + Assertions.assertDoesNotThrow(() -> validateEmailService.execute(command)); + } + + @Test + @DisplayName("이메일이 존재하면, 예외가 발생해야 한다") + void when_ExistEmail_IsNotChecked_then_Exception() { + + // given + given(memberPort.existsByEmail(anyString())).willReturn(true); + ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); + + // when, then + Assertions.assertThrows( + AlreadySignUpMemberException.class, () -> validateEmailService.execute(command)); + } + + @Test + @DisplayName("이메일이 존재하지 않지만, 이메일 인증을 수행했을 경우 예외가 발생해야 한다") + void when_NotExistEmail_IsChecked_then_Exception() { + + // given + given(memberPort.existsByEmail(anyString())).willReturn(false); + given(memberPort.isChecked(anyString())).willReturn(true); + ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); + + // when, then + Assertions.assertThrows( + AlreadySignUpMemberException.class, () -> validateEmailService.execute(command)); + } + + private String getEmail() { + return "asadf1234!!@gmail.com"; + } +} From bfd9d80aab2b6fb3a6123d5e6e804bd7ba9bd6d9 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sat, 6 Jul 2024 15:49:27 +0900 Subject: [PATCH 06/21] =?UTF-8?q?test/#360=20:=20CreateMemberService=20?= =?UTF-8?q?=EB=8B=A8=EC=9C=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/CreateMemberServiceTest.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/CreateMemberServiceTest.java diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/CreateMemberServiceTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/CreateMemberServiceTest.java new file mode 100644 index 000000000..e4a1d8629 --- /dev/null +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/CreateMemberServiceTest.java @@ -0,0 +1,69 @@ +package com.gaebaljip.exceed.member.application; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verify; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +import com.gaebaljip.exceed.dto.request.SignUpMemberRequest; +import com.gaebaljip.exceed.member.adapter.out.persistence.MemberEntity; +import com.gaebaljip.exceed.member.application.port.out.MemberPort; +import com.gaebaljip.exceed.member.exception.AlreadyEmailException; + +@ExtendWith(MockitoExtension.class) +class CreateMemberServiceTest { + + @Mock private MemberPort memberPort; + @Mock private BCryptPasswordEncoder bCryptPasswordEncoder; + + @InjectMocks private CreateMemberService createMemberService; + + @Test + @DisplayName( + "이메일이 존재하면, memberPort.command()가 호출되어야 한다" + + "bCryptPasswordEncoder.encode()가 호출되어야한다.") + void when_NotExistEmail_then_CreateMember() { + // given + SignUpMemberRequest signUpMemberRequest = + new SignUpMemberRequest(getEmail(), getPassword()); + given(memberPort.existsByEmail(anyString())).willReturn(false); + + // when + createMemberService.execute(signUpMemberRequest); + + // then + verify(memberPort).command(any(MemberEntity.class)); + verify(bCryptPasswordEncoder).encode(anyString()); + } + + @Test + @DisplayName("이메일이 존재하면, 예외가 발생해야 한다") + void when_ExistEmail_then_Exception() { + // given + SignUpMemberRequest signUpMemberRequest = + new SignUpMemberRequest(getEmail(), getPassword()); + given(memberPort.existsByEmail(anyString())).willReturn(true); + + // when, then + Assertions.assertThrows( + AlreadyEmailException.class, + () -> createMemberService.execute(signUpMemberRequest)); + } + + private String getEmail() { + return "abcd123!@gmail.com"; + } + + private String getPassword() { + return "password123@@"; + } +} From e8ecf9b5ecb0e4beec7dc1577a29baebc9f90901 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:14:24 +0900 Subject: [PATCH 07/21] refactor/#360 : HttpStatus.CREATED -> HttpStatus.OK --- .../exceed/member/adapter/in/OnBoardingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingController.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingController.java index 9ce7e2053..b11d05d14 100644 --- a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingController.java +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingController.java @@ -41,6 +41,6 @@ public ApiResponse> onBoardingMember( @Parameter(hidden = true) @AuthenticationMemberId Long memberId) { OnBoardingMemberCommand command = OnBoardingMemberCommand.of(memberId, request); onBoardingMemberUsecase.execute(command); - return ApiResponseGenerator.success(HttpStatus.CREATED); + return ApiResponseGenerator.success(HttpStatus.OK); } } From 6d17096e950bb95d484f90d78db4f6682cfb8b91 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:15:53 +0900 Subject: [PATCH 08/21] =?UTF-8?q?refactor/#360=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=86=B5=ED=95=A9=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OnBoardingMemberIntegrationTest.java | 56 +++++++++++-------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java index 4b0d47f85..e03a05711 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java @@ -2,11 +2,11 @@ import static com.gaebaljip.exceed.common.util.ApiDocumentUtil.getDocumentRequest; import static com.gaebaljip.exceed.common.util.ApiDocumentUtil.getDocumentResponse; +import static org.junit.jupiter.api.Assertions.assertAll; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,6 @@ import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.transaction.annotation.Transactional; import com.gaebaljip.exceed.common.IntegrationTest; import com.gaebaljip.exceed.common.WithMockUser; @@ -27,23 +26,15 @@ class OnBoardingMemberIntegrationTest extends IntegrationTest { @Autowired private MemberRepository memberRepository; @Test - @WithMockUser(memberId = 2) - @Transactional - void onBoarding() throws Exception { + @WithMockUser(memberId = 11) + void when_onBoarding_expect_UpdatedMember() throws Exception { // given - MemberEntity memberEntity = - MemberEntity.builder() - .email("aaa@naver.com") - .password("aaaa1234@@") - .checked(false) - .build(); - memberRepository.save(memberEntity); // memberId = 2인 member 생성 + MemberEntity memberEntity = getMemberEntity(); + memberRepository.save(memberEntity); // memberId = 11인 member 생성 // when - OnBoardingMemberRequest request = - new OnBoardingMemberRequest( - 171.0, "MALE", 61.0, 65.0, 26, "NOT_ACTIVE", "뭐든 잘 먹습니다."); + OnBoardingMemberRequest request = getOnBoardingMemberRequest(); ResultActions resultActions = mockMvc.perform( @@ -52,15 +43,19 @@ void onBoarding() throws Exception { .contentType(MediaType.APPLICATION_JSON)); // then - double height = memberRepository.findById(2L).get().getHeight(); - MemberEntity memberEntity1 = memberRepository.findById(2L).get(); - Double weight = memberEntity1.getWeight(); - Assertions.assertThat(weight).isEqualTo(61.0); - Assertions.assertThat(height).isEqualTo(171.0); - resultActions.andExpect(status().isCreated()); + MemberEntity member = memberRepository.findById(11L).get(); + Double height = member.getHeight(); + Double weight = member.getWeight(); + + assertAll( + () -> { + Assertions.assertThat(weight).isEqualTo(request.weight()); + Assertions.assertThat(height).isEqualTo(request.height()); + }); + resultActions - .andExpect(status().isCreated()) + .andExpect(status().isOk()) .andDo( document( "onBoarding-success", @@ -96,4 +91,21 @@ void onBoarding() throws Exception { .type(JsonFieldType.STRING) .description("기타")))); } + + private OnBoardingMemberRequest getOnBoardingMemberRequest() { + OnBoardingMemberRequest request = + new OnBoardingMemberRequest( + 171.0, "MALE", 61.0, 65.0, 26, "NOT_ACTIVE", "뭐든 잘 먹습니다."); + return request; + } + + private MemberEntity getMemberEntity() { + MemberEntity memberEntity = + MemberEntity.builder() + .email("aaa@naver.com") + .password("aaaa1234@@") + .checked(false) + .build(); + return memberEntity; + } } From ce8c0887f078caebd7c0a5796a23e90871adef29 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:18:01 +0900 Subject: [PATCH 09/21] refactor/#360 : HttpStatus.OK -> HttpStatus.CREATED --- .../adapter/in/SignUpMemberController.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/SignUpMemberController.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/SignUpMemberController.java index a1b713842..abcef3982 100644 --- a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/SignUpMemberController.java +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/SignUpMemberController.java @@ -9,7 +9,6 @@ import com.gaebaljip.exceed.common.ApiResponse.CustomBody; import com.gaebaljip.exceed.common.ApiResponseGenerator; import com.gaebaljip.exceed.common.swagger.ApiErrorExceptionsExample; -import com.gaebaljip.exceed.dto.request.CheckMemberRequest; import com.gaebaljip.exceed.dto.request.SignUpMemberRequest; import com.gaebaljip.exceed.member.application.port.in.*; import com.gaebaljip.exceed.member.docs.SignUpMemberExceptionDocs; @@ -29,8 +28,6 @@ public class SignUpMemberController { private final ValidateEmailUsecase validateEmailUsecase; private final SendEmailUsecase sendEmailUsecase; private final CreateMemberUsecase createMemberUsecase; - private final CheckCodeUsecase checkCodeUsecase; - private final VerifyEmailCheckedUsecase verifyEmailCheckedUsecase; @Operation(summary = "회원 가입", description = "회원 가입한다.") @PostMapping("/members") @@ -40,21 +37,6 @@ public ApiResponse> signUpMember( validateEmailUsecase.execute(new ValidateEmailCommand(signUpMemberRequest.email())); sendEmailUsecase.execute(new SendEmailCommand(signUpMemberRequest.email())); createMemberUsecase.execute(signUpMemberRequest); - return ApiResponseGenerator.success(HttpStatus.OK); - } - - @GetMapping("/members/checked") - public ApiResponse> checkMemberEmail( - @ModelAttribute @Valid CheckMemberRequest checkMemberRequest) { - checkCodeUsecase.execute(checkMemberRequest); - return ApiResponseGenerator.success(HttpStatus.OK); - } - - @Operation(summary = "회원 가입후 이메일 인증 여부 확인", description = "회원 가입후 이메일 인증 여부 확인한다.") - @GetMapping("/members/email/checked") - public ApiResponse> verifyEmailChecked( - @RequestParam(value = "email") String email) { - Boolean isChecked = verifyEmailCheckedUsecase.execute(email); - return ApiResponseGenerator.success(isChecked, HttpStatus.OK); + return ApiResponseGenerator.success(HttpStatus.CREATED); } } From e47b2777a07746f5f29c15da0c35d46f398e046f Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:18:29 +0900 Subject: [PATCH 10/21] =?UTF-8?q?test/#360=20:=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=84=B1=EA=B3=B5=20=EB=B0=8F=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=EC=8B=9C=20=ED=86=B5=ED=95=A9=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/SignUpMemberIntegrationTest.java | 82 +++++++++++++++---- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/SignUpMemberIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/SignUpMemberIntegrationTest.java index c45cf4ca7..ed11ee967 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/SignUpMemberIntegrationTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/SignUpMemberIntegrationTest.java @@ -1,46 +1,96 @@ package com.gaebaljip.exceed.member; +import static org.junit.jupiter.api.Assertions.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; +import org.springframework.test.context.event.ApplicationEvents; +import org.springframework.test.context.event.RecordApplicationEvents; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import com.fasterxml.jackson.core.type.TypeReference; -import com.gaebaljip.exceed.common.ApiResponse; import com.gaebaljip.exceed.common.IntegrationTest; +import com.gaebaljip.exceed.common.event.SendEmailEvent; +import com.gaebaljip.exceed.common.redis.RedisUtils; +import com.gaebaljip.exceed.dto.request.SignUpMemberRequest; import com.gaebaljip.exceed.member.adapter.out.persistence.MemberEntity; import com.gaebaljip.exceed.member.adapter.out.persistence.MemberRepository; +import com.gaebaljip.exceed.member.exception.MemberError; +@RecordApplicationEvents class SignUpMemberIntegrationTest extends IntegrationTest { - @Autowired private MemberRepository memberRepository; + @Autowired ApplicationEvents events; + @Autowired RedisUtils redisUtils; + @Autowired MemberRepository memberRepository; + + @AfterEach + void tearDown() { + redisUtils.flushDB(); + } + + @Test + @DisplayName( + "회원가입 : 성공" + + "회원 생성 여부 확인" + + "이메일 인증 이벤트 발생 여부 확인" + + "redis에 인증 코드 저장 여부 확인" + + "회원가입 API 응답 코드 확인") + void when_signUpMember_expected_createMemberAndPublishEvent() throws Exception { + // given + SignUpMemberRequest request = getSignUpMemberRequest(); + // when + ResultActions resultActions = + mockMvc.perform( + MockMvcRequestBuilders.post("/v1/members") + .content(om.writeValueAsString(request)) + .contentType(MediaType.APPLICATION_JSON)); + + // then + resultActions.andExpect(status().isCreated()); + + long count = events.stream(SendEmailEvent.class).count(); + assertAll( + () -> + assertEquals( + memberRepository.findByEmail(request.email()).get().getChecked(), + false), + () -> assertEquals(1, count), + () -> assertNotNull(redisUtils.getData(request.email()))); + } @Test - void verifyEmailChecked() throws Exception { + @DisplayName("회원가입 : 실패" + "이미 가입된 이메일인 경우") + void when_signUpMember_then_Fail() throws Exception { // given - String email = "aaa@naver.com"; + SignUpMemberRequest request = getSignUpMemberRequest(); MemberEntity memberEntity = - MemberEntity.builder().email(email).password("aaaa1234@@").checked(false).build(); - memberRepository.save(memberEntity); // memberId = 2인 member 생성 + MemberEntity.builder().email(request.email()).password(request.password()).build(); + memberRepository.save(memberEntity); // when - ResultActions resultActions = mockMvc.perform( - MockMvcRequestBuilders.get("/v1/members/email/checked") - .param("email", email) + MockMvcRequestBuilders.post("/v1/members") + .content(om.writeValueAsString(request)) .contentType(MediaType.APPLICATION_JSON)); // then - resultActions.andExpect(status().isOk()); - String responseBody = resultActions.andReturn().getResponse().getContentAsString(); - ApiResponse.CustomBody verifyEmailChecked = - om.readValue(responseBody, new TypeReference>() {}); - Assertions.assertEquals(verifyEmailChecked.getResponse(), false); + resultActions.andExpectAll( + status().isBadRequest(), + jsonPath("$.error.reason").value(MemberError.ALREADY_SIGN_UP_MEMBER.getReason())); + } + + private SignUpMemberRequest getSignUpMemberRequest() { + return SignUpMemberRequest.builder() + .email("sonny1234444!@gmail.com") + .password("sonny123!@@") + .build(); } } From 3dee16deff3a240c6bef54f10d2f401426f94cad Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:19:26 +0900 Subject: [PATCH 11/21] =?UTF-8?q?refactor/#360=20:=20SignUpMemberControlle?= =?UTF-8?q?r=20=ED=81=B4=EB=9E=98=EC=8A=A4=EC=97=90=20=EC=9E=88=EB=8D=98?= =?UTF-8?q?=20API=EB=93=A4=20=EB=8B=A4=EB=A5=B8=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../in/CheckMemberEmailController.java | 35 +++++++++++++++++++ .../in/VerifyEmailCheckedController.java | 34 ++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/CheckMemberEmailController.java create mode 100644 BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/VerifyEmailCheckedController.java diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/CheckMemberEmailController.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/CheckMemberEmailController.java new file mode 100644 index 000000000..9fc65dabc --- /dev/null +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/CheckMemberEmailController.java @@ -0,0 +1,35 @@ +package com.gaebaljip.exceed.member.adapter.in; + +import javax.validation.Valid; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.gaebaljip.exceed.common.ApiResponse; +import com.gaebaljip.exceed.common.ApiResponseGenerator; +import com.gaebaljip.exceed.dto.request.CheckMemberRequest; +import com.gaebaljip.exceed.member.application.port.in.CheckCodeUsecase; + +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/v1") +@SecurityRequirement(name = "access-token") +@Tag(name = "[회원가입]") +public class CheckMemberEmailController { + + private final CheckCodeUsecase checkCodeUsecase; + + @GetMapping("/members/checked") + public ApiResponse> checkMemberEmail( + @ModelAttribute @Valid CheckMemberRequest checkMemberRequest) { + checkCodeUsecase.execute(checkMemberRequest); + return ApiResponseGenerator.success(HttpStatus.OK); + } +} diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/VerifyEmailCheckedController.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/VerifyEmailCheckedController.java new file mode 100644 index 000000000..484c74e0e --- /dev/null +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/adapter/in/VerifyEmailCheckedController.java @@ -0,0 +1,34 @@ +package com.gaebaljip.exceed.member.adapter.in; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.gaebaljip.exceed.common.ApiResponse; +import com.gaebaljip.exceed.common.ApiResponseGenerator; +import com.gaebaljip.exceed.member.application.port.in.VerifyEmailCheckedUsecase; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/v1") +@SecurityRequirement(name = "access-token") +@Tag(name = "[회원가입]") +public class VerifyEmailCheckedController { + + private final VerifyEmailCheckedUsecase verifyEmailCheckedUsecase; + + @Operation(summary = "회원 가입후 이메일 인증 여부 확인", description = "회원 가입후 이메일 인증 여부 확인한다.") + @GetMapping("/members/email/checked") + public ApiResponse> verifyEmailChecked( + @RequestParam(value = "email") String email) { + Boolean isChecked = verifyEmailCheckedUsecase.execute(email); + return ApiResponseGenerator.success(isChecked, HttpStatus.OK); + } +} From f86f255ed47a334b819a61fc8703586fecc91afd Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:20:32 +0900 Subject: [PATCH 12/21] =?UTF-8?q?test/#360=20:=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=EC=9D=B8=EC=A6=9D=20=EC=97=AC=EB=B6=80=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=ED=95=98=EB=8A=94=20API=20=ED=86=B5=ED=95=A9=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheckMemberEmailIntegrationTest.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 BE/exceed/src/test/java/com/gaebaljip/exceed/member/CheckMemberEmailIntegrationTest.java diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/CheckMemberEmailIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/CheckMemberEmailIntegrationTest.java new file mode 100644 index 000000000..929135d6f --- /dev/null +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/CheckMemberEmailIntegrationTest.java @@ -0,0 +1,46 @@ +package com.gaebaljip.exceed.member; + +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.gaebaljip.exceed.common.ApiResponse; +import com.gaebaljip.exceed.common.IntegrationTest; +import com.gaebaljip.exceed.member.adapter.out.persistence.MemberEntity; +import com.gaebaljip.exceed.member.adapter.out.persistence.MemberRepository; + +class CheckMemberEmailIntegrationTest extends IntegrationTest { + + @Autowired private MemberRepository memberRepository; + + @Test + void when_emailNotChecked_expected_returnFalse() throws Exception { + + // given + String email = "aaa@naver.com"; + MemberEntity memberEntity = + MemberEntity.builder().email(email).password("aaaa1234@@").checked(false).build(); + memberRepository.save(memberEntity); // memberId = 2인 member 생성 + + // when + + ResultActions resultActions = + mockMvc.perform( + MockMvcRequestBuilders.get("/v1/members/email/checked") + .param("email", email) + .contentType(MediaType.APPLICATION_JSON)); + + // then + resultActions.andExpect(status().isOk()); + String responseBody = resultActions.andReturn().getResponse().getContentAsString(); + ApiResponse.CustomBody verifyEmailChecked = + om.readValue(responseBody, new TypeReference>() {}); + Assertions.assertEquals(verifyEmailChecked.getResponse(), false); + } +} From e56475c89fb6fac8b8970e8d57f4cd710ed0f0a0 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:21:49 +0900 Subject: [PATCH 13/21] =?UTF-8?q?test/#360=20:=20=EC=9D=B4=EB=AF=B8=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=ED=95=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=A9=94=EC=9D=BC=EC=9D=B8=EC=A7=80=20=EA=B2=80=EC=A6=9D?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=8B=A8?= =?UTF-8?q?=EC=9C=84=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/ValidateEmailServiceTest.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java index d7b8bc5eb..d398b35e5 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java @@ -22,10 +22,9 @@ class ValidateEmailServiceTest { @Test @DisplayName("이메일이 존재하지 않고, 이메일 인증을 수행하지 않았을 경우") - void when_NotExistEmail_IsNotChecked_then_Void() { + void when_notExistEmail_isNotChecked_expected_void() { // given - given(memberPort.existsByEmail(anyString())).willReturn(false); given(memberPort.isChecked(anyString())).willReturn(false); ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); @@ -35,7 +34,7 @@ void when_NotExistEmail_IsNotChecked_then_Void() { @Test @DisplayName("이메일이 존재하면, 예외가 발생해야 한다") - void when_ExistEmail_IsNotChecked_then_Exception() { + void when_existEmail_isNotChecked_then_exception() { // given given(memberPort.existsByEmail(anyString())).willReturn(true); @@ -46,20 +45,6 @@ void when_ExistEmail_IsNotChecked_then_Exception() { AlreadySignUpMemberException.class, () -> validateEmailService.execute(command)); } - @Test - @DisplayName("이메일이 존재하지 않지만, 이메일 인증을 수행했을 경우 예외가 발생해야 한다") - void when_NotExistEmail_IsChecked_then_Exception() { - - // given - given(memberPort.existsByEmail(anyString())).willReturn(false); - given(memberPort.isChecked(anyString())).willReturn(true); - ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); - - // when, then - Assertions.assertThrows( - AlreadySignUpMemberException.class, () -> validateEmailService.execute(command)); - } - private String getEmail() { return "asadf1234!!@gmail.com"; } From c62d742245b2455ae91ef195240c725ed8ea07cd Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:22:34 +0900 Subject: [PATCH 14/21] =?UTF-8?q?refactor/#360=20:=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20isChecked=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exceed/member/application/ValidateEmailService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/application/ValidateEmailService.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/application/ValidateEmailService.java index 8ac744759..9a777f0bb 100644 --- a/BE/exceed/src/main/java/com/gaebaljip/exceed/member/application/ValidateEmailService.java +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/member/application/ValidateEmailService.java @@ -19,7 +19,7 @@ public class ValidateEmailService implements ValidateEmailUsecase { @Override @Transactional public void execute(ValidateEmailCommand command) { - if (memberPort.existsByEmail(command.email()) || memberPort.isChecked(command.email())) { + if (memberPort.existsByEmail(command.email())) { throw AlreadySignUpMemberException.EXECPTION; } } From 27b29006c8624b1125080a4d1b5765156295c562 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:22:51 +0900 Subject: [PATCH 15/21] =?UTF-8?q?refactor/#360=20:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BE/exceed/src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java b/BE/exceed/src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java index af7f279ef..576a7689c 100644 --- a/BE/exceed/src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java +++ b/BE/exceed/src/main/java/com/gaebaljip/exceed/config/AsyncConfig.java @@ -3,6 +3,7 @@ import java.util.concurrent.Executor; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -11,6 +12,7 @@ @EnableAsync @Configuration +@Profile("!test") public class AsyncConfig implements AsyncConfigurer { @Override public Executor getAsyncExecutor() { From bb3295e1fee82ad380a107378fed3b4a0981e91c Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:24:04 +0900 Subject: [PATCH 16/21] =?UTF-8?q?refactor/#360=20:=20@Profile("test")=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/gaebaljip/exceed/config/MockS3Config.java | 5 +++-- .../test/java/com/gaebaljip/exceed/config/MockSesConfig.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockS3Config.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockS3Config.java index 5110d526d..236fd4622 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockS3Config.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockS3Config.java @@ -4,14 +4,15 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; import software.amazon.awssdk.services.s3.presigner.S3Presigner; @Configuration -public class MockS3Config extends S3Config { +@Profile("test") +public class MockS3Config { @Bean @Primary - @Override public S3Presigner s3Presigner() { return Mockito.mock(S3Presigner.class); } diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockSesConfig.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockSesConfig.java index 71f92934c..675330199 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockSesConfig.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/config/MockSesConfig.java @@ -4,15 +4,16 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; import software.amazon.awssdk.services.ses.SesAsyncClient; @Configuration -public class MockSesConfig extends SesConfig { +@Profile("test") +public class MockSesConfig { @Bean @Primary - @Override public SesAsyncClient sesAsyncClient() { return Mockito.mock(SesAsyncClient.class); } From be267de9c5592c776d0e6b6f4a58ed0d0374b25b Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:27:15 +0900 Subject: [PATCH 17/21] =?UTF-8?q?refactor/#360=20:=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=AA=85=20when=5Fthen=20=ED=98=95=EC=8B=9D=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/application/OnBoardingMemberServiceTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/OnBoardingMemberServiceTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/OnBoardingMemberServiceTest.java index c39ee3f0b..7b534fc23 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/OnBoardingMemberServiceTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/OnBoardingMemberServiceTest.java @@ -37,7 +37,7 @@ private static OnBoardingMemberCommand createMemberCommand( @Test @DisplayName("몸무게가 0 이하일 경우 예외가 발생한다.") - void createMember_weight() { + void when_weightIsUnder_0_expected_exception() { // given OnBoardingMemberCommand command = createMemberCommand(172, 61, 0, 25); @@ -51,7 +51,7 @@ void createMember_weight() { @Test @DisplayName("목표 몸무게가 0 이하일 경우 예외가 발생한다.") - void createMember_targetWeight() { + void when_targetWeightIsUnder_0_expected_exception() { // given OnBoardingMemberCommand command = createMemberCommand(171, 61, 0, 25); @@ -65,7 +65,7 @@ void createMember_targetWeight() { @Test @DisplayName("키가 0 이하일 경우 예외가 발생한다.") - void createMember_height() { + void when_heightIsUnder_0_expected_exception() { // given OnBoardingMemberCommand command = createMemberCommand(0, 60, 65, 25); @@ -79,7 +79,7 @@ void createMember_height() { @Test @DisplayName("나이가 0 이하일 경우 예외가 발생한다.") - void createMember_age() { + void when_agetIsUnder_0_expected_exception() { // given OnBoardingMemberCommand command = createMemberCommand(171, 61, 65, 0); From 1623cc5c8e812b4651c0fb276330c85a35e9375a Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 20:27:40 +0900 Subject: [PATCH 18/21] =?UTF-8?q?refactor/#360=20:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exceed/member/adapter/in/CreateGuestTestRequest.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/CreateGuestTestRequest.java diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/CreateGuestTestRequest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/CreateGuestTestRequest.java deleted file mode 100644 index bfa2e44f4..000000000 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/CreateGuestTestRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.gaebaljip.exceed.member.adapter.in; - -public record CreateGuestTestRequest( - Integer height, Integer gender, Integer weight, Integer age, String activity, String etc) {} From 2402023f884d41fffe2e5eb91ffb83669b0119c7 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 22:26:50 +0900 Subject: [PATCH 19/21] =?UTF-8?q?test/#360=20:=20when=5Fthen=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/in/OnBoardingControllerTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingControllerTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingControllerTest.java index db874eec0..921c13c02 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingControllerTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/adapter/in/OnBoardingControllerTest.java @@ -25,7 +25,7 @@ class OnBoardingControllerTest extends ControllerTest { @Test @DisplayName("온보딩 성공") @WithMockUser - void onBoarding() throws Exception { + void when_onBoarding_expected_success() throws Exception { // given OnBoardingMemberRequest request = @@ -41,13 +41,13 @@ void onBoarding() throws Exception { .contentType(MediaType.APPLICATION_JSON)); // then - resultActions.andExpect(status().isCreated()); + resultActions.andExpect(status().isOk()); } @Test @DisplayName("온보딩-유효하지 않은 activity 입력시 오류 발생") @WithMockUser - void onBoarding_invalidActivity() throws Exception { + void when_onBoarding_invalidActivity_expected_exception() throws Exception { // given String invalidValue = "ACTIVE"; @@ -73,7 +73,7 @@ void onBoarding_invalidActivity() throws Exception { @Test @DisplayName("온보딩 실패 - 키가 null일 때") @WithMockUser - void onBoarding_fail() throws Exception { + void when_onBoarding_NullHeight_expected_exception() throws Exception { // given OnBoardingMemberRequest request = @@ -97,7 +97,7 @@ void onBoarding_fail() throws Exception { @Test @DisplayName("온보딩 실패 - 몸무게가 null일 때") @WithMockUser - void onBoarding_fail2() throws Exception { + void when_onBoarding_nullWeight_expected_exception() throws Exception { // given OnBoardingMemberRequest request = @@ -121,7 +121,7 @@ void onBoarding_fail2() throws Exception { @Test @DisplayName("온보딩 실패 - 목표 몸무게가 null일 때") @WithMockUser - void onBoarding_fail3() throws Exception { + void when_onBoarding_nullTargetWeight_expected_exception() throws Exception { // given OnBoardingMemberRequest request = @@ -145,7 +145,7 @@ void onBoarding_fail3() throws Exception { @Test @DisplayName("온보딩 실패 - 나이가 null일 때") @WithMockUser - void onBoarding_fail4() throws Exception { + void when_onBoarding_nullAge_expected_exception() throws Exception { // given OnBoardingMemberRequest request = From 40f854e235b5a940f81e1ead2796638b28a34426 Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 22:27:12 +0900 Subject: [PATCH 20/21] =?UTF-8?q?test/#360=20:=20isChecked()=20->=20exists?= =?UTF-8?q?ByEmail()=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exceed/member/application/ValidateEmailServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java index d398b35e5..a43a9d8c4 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/application/ValidateEmailServiceTest.java @@ -25,7 +25,7 @@ class ValidateEmailServiceTest { void when_notExistEmail_isNotChecked_expected_void() { // given - given(memberPort.isChecked(anyString())).willReturn(false); + given(memberPort.existsByEmail(anyString())).willReturn(false); ValidateEmailCommand command = new ValidateEmailCommand(getEmail()); // when, then From cc16927b1c5298ddbceb6d82213ac20b4786b29b Mon Sep 17 00:00:00 2001 From: hwangdaesun Date: Sun, 7 Jul 2024 22:27:31 +0900 Subject: [PATCH 21/21] =?UTF-8?q?style/#360=20:=20spotless=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java index e03a05711..79b9950fc 100644 --- a/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java +++ b/BE/exceed/src/test/java/com/gaebaljip/exceed/member/OnBoardingMemberIntegrationTest.java @@ -7,6 +7,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired;