Merge pull request #23 from readyvery/test

배포 전 마지막
readyvery · Dec 3, 2023 · 08a0eba · 08a0eba
2 parents 1eae74f + a1e342f
commit 08a0eba
Show file tree

Hide file tree

Showing 78 changed files with 1,789 additions and 128 deletions.
diff --git a/.github/workflows/test_merge.yml b/.github/workflows/test_merge.yml
@@ -29,20 +29,20 @@ jobs:
       - name: remove plain.jar
         run: rm -rf build/libs/*plain.jar
 
-      - name: file copy
-        uses: actions/upload-artifact@v3
-        with:
-          name: libs
-          path: build/libs
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: file download
-        uses: actions/download-artifact@v3
-        with:
-          name: libs
-          path: libs
+      #      - name: file copy
+      #        uses: actions/upload-artifact@v3
+      #        with:
+      #          name: libs
+      #          path: build/libs
+      #  deploy:
+      #    needs: build
+      #    runs-on: ubuntu-latest
+      #    steps:
+      #      - name: file download
+      #        uses: actions/download-artifact@v3
+      #        with:
+      #          name: libs
+      #          path: libs
       - name: Upload to Cloudflare
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
@@ -51,7 +51,7 @@ jobs:
           BUCKET_NAME: ${{ secrets.CF_BUCKET_NAME }}
           ENDPOINT_URL: ${{ secrets.CF_ENDPOINT_URL }}
         run: |
-          aws s3 sync libs/ s3://$BUCKET_NAME/java/main/boss \
+          aws s3 sync build/libs/ s3://$BUCKET_NAME/java/main/boss \
             --endpoint-url $ENDPOINT_URL --delete --exact-timestamps
 
       - name: SSH and deploy

diff --git a/build.gradle b/build.gradle
@@ -42,6 +42,9 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
+    //SOLAPI
+    implementation 'net.nurigo:sdk:4.2.7'
+
 //    //Querydsl 추가
 //    implementation 'com.querydsl:querydsl-core:5.0.0'
 //    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Cart.java b/src/main/java/com/readyvery/readyverydemo/domain/Cart.java
@@ -19,6 +19,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 @Getter
@@ -28,15 +29,18 @@
 @AllArgsConstructor
 @Slf4j
 @Builder
+@Setter
 public class Cart extends BaseTimeEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "cart_idx")
 	private Long id;
 
-	// 장바구니 유저 연관관계 매핑
+	@Column(nullable = false)
+	private Long inOut;
 
+	// 장바구니 유저 연관관계 매핑
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "user_idx")
 	private UserInfo userInfo;
@@ -54,6 +58,10 @@ public class Cart extends BaseTimeEntity {
 	@Builder.Default
 	private Boolean isDeleted = false;
 
+	@Builder.Default
+	@OneToMany(mappedBy = "cart")
+	private List<Order> orders = new ArrayList<Order>();
+
 	// 장바구니 장바구니 아이템 연관관계 매핑
 	@Builder.Default
 	@OneToMany(mappedBy = "cart", cascade = CascadeType.ALL)

diff --git a/src/main/java/com/readyvery/readyverydemo/domain/CartItem.java b/src/main/java/com/readyvery/readyverydemo/domain/CartItem.java
@@ -51,6 +51,11 @@ public class CartItem extends BaseTimeEntity {
 	@JoinColumn(name = "cart_idx")
 	private Cart cart;
 
+	// 장바구니 아이템 삭제 여부
+	@Column(columnDefinition = "BOOLEAN default true")
+	@Builder.Default
+	private Boolean isDeleted = false;
+
 	// 장바구니 아이템 - 장바구니 옵션 연관관계 매핑
 	@Builder.Default
 	@OneToMany(mappedBy = "cartItem", cascade = CascadeType.ALL)

diff --git a/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java b/src/main/java/com/readyvery/readyverydemo/domain/CeoInfo.java
@@ -1,17 +1,17 @@
 package com.readyvery.readyverydemo.domain;
 
-import static jakarta.persistence.FetchType.*;
-
 import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -45,14 +45,6 @@ public class CeoInfo extends BaseTimeEntity {
 	@Column(nullable = false, columnDefinition = "TEXT")
 	private String imageUrl;
 
-	// 연령대
-	@Column
-	private String age;
-
-	// 생일
-	@Column
-	private String birth;
-
 	// 전화번호
 	@Column
 	private String phone;
@@ -92,13 +84,18 @@ public class CeoInfo extends BaseTimeEntity {
 	private LocalDateTime lastLoginDate;
 
 	// 사장님 가게 연관관계 매핑
-	@Builder.Default
-	@OneToOne(mappedBy = "ceoInfo", fetch = LAZY)
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "store_idx")
 	private Store store = null;
 
 	// 리프레시토큰 업데이트
 	public void updateRefresh(String updateRefreshToken) {
 		this.refreshToken = updateRefreshToken;
 	}
 
+	public void updateRemoveCeoDate() {
+		this.status = true;
+		this.deleteDate = LocalDateTime.now();
+	}
+
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java b/src/main/java/com/readyvery/readyverydemo/domain/Coupon.java
@@ -1,5 +1,7 @@
 package com.readyvery.readyverydemo.domain;
 
+import java.util.ArrayList;
+import java.util.List;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,14 +11,18 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 @Getter
+@Setter
 @Entity
 @Builder
 @Table(name = "COUPON")
@@ -42,12 +48,9 @@ public class Coupon extends BaseTimeEntity {
 	@JoinColumn(name = "user_idx")
 	private UserInfo userInfo;
 
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "store_idx")
-	private Store store;
-
-	// @OneToOne(mappedBy = "coupon", fetch = LAZY)
-	// private Order order;
+	@Version
+	private Long version;
 
+	@OneToMany(mappedBy = "coupon", fetch = FetchType.LAZY)
+	private List<Order> orders = new ArrayList<Order>();
 }
-
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/CouponDetail.java b/src/main/java/com/readyvery/readyverydemo/domain/CouponDetail.java
@@ -1,6 +1,5 @@
 package com.readyvery.readyverydemo.domain;
 
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,17 +46,34 @@ public class CouponDetail extends BaseTimeEntity {
 	@Column
 	private LocalDateTime expire;
 
-	// 발행처 레디베리 발행(0) / 사장님 발행(ceo_idx)
+	// 쿠폰 코드
+	@Column(name = "coupon_code")
+	private String couponCode;
+
+	// 발급 갯수
+	@Column(name = "coupon_count")
+	private Long couponCount;
+
+	// 쿠폰 설명
 	@Column
-	private Long publisher;
+	private String description;
+
+	// 이벤트 진행 여부
+	@Column(name = "is_active")
+	private boolean isActive;
+
+	// 배너 이미지 url
+	@Column(name = "banner_img")
+	private String bannerImg;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "event_idx")
-	private Event event;
+	@JoinColumn(name = "foodie_idx")
+	private Foodie foodie;
 
-	@Builder.Default
-	@OneToMany(mappedBy = "couponDetail", cascade = CascadeType.ALL)
-	private List<CouponMenu> couponMenus = new ArrayList<CouponMenu>();
+	// 발행처 레디베리 발행(null) / 사장님 발행(store_idx)
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "store_idx")
+	private Store store;
 
 	@Builder.Default
 	@OneToMany(mappedBy = "couponDetail", cascade = CascadeType.ALL)

diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Event.java b/src/main/java/com/readyvery/readyverydemo/domain/Event.java
@@ -1,16 +1,10 @@
 package com.readyvery.readyverydemo.domain;
 
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -32,16 +26,15 @@ public class Event extends BaseTimeEntity {
 	@Column(name = "event_idx")
 	private Long id;
 
-	// 이벤트 베너 이미지 url
-	@Column(name = "banner_img")
-	private String bannerImg;
-
 	// 이벤트 메인 이미지 url
 	@Column(name = "main_img")
 	private String mainImg;
 
-	@Builder.Default
-	@OneToMany(mappedBy = "event", cascade = CascadeType.ALL)
-	private List<CouponDetail> coupons = new ArrayList<CouponDetail>();
+	// 이벤트 리다이렉트 url
+	@Column(name = "redirect_url")
+	private String redirectUrl;
 
+	// 이벤트 진행 여부
+	@Column(name = "is_active")
+	private boolean isActive;
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/Foodie.java b/src/main/java/com/readyvery/readyverydemo/domain/Foodie.java
@@ -53,6 +53,11 @@ public class Foodie extends BaseTimeEntity {
 	@Column(nullable = false, columnDefinition = "BOOLEAN default false")
 	private boolean hit;
 
+	//메뉴 - 가게 연관관계 매핑
+	// @ManyToOne(fetch = FetchType.LAZY)
+	// @JoinColumn(name = "store_idx")
+	// private Store store;
+
 	//메뉴 - 메뉴 카테고리 연관관계 매핑
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "foodie_category_idx")
@@ -71,6 +76,12 @@ public class Foodie extends BaseTimeEntity {
 	private List<CartItem> cartItems = new ArrayList<CartItem>();
 
 	@OneToMany(mappedBy = "foodie", cascade = CascadeType.ALL)
-	private List<CouponMenu> couponMenus = new ArrayList<CouponMenu>();
+	private List<CouponDetail> couponDetails = new ArrayList<CouponDetail>();
+
+	@OneToMany(mappedBy = "foodie", cascade = CascadeType.ALL)
+	private List<OrderItem> orderItems = new ArrayList<OrderItem>();
 
+	public void updateCheckSoldOut(boolean soldOut) {
+		this.soldOut = soldOut;
+	}
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/FoodieCategory.java b/src/main/java/com/readyvery/readyverydemo/domain/FoodieCategory.java
@@ -1,6 +1,5 @@
 package com.readyvery.readyverydemo.domain;
 
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -44,4 +43,3 @@ public class FoodieCategory {
 	@OneToMany(mappedBy = "foodieCategory", cascade = CascadeType.ALL)
 	private List<Foodie> foodies = new ArrayList<>();
 }
-
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/FoodieOption.java b/src/main/java/com/readyvery/readyverydemo/domain/FoodieOption.java
@@ -50,5 +50,7 @@ public class FoodieOption extends BaseTimeEntity {
 	@OneToMany(mappedBy = "foodieOption", cascade = CascadeType.ALL)
 	private List<CartOption> cartOptions = new ArrayList<CartOption>();
 
+	// order item option 연관 관계 매핑
+	@OneToMany(mappedBy = "foodieOption", cascade = CascadeType.ALL)
+	private List<OrderItemOption> orderItemOptions = new ArrayList<OrderItemOption>();
 }
-
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/FoodieOptionCategory.java b/src/main/java/com/readyvery/readyverydemo/domain/FoodieOptionCategory.java
@@ -54,4 +54,7 @@ public class FoodieOptionCategory extends BaseTimeEntity {
 	@OneToMany(mappedBy = "foodieOptionCategory", cascade = CascadeType.ALL)
 	private List<CartOption> cartOptions = new ArrayList<CartOption>();
 
+	// order item option 연관 관계 매핑
+	@OneToMany(mappedBy = "foodieOptionCategory", cascade = CascadeType.ALL)
+	private List<OrderItemOption> orderItemOptions = new ArrayList<OrderItemOption>();
 }
diff --git a/src/main/java/com/readyvery/readyverydemo/domain/ImgSize.java b/src/main/java/com/readyvery/readyverydemo/domain/ImgSize.java
@@ -0,0 +1,15 @@
+package com.readyvery.readyverydemo.domain;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum ImgSize {
+	EVENT_BANNER(), // 이벤트 배너
+	VERY_PICK_CAFE_BANNER(), // 카페 리스트 배너
+	CAFE_LOGO(), // 카페 로고
+	PICKUP_PROMOTION(), // 픽업 홍보 포스터
+	CAFE_BANNER(), // 카페 상세 배너
+	FOODY(), // 음료 사진
+}