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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.juu.juulabel.api.controller.admin;
package com.juu.juulabel.admin;

import com.juu.juulabel.api.annotation.LoginMember;
import com.juu.juulabel.api.service.admin.AdminService;
import com.juu.juulabel.common.annotation.LoginMember;
import com.juu.juulabel.common.exception.code.SuccessCode;
import com.juu.juulabel.common.response.CommonResponse;
import com.juu.juulabel.domain.entity.member.Member;
import com.juu.juulabel.member.domain.Member;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand All @@ -24,7 +23,7 @@
@RequiredArgsConstructor
public class AdminController {

private final AdminService adminService;
private final com.juu.juulabel.admin.AdminService adminService;

@Operation(summary = "뱃지 부여")
@PostMapping("/badges")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.juu.juulabel.api.service.admin;
package com.juu.juulabel.admin;

import com.juu.juulabel.api.service.notification.NotificationService;
import com.juu.juulabel.common.exception.BaseException;
import com.juu.juulabel.common.exception.code.ErrorCode;
import com.juu.juulabel.domain.entity.member.Member;
import com.juu.juulabel.domain.enums.member.MemberRole;
import com.juu.juulabel.domain.enums.notification.NotificationType;
import com.juu.juulabel.domain.repository.reader.MemberReader;
import com.juu.juulabel.notification.domain.NotificationType;
import com.juu.juulabel.member.repository.MemberReader;
import com.juu.juulabel.member.domain.Member;
import com.juu.juulabel.member.domain.MemberRole;
import com.juu.juulabel.notification.service.NotificationService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.api.controller;
package com.juu.juulabel.admin;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.api.controller;
package com.juu.juulabel.admin;


import io.sentry.Sentry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.juu.juulabel.api.controller;
package com.juu.juulabel.admin;


import com.juu.juulabel.api.provider.JwtTokenProvider;
import com.juu.juulabel.common.provider.JwtTokenProvider;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.api.controller.alcohol;
package com.juu.juulabel.alcohol.controller;

import com.juu.juulabel.api.dto.response.AlcoholTypeListResponse;
import com.juu.juulabel.api.dto.response.AlcoholicDrinksListWithSizeResponse;
import com.juu.juulabel.api.dto.response.FlavorListResponse;
import com.juu.juulabel.api.dto.response.SensoryListResponse;
import com.juu.juulabel.api.service.alcohol.AlcoholService;
import com.juu.juulabel.common.dto.response.AlcoholTypeListResponse;
import com.juu.juulabel.common.dto.response.AlcoholicDrinksListWithSizeResponse;
import com.juu.juulabel.common.dto.response.FlavorListResponse;
import com.juu.juulabel.common.dto.response.SensoryListResponse;
import com.juu.juulabel.alcohol.service.AlcoholService;
import com.juu.juulabel.common.exception.code.SuccessCode;
import com.juu.juulabel.common.response.CommonResponse;
import io.swagger.v3.oas.annotations.Operation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.juu.juulabel.api.controller.alcohol;
package com.juu.juulabel.alcohol.controller;


import com.juu.juulabel.api.dto.request.CategorySearchAlcoholRequest;
import com.juu.juulabel.api.dto.response.AlcoholicCategoryResponse;
import com.juu.juulabel.api.dto.response.AlcoholicDrinksDetailResponse;
import com.juu.juulabel.api.dto.response.BreweryDetailResponse;
import com.juu.juulabel.api.dto.response.RelationSearchResponse;
import com.juu.juulabel.api.service.alcohol.AlcoholicDrinksService;
import com.juu.juulabel.api.service.alcohol.BreweryService;
import com.juu.juulabel.alcohol.request.CategorySearchAlcoholRequest;
import com.juu.juulabel.common.dto.response.AlcoholicCategoryResponse;
import com.juu.juulabel.common.dto.response.AlcoholicDrinksDetailResponse;
import com.juu.juulabel.common.dto.response.BreweryDetailResponse;
import com.juu.juulabel.common.dto.response.RelationSearchResponse;
import com.juu.juulabel.alcohol.service.AlcoholicDrinksService;
import com.juu.juulabel.alcohol.service.BreweryService;
import com.juu.juulabel.common.exception.code.SuccessCode;
import com.juu.juulabel.common.response.CommonResponse;
import io.swagger.v3.oas.annotations.Operation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.juu.juulabel.api.controller.alcohol;
package com.juu.juulabel.alcohol.controller;

import com.juu.juulabel.api.annotation.LoginMember;
import com.juu.juulabel.api.dto.request.*;
import com.juu.juulabel.api.dto.response.*;
import com.juu.juulabel.api.service.alcohol.TastingNoteService;
import com.juu.juulabel.alcohol.request.CommentListRequest;
import com.juu.juulabel.common.annotation.LoginMember;
import com.juu.juulabel.common.exception.code.SuccessCode;
import com.juu.juulabel.common.response.CommonResponse;
import com.juu.juulabel.domain.entity.member.Member;
import com.juu.juulabel.common.dto.request.*;
import com.juu.juulabel.common.dto.response.*;
import com.juu.juulabel.alcohol.service.TastingNoteService;
import com.juu.juulabel.member.domain.Member;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.domain.entity.tastingnote.TastingNote;
import com.juu.juulabel.common.base.BaseTimeEntity;
import com.juu.juulabel.tastingnote.domain.TastingNote;
import jakarta.persistence.*;
import lombok.*;

Expand Down Expand Up @@ -33,6 +33,7 @@ public class AlcoholType extends BaseTimeEntity {
@Column(name = "deleted_at", columnDefinition = "datetime comment '삭제 일시'")
private LocalDateTime deletedAt;

@Builder.Default
@OneToMany(mappedBy = "alcoholType", cascade = CascadeType.ALL, orphanRemoval = true)
private List<TastingNote> tastingNotes = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.common.base.BaseTimeEntity;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.common.base.BaseTimeEntity;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.domain.entity.category.Category;
import com.juu.juulabel.common.base.BaseTimeEntity;
import com.juu.juulabel.category.domain.Category;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.common.base.BaseTimeEntity;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.common.exception.InvalidParamException;
import com.juu.juulabel.common.exception.code.ErrorCode;
import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.domain.entity.tastingnote.TastingNote;
import com.juu.juulabel.common.base.BaseTimeEntity;
import com.juu.juulabel.tastingnote.domain.TastingNote;
import jakarta.persistence.*;
import lombok.*;

Expand Down Expand Up @@ -64,6 +64,7 @@ public class AlcoholicDrinks extends BaseTimeEntity {
@Column(name = "deleted_at", columnDefinition = "datetime comment '삭제 일시'")
private LocalDateTime deletedAt;

@Builder.Default
@OneToMany(mappedBy = "alcoholicDrinks", cascade = CascadeType.ALL, orphanRemoval = true)
private List<TastingNote> tastingNotes = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import com.juu.juulabel.domain.base.BaseTimeEntity;
import com.juu.juulabel.common.base.BaseTimeEntity;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;


import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.enums.alcohol.scent;
package com.juu.juulabel.alcohol.domain;

public enum ScentType {
NATURE, FRUIT_VEGETABLE, GRAIN, OTHER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.entity.alcohol;
package com.juu.juulabel.alcohol.domain;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.juu.juulabel.domain.enums.sort;
package com.juu.juulabel.alcohol.domain;

public enum SortType {
PRICE_LOW,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.domain.repository.reader;
package com.juu.juulabel.alcohol.repository;

import com.juu.juulabel.domain.annotation.Reader;
import com.juu.juulabel.domain.dto.alcohol.ColorInfo;
import com.juu.juulabel.domain.entity.alcohol.Color;
import com.juu.juulabel.domain.repository.jpa.AlcoholTypeColorJpaRepository;
import com.juu.juulabel.domain.repository.query.AlcoholTypeColorQueryRepository;
import com.juu.juulabel.common.annotation.Reader;
import com.juu.juulabel.alcohol.request.ColorInfo;
import com.juu.juulabel.alcohol.domain.Color;
import com.juu.juulabel.alcohol.repository.jpa.AlcoholTypeColorJpaRepository;
import com.juu.juulabel.alcohol.repository.query.AlcoholTypeColorQueryRepository;
import lombok.RequiredArgsConstructor;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.domain.repository.reader;
package com.juu.juulabel.alcohol.repository;

import com.juu.juulabel.domain.annotation.Reader;
import com.juu.juulabel.domain.dto.alcohol.FlavorLevelInfo;
import com.juu.juulabel.domain.entity.alcohol.FlavorLevel;
import com.juu.juulabel.domain.repository.jpa.AlcoholTypeFlavorJpaRepository;
import com.juu.juulabel.domain.repository.query.AlcoholTypeFlavorQueryRepository;
import com.juu.juulabel.common.annotation.Reader;
import com.juu.juulabel.alcohol.request.FlavorLevelInfo;
import com.juu.juulabel.alcohol.domain.FlavorLevel;
import com.juu.juulabel.alcohol.repository.jpa.AlcoholTypeFlavorJpaRepository;
import com.juu.juulabel.alcohol.repository.query.AlcoholTypeFlavorQueryRepository;
import lombok.RequiredArgsConstructor;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.domain.repository.reader;
package com.juu.juulabel.alcohol.repository;

import com.juu.juulabel.domain.annotation.Reader;
import com.juu.juulabel.domain.dto.alcohol.UsedAlcoholTypeInfo;
import com.juu.juulabel.domain.entity.alcohol.AlcoholType;
import com.juu.juulabel.domain.repository.jpa.AlcoholTypeJpaRepository;
import com.juu.juulabel.domain.repository.query.AlcoholTypeQueryRepository;
import com.juu.juulabel.common.annotation.Reader;
import com.juu.juulabel.alcohol.request.UsedAlcoholTypeInfo;
import com.juu.juulabel.alcohol.domain.AlcoholType;
import com.juu.juulabel.alcohol.repository.jpa.AlcoholTypeJpaRepository;
import com.juu.juulabel.alcohol.repository.query.AlcoholTypeQueryRepository;
import lombok.RequiredArgsConstructor;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.domain.repository.reader;
package com.juu.juulabel.alcohol.repository;

import com.juu.juulabel.domain.annotation.Reader;
import com.juu.juulabel.domain.dto.alcohol.CategoryWithScentSummary;
import com.juu.juulabel.domain.entity.alcohol.Scent;
import com.juu.juulabel.domain.repository.jpa.AlcoholTypeScentJpaRepository;
import com.juu.juulabel.domain.repository.query.AlcoholTypeScentQueryRepository;
import com.juu.juulabel.common.annotation.Reader;
import com.juu.juulabel.alcohol.request.CategoryWithScentSummary;
import com.juu.juulabel.alcohol.domain.Scent;
import com.juu.juulabel.alcohol.repository.jpa.AlcoholTypeScentJpaRepository;
import com.juu.juulabel.alcohol.repository.query.AlcoholTypeScentQueryRepository;
import lombok.RequiredArgsConstructor;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.juu.juulabel.domain.repository.reader;
package com.juu.juulabel.alcohol.repository;

import com.juu.juulabel.domain.annotation.Reader;
import com.juu.juulabel.domain.dto.alcohol.SensoryLevelInfo;
import com.juu.juulabel.domain.entity.alcohol.SensoryLevel;
import com.juu.juulabel.domain.repository.jpa.AlcoholTypeSensoryJpaRepository;
import com.juu.juulabel.domain.repository.query.AlcoholTypeSensoryQueryRepository;
import com.juu.juulabel.common.annotation.Reader;
import com.juu.juulabel.alcohol.request.SensoryLevelInfo;
import com.juu.juulabel.alcohol.domain.SensoryLevel;
import com.juu.juulabel.alcohol.repository.jpa.AlcoholTypeSensoryJpaRepository;
import com.juu.juulabel.alcohol.repository.query.AlcoholTypeSensoryQueryRepository;
import lombok.RequiredArgsConstructor;

import java.util.List;
Expand Down
Loading