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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.manchui.domain.controller;
package com.manchui.domain.auth.controller;

import com.manchui.domain.dto.JoinDTO;
import com.manchui.domain.dto.NameDTO;
import com.manchui.domain.service.JoinService;
import com.manchui.domain.auth.dto.JoinDTO;
import com.manchui.domain.auth.dto.NameDTO;
import com.manchui.domain.auth.service.JoinService;
import com.manchui.global.response.SuccessResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.controller;
package com.manchui.domain.auth.controller;

import com.manchui.domain.service.Oauth2Service;
import com.manchui.domain.auth.service.Oauth2Service;
import com.manchui.global.response.SuccessResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.controller;
package com.manchui.domain.auth.controller;

import com.manchui.domain.service.ReissueService;
import com.manchui.domain.auth.service.ReissueService;
import com.manchui.global.response.SuccessResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.dto;
package com.manchui.domain.auth.dto;

import com.manchui.domain.entity.User;
import com.manchui.domain.user.entity.User;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto;
package com.manchui.domain.auth.dto;

import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto;
package com.manchui.domain.auth.dto;

import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto;
package com.manchui.domain.auth.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.manchui.domain.service;
package com.manchui.domain.auth.service;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.entity.User;
import com.manchui.domain.repository.UserRepository;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.user.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.manchui.domain.service;
package com.manchui.domain.auth.service;

import com.manchui.domain.dto.JoinDTO;
import com.manchui.domain.dto.NameDTO;
import com.manchui.domain.entity.User;
import com.manchui.domain.repository.UserRepository;
import com.manchui.domain.auth.dto.JoinDTO;
import com.manchui.domain.auth.dto.NameDTO;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.user.repository.UserRepository;
import com.manchui.global.exception.CustomException;
import com.manchui.global.exception.ErrorCode;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.manchui.domain.service;
package com.manchui.domain.auth.service;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.manchui.domain.entity.Image;
import com.manchui.domain.entity.User;
import com.manchui.domain.service.ImageServiceImpl;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.repository.ImageRepository;
import com.manchui.domain.repository.UserRepository;
import com.manchui.domain.user.repository.UserRepository;
import com.manchui.global.exception.CustomException;
import com.manchui.global.exception.ErrorCode;
import com.manchui.global.jwt.JWTUtil;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.service;
package com.manchui.domain.auth.service;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.service;
package com.manchui.domain.auth.service;

import com.manchui.global.exception.CustomException;
import com.manchui.global.exception.ErrorCode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.manchui.domain.controller;
package com.manchui.domain.chat.controller;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.dto.chat.*;
import com.manchui.domain.service.ChatMessageService;
import com.manchui.domain.service.ChatRoomService;
import com.manchui.domain.chat.dto.*;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.chat.service.ChatMessageService;
import com.manchui.domain.chat.service.ChatRoomService;
import com.manchui.global.response.SuccessResponse;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import com.manchui.domain.entity.mongodb.ChatMessageType;
import com.manchui.domain.chat.entity.mongodb.ChatMessageType;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.dto.chat;
package com.manchui.domain.chat.dto;

import com.manchui.domain.dto.UserInfo;
import com.manchui.domain.user.dto.UserInfo;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.entity.mongodb;
package com.manchui.domain.chat.entity.mongodb;

import jakarta.persistence.Id;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.entity.mongodb;
package com.manchui.domain.chat.entity.mongodb;

