From baa686b6f8d86275ec24e6f78007a4c5d5011d3e Mon Sep 17 00:00:00 2001 From: LeeKW Date: Thu, 18 Sep 2025 12:51:41 +0900 Subject: [PATCH 1/3] {feat} : domain --- db_dev.mv.db | Bin 16384 -> 20480 bytes .../cocktail/dto/CocktailRequestDto.java | 27 +++++++ .../cocktail/dto/CocktailResponseDto.java | 26 +++++++ .../back/domain/cocktail/entity/Cocktail.java | 73 ++++++++++++++++++ .../repository/CocktailRepository.java | 9 +++ 5 files changed, 135 insertions(+) create mode 100644 src/main/java/com/back/domain/cocktail/dto/CocktailRequestDto.java create mode 100644 src/main/java/com/back/domain/cocktail/dto/CocktailResponseDto.java create mode 100644 src/main/java/com/back/domain/cocktail/entity/Cocktail.java create mode 100644 src/main/java/com/back/domain/cocktail/repository/CocktailRepository.java diff --git a/db_dev.mv.db b/db_dev.mv.db index 3d84ab35a71a060c494c254beddf22b91ffd52d7..9ca0f636fb0899f7125b2dbb2379dbec9f3b27b2 100644 GIT binary patch literal 20480 zcmeHP%WmVy6(u!pk7CCOFi6&^Q9o=4ia-|MTn#1B7SVcmM9R}%2^3lEHd>YpS?;t0 z1eiruSp`8btI4W&0h0VekWWZ<*<_m!2!bqg`6!xtICf_2%m7_NLscvms}4``Qum%) z?v{zGqwzF&O-uLmXT%f*L8u0=E+?-|NvsBA;!jK{XT+bA&=d_rQFKFAqOclGXJ`K0 zl&WvY?BaAfiTg)mG7nynnHfn2F;qd_;@F2Vz!+c*Fa{U{i~+^~V}LQh7+?%A1{ed3 zfp3t37LEI9$>RTSa5dP}i~+^~V}LQh7+?%A1{ed30mcAhfHA-rco+uqB>$MiDgJZ+ zCAolX{+a*Qlmh|Ea}(>;*>pNL0~vM&2tp_+LUn$6ModN3B0(~Wss9OiJ2#c;d>WW? zB%piz#Cr(-$jRKJ633UgkI}OiuI-^l-?lt^SRXj;Cc+Y~pvulK__P%bT)U5)1Jvz# z$bR9to{K83RY9)R_Ry{(8Im6PqCf;)5J&nhYFTaz?W(dK5FF@+CP)h0M1(a>!;yh; zAQ(b`N1-nUzCh&2*FznLex!$yE=8g*iJ=^kU1T*oPM72Oe{x^){72j)AhCuwlW#38 z^rTHnzLn%#O}@3{J3VV`PW&@c8-6z_#?w*LpZnYNpyQwC^*)Jyn6yvN$;6xalM6qX z!(NPw^wPOM8k3sv{iMsBoSnC)Be?u~$?@eRoVKSgYvSS|P9`^pKZ-kT7ak!a`sL3v%_1KQ;KF-GRH zC%*cPkp%?}aYN$U>ok1Gr@4m;#Qz&V-}pE8XcOZ94>q9q_Gd$!osM;A4+s7BZT-53eY@!ZX}5Ij+YRUF zHi%Zc(QEbEL)Yuu-9xWcL3Vf0+1qV9hb?cnigr6N*Ps*Ey1ni&>+Uq-2DqlzJ&bF| zcK;+EB0K!dww~{xfXwu;uZOe7jQQFx>ZmZV=9+QDvy}q}*zqS7aJ>EIX9zD9~ zg~#rzJr1zmeGh%+cr7HNx*gB&4!zzmd8nVFk9R)JW<2V{n)FZ5bNi$)Y1TS~*5N?~ z!PC0V4i-#c{~3C^^EnTS9XuyD+73u=P1NXhfk!JgnBuUsF`lsiYj1HH{l-5^+;?(uP^T)PPb&efgtS8LrW@+{AMq7`$BU9&sv8z1 zxlE9gQr*yBqr_oVA_d(LgEYP(%;Df#H%x!{lF?YTv`+qagpCq zTqMJ#F5p@vFUGR6!in#wWh!>M(6M@3Txh?z(AT2&wM-0eoZK5F30BF+MXVyo#F-;2 z8zJ6KSx9B#v^}n?nN0izxc#4Syz`gD{pbJon}-Sm*tm=V#=v{Xz*793zr3RBzoJ(o zGEy{6y@w!rWr!^Phm_i)-w?n-Q`Bm(!9w??djwt9Rx3R0AR4azy-{Z zt%kh)lR9M5A>U4BWD<}k@jX4jjc;uiUmZWW3#JaF;}baWQ~zb@4}2kMpF7{t-JEag zje)ye*hEwG#!{ED=#4Ep-?#W;Y0`d8RvZ*JYJ7ODYZm1$Xt z%bN*`xYlkakeA%BVzz$44dXtCZ2hm()&0}2Zqm+J{0}>PSp1*uAEIybZ^6zW7XJ$@ z{!asb7XQavOVeLM7XKIh6;@{qFb3XF2D1D=jlZck521Aazv#(gC}J#&Un6+F@zSmT E05lSv4gdfE delta 1007 zcmc(ey>HV%7{>1sl9*JqK|%-yz)dRzlG~oo=lEj)oDu}6Efo!jEpnW58a1`k#HmUp zgh6Z|s^)eC8xjL#Vq{@t;IH66U|@oaoewI(!h(l;&z4@j&-?ryhp%B6!u(AWOVy_D zY?(@2HyZoYlo3Lbv)T2wOnf-EcnV8ylLpQvZJU_Z2&vI(w!d>Qa~PiJ<+5k~wN*^7 z%2JbhrYyDWI_;Q5+P3#hA|qZ~rXjU`KQIXwgOIC|f)q5iDHps;+nt6#X!Gb^z?BES z!@FG8U%I0K0PFBGNTh)vt5h)zY6z;1l&a#&f@;_W8)>qjyEaxaA_BFm6k(09l(oS2 zttae4u?!cORh(x(ic?p>d_saL2q2ghFFx2PmBr<|C97Pj6z|y341jAB9r!PuDZf1`O`Dg(Y@={{1v~xD6@mY*J-Fh0sy$3e3b;p0DGgI zTZVEr-deA!Xn4iCPDfuc;bTDvz@?Xb{51fc7Wq4`&)0e7&-WYs9c!v5rsqZmPdpo= zG*C^^uumv*v}$ zAH;V#@C|;1AO$i}xVQm)+mk&QM@=3k5wlOm*~jthK^B^gUAoG1q39zWL+pQvN7w6i zXw3@lk7F`fewY-=cbsm^_MC?%vj6Dz`GMW>s@OnwZ1d%8 { +} From 1b2de9e62d3078a3804f25b16df496373784bcfa Mon Sep 17 00:00:00 2001 From: LeeKW Date: Thu, 18 Sep 2025 13:06:18 +0900 Subject: [PATCH 2/3] {fix}:Cocktail-Wishlist relation --- .../java/com/back/domain/cocktail/entity/Cocktail.java | 10 +++++++--- .../java/com/back/domain/wishlist/entity/Wishlist.java | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/back/domain/cocktail/entity/Cocktail.java b/src/main/java/com/back/domain/cocktail/entity/Cocktail.java index c5fb96d0..8a7a5126 100644 --- a/src/main/java/com/back/domain/cocktail/entity/Cocktail.java +++ b/src/main/java/com/back/domain/cocktail/entity/Cocktail.java @@ -22,7 +22,7 @@ public class Cocktail { private String cocktailName; @Enumerated(EnumType.STRING) - private AlcoholStrength alcoholStrength; + private AlcoholStrength alcoholStrength; // 칵테일 알콜 도수 public enum AlcoholStrength { NON_ALCOHOLIC("논알콜 (0%)"), @@ -43,10 +43,10 @@ public String getDescription() { } } - private String cocktailStory; + private String cocktailStory; // 칵테일 유래 등 이야기 @Enumerated(EnumType.STRING) - private CocktailType cocktailType; + private CocktailType cocktailType; // 칵테일 컵에 따른 분류 public enum CocktailType { SHORT("숏"), @@ -66,8 +66,12 @@ public String getDescription() { } private String ingredient; + private String recipe; + private String imageUrl; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; } diff --git a/src/main/java/com/back/domain/wishlist/entity/Wishlist.java b/src/main/java/com/back/domain/wishlist/entity/Wishlist.java index d381ebfa..f48bc18a 100644 --- a/src/main/java/com/back/domain/wishlist/entity/Wishlist.java +++ b/src/main/java/com/back/domain/wishlist/entity/Wishlist.java @@ -1,5 +1,6 @@ package com.back.domain.wishlist.entity; +import com.back.domain.cocktail.entity.Cocktail; import com.back.domain.user.entity.User; import com.back.domain.wishlist.enums.WishlistStatus; import jakarta.persistence.*; @@ -25,8 +26,8 @@ public class Wishlist { private User user; // 찜한 사용자 (위시리스트의 주인) // TODO: Cocktail 도메인 추가 후 활성화 -// @ManyToOne -// private Cocktail cocktail; + @ManyToOne + private Cocktail cocktail; @Enumerated(EnumType.STRING) @Column(nullable = false) From b46991fdae7589f3218905aa5ebbd6f9f065bfb3 Mon Sep 17 00:00:00 2001 From: LeeKW Date: Thu, 18 Sep 2025 13:13:29 +0900 Subject: [PATCH 3/3] {fix}: add profileImgUrl --- src/main/java/com/back/domain/user/entity/User.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/back/domain/user/entity/User.java b/src/main/java/com/back/domain/user/entity/User.java index 5edbc08a..d08cc57e 100644 --- a/src/main/java/com/back/domain/user/entity/User.java +++ b/src/main/java/com/back/domain/user/entity/User.java @@ -35,4 +35,6 @@ public class User { @Builder.Default @Column(nullable = false, length = 20) private String role = "USER"; + + private String profileImgUrl; } \ No newline at end of file