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 9a1a6ae commit 03f9f95
Show file tree
Hide file tree
Showing 28 changed files with 71 additions and 95 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.meetup.teame.backend.domain.activity.entity;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.experience.entity.ExperienceType;
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 jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.meetup.teame.backend.domain.chatroom.controller;
package com.meetup.teame.backend.domain.chatting.controller;

import com.meetup.teame.backend.domain.chatroom.dto.response.ReadDirectChatRoomsRes;
import com.meetup.teame.backend.domain.chatroom.dto.response.ReadGroupChatRoomsRes;
import com.meetup.teame.backend.domain.chatroom.service.ChatRoomService;
import com.meetup.teame.backend.domain.chatting.dto.response.ReadDirectChatRoomsRes;
import com.meetup.teame.backend.domain.chatting.dto.response.ReadGroupChatRoomsRes;
import com.meetup.teame.backend.domain.chatting.service.ChatRoomService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.meetup.teame.backend.domain.chatroom.dto.response;
package com.meetup.teame.backend.domain.chatting.dto.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.meetup.teame.backend.domain.chatroom.entity.Appointment;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.Appointment;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage;
import com.meetup.teame.backend.domain.user.entity.User;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.meetup.teame.backend.domain.chatroom.dto.response;
package com.meetup.teame.backend.domain.chatting.dto.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.meetup.teame.backend.domain.chatroom.entity.Appointment;
import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.Appointment;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.dto.response;
package com.meetup.teame.backend.domain.chatting.dto.response;

import com.meetup.teame.backend.domain.user.entity.User;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.dto.response;
package com.meetup.teame.backend.domain.chatting.dto.response;

import com.meetup.teame.backend.domain.user.entity.User;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.meetup.teame.backend.domain.chatroom.entity;
package com.meetup.teame.backend.domain.chatting.entity;

import jakarta.persistence.Embeddable;
import lombok.*;
import org.hibernate.annotations.Comment;

import java.time.LocalDate;
import java.time.LocalDateTime;


@Embeddable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.entity;
package com.meetup.teame.backend.domain.chatting.entity;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.entity;
package com.meetup.teame.backend.domain.chatting.entity;

import com.meetup.teame.backend.domain.experience.entity.Experience;
import com.meetup.teame.backend.domain.user.entity.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.entity;
package com.meetup.teame.backend.domain.chatting.entity;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.meetup.teame.backend.domain.chatroom.entity;
package com.meetup.teame.backend.domain.chatting.entity;

import com.meetup.teame.backend.domain.user.entity.User;
import jakarta.persistence.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.chatroom.repository;
package com.meetup.teame.backend.domain.chatting.repository;

import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.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,10 +1,8 @@
package com.meetup.teame.backend.domain.chatroom.repository;
package com.meetup.teame.backend.domain.chatting.repository;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.repository.custom.DirectChatRoomRepositoryCustom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.repository.custom.DirectChatRoomRepositoryCustom;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;

