Skip to content

Commit

Permalink
Rename: 도메인 디렉토리 구조 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
nohy6630 committed May 23, 2024
1 parent 03f9f95 commit c2897ba
Show file tree
Hide file tree
Showing 40 changed files with 81 additions and 113 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.like.controller;
package com.meetup.teame.backend.domain.activity.controller;

import com.meetup.teame.backend.domain.like.service.LikeService;
import com.meetup.teame.backend.domain.activity.service.LikeService;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.meetup.teame.backend.domain.activity.dto.response;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Comment;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.meetup.teame.backend.domain.activity.dto.response;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import lombok.*;

import java.time.format.DateTimeFormatter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.meetup.teame.backend.domain.activity.entity;

import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.like.entity.ActivityLike;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.Comment;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.meetup.teame.backend.domain.like.entity;
package com.meetup.teame.backend.domain.activity.entity;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.meetup.teame.backend.domain.like.repository;
package com.meetup.teame.backend.domain.activity.repository;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.like.entity.ActivityLike;
import com.meetup.teame.backend.domain.activity.entity.ActivityLike;
import com.meetup.teame.backend.domain.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.activity.entity.AgencyType;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import com.meetup.teame.backend.domain.user.entity.User;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.activity.entity.AgencyType;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import com.meetup.teame.backend.domain.user.entity.User;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.jpa.impl.JPAQueryFactory;
Expand All @@ -12,7 +12,7 @@
import java.util.List;

import static com.meetup.teame.backend.domain.activity.entity.QActivity.activity;
import static com.meetup.teame.backend.domain.like.entity.QActivityLike.activityLike;
import static com.meetup.teame.backend.domain.activity.entity.QActivityLike.activityLike;

