Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified db_dev.mv.db
Binary file not shown.
27 changes: 27 additions & 0 deletions src/main/java/com/back/domain/cocktail/dto/CocktailRequestDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.back.domain.cocktail.dto;

import com.back.domain.cocktail.entity.Cocktail;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Getter
@Setter
@NoArgsConstructor
public class CocktailRequestDto {

@NotBlank
private String cocktailName;

@NotNull
private Cocktail.AlcoholStrength alcoholStrength;

private String cocktailStory;
private Cocktail.CocktailType cocktailType;
private String ingredient;
private String recipe;
private String imageUrl;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.back.domain.cocktail.dto;

import com.back.domain.cocktail.entity.Cocktail;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.time.LocalDateTime;

@Getter
@Setter
@NoArgsConstructor
public class CocktailResponseDto {

private long cocktailId;
private String cocktailName;
private Cocktail.AlcoholStrength alcoholStrength;
private String cocktailStory;
private Cocktail.CocktailType cocktailType;
private String ingredient;
private String recipe;
private String imageUrl;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;

}
77 changes: 77 additions & 0 deletions src/main/java/com/back/domain/cocktail/entity/Cocktail.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package com.back.domain.cocktail.entity;

import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import java.time.LocalDateTime;

import static jakarta.persistence.GenerationType.IDENTITY;


@Getter
@Setter
@NoArgsConstructor
@Entity
public class Cocktail {
@Id
@GeneratedValue(strategy = IDENTITY)
private long cocktailId;

private String cocktailName;

@Enumerated(EnumType.STRING)
private AlcoholStrength alcoholStrength; // 칵테일 알콜 도수

public enum AlcoholStrength {
NON_ALCOHOLIC("논알콜 (0%)"),
WEAK("약한 도수 (1~5%)"),
LIGHT("가벼운 도수 (6~15%)"),
MEDIUM("중간 도수 (16~25%)"),
STRONG("센 도수 (26~35%)"),
VERY_STRONG("매우 센 도수 (36%~)");

private final String description;

AlcoholStrength(String description) {
this.description = description;
}

public String getDescription() {
return description;
}
}

private String cocktailStory; // 칵테일 유래 등 이야기

@Enumerated(EnumType.STRING)
private CocktailType cocktailType; // 칵테일 컵에 따른 분류

public enum CocktailType {
SHORT("숏"),
LONG("롱"),
SHOOTER("슈터"),
CLASSIC("클래식");

private final String description;

CocktailType(String description) {
this.description = description;
}

public String getDescription() {
return description;
}
}

private String ingredient;

private String recipe;

private String imageUrl;

private LocalDateTime createdAt;

private LocalDateTime updatedAt;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.back.domain.cocktail.repository;

import com.back.domain.cocktail.entity.Cocktail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface CocktailRepository extends JpaRepository<Cocktail, Long> {
}
2 changes: 2 additions & 0 deletions src/main/java/com/back/domain/user/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ public class User {
@Builder.Default
@Column(nullable = false, length = 20)
private String role = "USER";

private String profileImgUrl;
}
5 changes: 3 additions & 2 deletions src/main/java/com/back/domain/wishlist/entity/Wishlist.java
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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)
Expand Down