public enum ChatMessageType {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.manchui.domain.entity;
package com.manchui.domain.chat.entity.mysql;

import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.manchui.domain.entity;
package com.manchui.domain.chat.entity.mysql;

import com.manchui.domain.user.entity.User;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.repository;
package com.manchui.domain.chat.repository;

import com.manchui.domain.entity.ChatRoom;
import com.manchui.domain.chat.entity.mysql.ChatRoom;
import org.springframework.data.jpa.repository.JpaRepository;

public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.manchui.domain.repository;
package com.manchui.domain.chat.repository;


import com.manchui.domain.entity.ChatRoom;
import com.manchui.domain.entity.ChatRoomUser;
import com.manchui.domain.entity.User;
import com.manchui.domain.chat.entity.mysql.ChatRoom;
import com.manchui.domain.chat.entity.mysql.ChatRoomUser;
import com.manchui.domain.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.repository.mongodb;
package com.manchui.domain.chat.repository.mongodb;

import com.manchui.domain.entity.mongodb.ChatMessage;
import com.manchui.domain.chat.entity.mongodb.ChatMessage;
import org.bson.types.ObjectId;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.manchui.domain.service;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.dto.chat.ChatMessageRequest;
import com.manchui.domain.dto.chat.ChatMessageResponse;
import com.manchui.domain.dto.chat.ChatMessageSliceResponse;
import com.manchui.domain.entity.mongodb.ChatMessageType;
import com.manchui.domain.entity.ChatRoom;
import com.manchui.domain.entity.ChatRoomUser;
import com.manchui.domain.entity.User;
import com.manchui.domain.entity.mongodb.ChatMessage;
import com.manchui.domain.repository.ChatRoomRepository;
import com.manchui.domain.repository.ChatRoomUserRepository;
import com.manchui.domain.repository.UserRepository;
import com.manchui.domain.repository.mongodb.ChatMessageRepository;
package com.manchui.domain.chat.service;

import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.chat.dto.ChatMessageRequest;
import com.manchui.domain.chat.dto.ChatMessageResponse;
import com.manchui.domain.chat.dto.ChatMessageSliceResponse;
import com.manchui.domain.chat.entity.mongodb.ChatMessageType;
import com.manchui.domain.chat.entity.mysql.ChatRoom;
import com.manchui.domain.chat.entity.mysql.ChatRoomUser;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.chat.entity.mongodb.ChatMessage;
import com.manchui.domain.chat.repository.ChatRoomRepository;
import com.manchui.domain.chat.repository.ChatRoomUserRepository;
import com.manchui.domain.user.repository.UserRepository;
import com.manchui.domain.chat.repository.mongodb.ChatMessageRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.bson.types.ObjectId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
package com.manchui.domain.service;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.dto.UserInfo;
import com.manchui.domain.dto.chat.ChatRoomListDetail;
import com.manchui.domain.dto.chat.ChatRoomListResponse;
import com.manchui.domain.dto.chat.ChatRoomUserListResponse;
package com.manchui.domain.chat.service;

import com.manchui.domain.chat.entity.mysql.ChatRoom;
import com.manchui.domain.chat.entity.mysql.ChatRoomUser;
import com.manchui.domain.chat.repository.ChatRoomRepository;
import com.manchui.domain.chat.repository.ChatRoomUserRepository;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.user.dto.UserInfo;
import com.manchui.domain.chat.dto.ChatRoomListDetail;
import com.manchui.domain.chat.dto.ChatRoomListResponse;
import com.manchui.domain.chat.dto.ChatRoomUserListResponse;
import com.manchui.domain.entity.*;
import com.manchui.domain.entity.mongodb.ChatMessage;
import com.manchui.domain.chat.entity.mongodb.ChatMessage;
import com.manchui.domain.repository.*;
import com.manchui.domain.repository.mongodb.ChatMessageRepository;
import com.manchui.domain.chat.repository.mongodb.ChatMessageRepository;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.user.repository.UserRepository;
import com.manchui.global.exception.CustomException;
import com.manchui.global.exception.ErrorCode;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.controller;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.dto.gathering.*;
import com.manchui.domain.service.GatheringService;
import com.manchui.global.response.SuccessResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.controller;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.dto.review.ReviewCreateRequest;
import com.manchui.domain.dto.review.ReviewCreateResponse;
import com.manchui.domain.dto.review.ReviewDetailPagingResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.manchui.domain.dto.gathering;

import com.manchui.domain.entity.ChatRoom;
import com.manchui.domain.chat.entity.mysql.ChatRoom;
import com.manchui.domain.entity.Gathering;
import com.manchui.domain.entity.User;
import com.manchui.domain.user.entity.User;
import jakarta.validation.constraints.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.manchui.domain.dto.gathering;

import com.manchui.domain.entity.ChatRoom;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.dto.gathering;

import com.manchui.domain.dto.UserInfo;
import com.manchui.domain.user.dto.UserInfo;
import com.manchui.domain.dto.review.ReviewDetailPagingResponse;
import com.manchui.domain.entity.Gathering;
import lombok.AllArgsConstructor;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/manchui/domain/entity/Attendance.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.manchui.domain.entity;

import com.manchui.domain.user.entity.User;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/manchui/domain/entity/Gathering.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.manchui.domain.entity;

import com.manchui.domain.chat.entity.mysql.ChatRoom;
import com.manchui.domain.dto.gathering.ClosedGatheringInfoResponse;
import com.manchui.domain.dto.gathering.GatheringCreateResponse;
import com.manchui.domain.user.entity.User;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
import jakarta.validation.constraints.Max;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/manchui/domain/entity/Heart.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.manchui.domain.entity;

import com.manchui.domain.user.entity.User;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/manchui/domain/entity/Review.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.manchui.domain.dto.review.ReviewCreateRequest;
import com.manchui.domain.dto.review.ReviewCreateResponse;
import com.manchui.domain.user.entity.User;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.notification.controller;

import com.manchui.domain.dto.CustomUserDetails;
import com.manchui.domain.auth.dto.CustomUserDetails;
import com.manchui.domain.notification.dto.NotificationCursorPagingResponse;
import com.manchui.domain.notification.service.NotificationService;
import com.manchui.global.response.SuccessResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.notification.entity;

import com.manchui.domain.entity.User;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.notification.dto.NotificationResponse;
import com.manchui.global.entity.Timestamped;
import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.notification.repository;

import com.manchui.domain.entity.User;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.notification.entity.Notification;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.manchui.domain.notification.service;

import com.manchui.domain.entity.User;
import com.manchui.domain.user.entity.User;
import com.manchui.domain.notification.dto.NotificationCursorPagingResponse;
import com.manchui.domain.notification.entity.NotificationType;
import org.springframework.stereotype.Service;
Expand Down
Loading