@RequiredArgsConstructor
public class ActivityRepositoryImpl implements ActivityRepositoryCustom {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meetup.teame.backend.domain.activity.service;

import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
import com.meetup.teame.backend.domain.activity.dto.request.ReadActivitiesReq;
import com.meetup.teame.backend.domain.activity.dto.response.ActivityDetailsRes;
import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes;
Expand All @@ -10,8 +9,8 @@
import com.meetup.teame.backend.domain.activity.entity.AgencyType;
import com.meetup.teame.backend.domain.activity.repository.ActivityRepository;
import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider;
import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.activity.repository.ActivityLikeRepository;
import com.meetup.teame.backend.domain.user.entity.Personality;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.global.exception.CustomException;
Expand All @@ -21,8 +20,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.meetup.teame.backend.domain.like.service;
package com.meetup.teame.backend.domain.activity.service;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.activity.repository.ActivityRepository;
import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider;
import com.meetup.teame.backend.domain.like.entity.ActivityLike;
import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository;
import com.meetup.teame.backend.domain.activity.entity.ActivityLike;
import com.meetup.teame.backend.domain.activity.repository.ActivityLikeRepository;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.global.exception.CustomException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.email.config;
package com.meetup.teame.backend.domain.auth.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.email.config;
package com.meetup.teame.backend.domain.auth.config;


import org.springframework.beans.factory.annotation.Value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.meetup.teame.backend.domain.login.controller;
package com.meetup.teame.backend.domain.auth.controller;

import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService;
import com.meetup.teame.backend.domain.login.dto.LoginRequest;
import com.meetup.teame.backend.domain.login.service.LoginService;
import com.meetup.teame.backend.domain.auth.dto.request.LoginRequest;
import com.meetup.teame.backend.domain.auth.service.LoginService;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.domain.user.service.UserService;
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,11 +1,11 @@
package com.meetup.teame.backend.domain.register.controller;
package com.meetup.teame.backend.domain.auth.controller;

import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService;
import com.meetup.teame.backend.domain.email.dto.EmailRequest;
import com.meetup.teame.backend.domain.email.service.EmailService;
import com.meetup.teame.backend.domain.login.service.LoginService;
import com.meetup.teame.backend.domain.register.dto.RegisterRequest;
import com.meetup.teame.backend.domain.register.service.RegisterService;
import com.meetup.teame.backend.domain.user.dto.request.EmailRequest;
import com.meetup.teame.backend.domain.auth.service.EmailService;
import com.meetup.teame.backend.domain.auth.service.LoginService;
import com.meetup.teame.backend.domain.user.dto.request.RegisterRequest;
import com.meetup.teame.backend.domain.auth.service.RegisterService;
import com.meetup.teame.backend.domain.user.service.UserService;
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.meetup.teame.backend.domain.login.dto;
package com.meetup.teame.backend.domain.auth.dto.request;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.meetup.teame.backend.domain.auth.oauth.dto.CreateOauthUserRequest;
import com.meetup.teame.backend.domain.auth.oauth.dto.CreateUserRequest;
import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService;
import com.meetup.teame.backend.domain.login.service.LoginService;
import com.meetup.teame.backend.domain.auth.service.LoginService;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.domain.user.service.UserService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.email.service;
package com.meetup.teame.backend.domain.auth.service;

import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.login.service;
package com.meetup.teame.backend.domain.auth.service;

import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meetup.teame.backend.domain.register.service;
package com.meetup.teame.backend.domain.auth.service;

import com.meetup.teame.backend.domain.register.dto.RegisterRequest;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.domain.user.dto.request.RegisterRequest;
import com.meetup.teame.backend.domain.user.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.review.repository.ReviewRepository;
import com.meetup.teame.backend.domain.experience.entity.Review;
import com.meetup.teame.backend.domain.experience.repository.ReviewRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.meetup.teame.backend.domain.review.controller;
package com.meetup.teame.backend.domain.experience.controller;

import com.meetup.teame.backend.domain.review.dto.request.CreateReviewReq;
import com.meetup.teame.backend.domain.review.dto.response.ReadReviewsByMeRes;
import com.meetup.teame.backend.domain.review.dto.response.ReviewByMeRes;
import com.meetup.teame.backend.domain.review.service.ReviewService;
import com.meetup.teame.backend.domain.experience.dto.request.CreateReviewReq;
import com.meetup.teame.backend.domain.experience.dto.response.ReadReviewsByMeRes;
import com.meetup.teame.backend.domain.experience.dto.response.ReviewByMeRes;
import com.meetup.teame.backend.domain.experience.service.ReviewService;
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,4 +1,4 @@
package com.meetup.teame.backend.domain.review.dto.request;
package com.meetup.teame.backend.domain.experience.dto.request;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.meetup.teame.backend.domain.experience.entity.ExperienceType;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.experience.entity.Review;
import com.meetup.teame.backend.domain.user.entity.User;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.meetup.teame.backend.domain.review.dto.response;
package com.meetup.teame.backend.domain.experience.dto.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.experience.entity.Review;
import lombok.*;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.review.dto.response;
package com.meetup.teame.backend.domain.experience.dto.response;

import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.experience.entity.Review;
import lombok.*;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.meetup.teame.backend.domain.review.dto.response;
package com.meetup.teame.backend.domain.experience.dto.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.user.entity.Gender;
import com.meetup.teame.backend.domain.experience.entity.Review;
import lombok.*;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.meetup.teame.backend.domain.review.entity;
package com.meetup.teame.backend.domain.experience.entity;

import com.meetup.teame.backend.domain.chatting.entity.Appointment;
import com.meetup.teame.backend.domain.experience.entity.Experience;
import com.meetup.teame.backend.domain.experience.entity.ExperienceType;
import com.meetup.teame.backend.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.meetup.teame.backend.domain.review.repository;
package com.meetup.teame.backend.domain.experience.repository;

import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.review.repository.custom.ReviewRepositoryCustom;
import com.meetup.teame.backend.domain.experience.entity.Review;
import com.meetup.teame.backend.domain.experience.repository.custom.ReviewRepositoryCustom;
import com.meetup.teame.backend.domain.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.meetup.teame.backend.domain.experience.repository.custom;

import com.meetup.teame.backend.domain.experience.entity.Review;

import java.util.List;

public interface ReviewRepositoryCustom {
List<Review> findReviewsByUserId(Long userId, String type);
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.meetup.teame.backend.domain.review.repository.custom;
package com.meetup.teame.backend.domain.experience.repository.custom;

import com.meetup.teame.backend.domain.experience.entity.ExperienceType;
import com.meetup.teame.backend.domain.review.entity.QReview;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.experience.entity.Review;
import com.querydsl.core.BooleanBuilder;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;

import java.util.List;

import static com.meetup.teame.backend.domain.experience.entity.QExperience.experience;
import static com.meetup.teame.backend.domain.review.entity.QReview.review;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.meetup.teame.backend.domain.review.service;
package com.meetup.teame.backend.domain.experience.service;

import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider;
import com.meetup.teame.backend.domain.review.dto.request.CreateReviewReq;
import com.meetup.teame.backend.domain.review.dto.response.ReadReviewsByMeRes;
import com.meetup.teame.backend.domain.review.dto.response.ReviewByMeRes;
import com.meetup.teame.backend.domain.review.entity.Review;
import com.meetup.teame.backend.domain.review.repository.ReviewRepository;
import com.meetup.teame.backend.domain.experience.dto.request.CreateReviewReq;
import com.meetup.teame.backend.domain.experience.dto.response.ReadReviewsByMeRes;
import com.meetup.teame.backend.domain.experience.dto.response.ReviewByMeRes;
import com.meetup.teame.backend.domain.experience.entity.Review;
import com.meetup.teame.backend.domain.experience.repository.ReviewRepository;
import com.meetup.teame.backend.domain.user.entity.User;
import com.meetup.teame.backend.domain.user.repository.UserRepository;
import com.meetup.teame.backend.global.exception.CustomException;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.meetup.teame.backend.domain.user.controller;

import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes;
import com.meetup.teame.backend.domain.review.dto.response.MyReviewRes;
import com.meetup.teame.backend.domain.experience.dto.response.MyReviewRes;
import com.meetup.teame.backend.domain.user.dto.request.MyExperienceReq;
import com.meetup.teame.backend.domain.user.dto.request.OnboardingReq;
import com.meetup.teame.backend.domain.user.dto.request.ReadCalenderReq;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.email.dto;
package com.meetup.teame.backend.domain.user.dto.request;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.register.dto;
package com.meetup.teame.backend.domain.user.dto.request;


import com.meetup.teame.backend.domain.user.entity.Gender;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.user.dto.response;

import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.user.entity.Personality;
import com.meetup.teame.backend.domain.user.entity.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Loading

0 comments on commit c2897ba

Please sign in to comment.