public interface DirectChatRoomRepository extends JpaRepository<DirectChatRoom, Long>, DirectChatRoomRepositoryCustom {
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.meetup.teame.backend.domain.chatroom.repository;
package com.meetup.teame.backend.domain.chatting.repository;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatroom.repository.custom.GroupChatRoomRepositoryCustom;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.repository.custom.GroupChatRoomRepositoryCustom;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.chatroom.repository;
package com.meetup.teame.backend.domain.chatting.repository;

import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom;
import org.springframework.data.jpa.repository.JpaRepository;

public interface UserChatRoomRepository extends JpaRepository<UserChatRoom, Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meetup.teame.backend.domain.chatroom.repository.custom;
package com.meetup.teame.backend.domain.chatting.repository.custom;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
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
@@ -1,6 +1,6 @@
package com.meetup.teame.backend.domain.chatroom.repository.custom;
package com.meetup.teame.backend.domain.chatting.repository.custom;

import com.meetup.teame.backend.domain.chatroom.entity.*;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.user.entity.User;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
Expand All @@ -9,9 +9,8 @@
import java.util.List;
import java.util.Optional;

import static com.meetup.teame.backend.domain.chatroom.entity.QDirectChatRoom.directChatRoom;
import static com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom.groupChatRoom;
import static com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom.userChatRoom;
import static com.meetup.teame.backend.domain.chatting.entity.QDirectChatRoom.directChatRoom;
import static com.meetup.teame.backend.domain.chatting.entity.QUserChatRoom.userChatRoom;
import static com.meetup.teame.backend.domain.user.entity.QUser.user;

@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meetup.teame.backend.domain.chatroom.repository.custom;
package com.meetup.teame.backend.domain.chatting.repository.custom;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
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
@@ -1,19 +1,15 @@
package com.meetup.teame.backend.domain.chatroom.repository.custom;
package com.meetup.teame.backend.domain.chatting.repository.custom;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom;
import com.meetup.teame.backend.domain.user.entity.QUser;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.user.entity.User;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;

import java.time.LocalDate;
import java.util.List;

import static com.meetup.teame.backend.domain.chatroom.entity.QGroupChatRoom.groupChatRoom;
import static com.meetup.teame.backend.domain.chatroom.entity.QUserChatRoom.userChatRoom;
import static com.meetup.teame.backend.domain.chatting.entity.QGroupChatRoom.groupChatRoom;
import static com.meetup.teame.backend.domain.chatting.entity.QUserChatRoom.userChatRoom;
import static com.meetup.teame.backend.domain.user.entity.QUser.user;

@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.meetup.teame.backend.domain.chatroom.service;
package com.meetup.teame.backend.domain.chatting.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.chatroom.dto.response.DirectChatRoomRes;
import com.meetup.teame.backend.domain.chatroom.dto.response.GroupChatRoomRes;
import com.meetup.teame.backend.domain.chatroom.dto.response.ReadDirectChatRoomsRes;
import com.meetup.teame.backend.domain.chatroom.dto.response.ReadGroupChatRoomsRes;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom;
import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.repository.UserChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.dto.response.DirectChatRoomRes;
import com.meetup.teame.backend.domain.chatting.dto.response.GroupChatRoomRes;
import com.meetup.teame.backend.domain.chatting.dto.response.ReadDirectChatRoomsRes;
import com.meetup.teame.backend.domain.chatting.dto.response.ReadGroupChatRoomsRes;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom;
import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.repository.UserChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.entity.document.ChatMessage;
import com.meetup.teame.backend.domain.chatting.repository.ChattingRepository;
import com.meetup.teame.backend.domain.experience.entity.Experience;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.meetup.teame.backend.domain.chatting.service;

import com.meetup.teame.backend.domain.chatroom.entity.Appointment;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.repository.ChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.entity.Appointment;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.repository.ChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.dto.request.AppointmentChatMessageReq;
import com.meetup.teame.backend.domain.chatting.dto.request.EmoticonChatMessageReq;
import com.meetup.teame.backend.domain.chatting.dto.request.TextChatMessageReq;
Expand All @@ -21,7 +21,6 @@
import com.meetup.teame.backend.global.exception.ExceptionContent;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.meetup.teame.backend.domain.chatroom.service;
package com.meetup.teame.backend.domain.chatting.service;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
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 lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.meetup.teame.backend.domain.experience.entity;

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.user.dto.request.MyExperienceReq;
import com.meetup.teame.backend.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.meetup.teame.backend.domain.review.entity;

import com.meetup.teame.backend.domain.chatroom.entity.Appointment;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.meetup.teame.backend.domain.user.dto.response;

import com.meetup.teame.backend.domain.activity.entity.Activity;
import com.meetup.teame.backend.domain.chatroom.entity.Appointment;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import lombok.*;

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

import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom;
import lombok.*;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.meetup.teame.backend.domain.user.entity;

import com.meetup.teame.backend.domain.chatroom.entity.ChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatroom.entity.UserChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom;
import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom;
import com.meetup.teame.backend.domain.personality.Personality;
import com.meetup.teame.backend.domain.experience.entity.Experience;
import com.meetup.teame.backend.domain.like.entity.ActivityLike;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.meetup.teame.backend.domain.user.service;

import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes;
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.auth.oauth.dto.CreateUserRequest;
import com.meetup.teame.backend.domain.chatroom.repository.DirectChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.repository.GroupChatRoomRepository;
import com.meetup.teame.backend.domain.chatroom.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.chatting.entity.GroupChatRoom;
import com.meetup.teame.backend.domain.experience.entity.Experience;
import com.meetup.teame.backend.domain.experience.entity.ExperienceType;
import com.meetup.teame.backend.domain.experience.repository.ExperienceRepository;
import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository;
import com.meetup.teame.backend.domain.personality.Personality;
Expand Down

0 comments on commit 03f9f95

Please sign in to comment.