Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#281 [chore] 패키지 구조 변경 #282

Merged
merged 5 commits into from
Jul 18, 2024
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,4 +1,4 @@
package com.asap.server.exception;
package com.asap.server.common.exception;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.exception;
package com.asap.server.common.exception;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;
import lombok.Getter;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class BadRequestException extends AsapException {
public BadRequestException(Error error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class ConflictException extends AsapException{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class ForbiddenException extends AsapException {
public ForbiddenException(Error error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.controller.dto.response.HostLoginResponseDto;
import com.asap.server.exception.Error;
import com.asap.server.presentation.controller.dto.response.HostLoginResponseDto;
import com.asap.server.common.exception.Error;
import lombok.Getter;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class InternalErrorException extends AsapException {
public InternalErrorException(final Error error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class NotFoundException extends AsapException {
public NotFoundException(Error error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class TooManyRequestException extends AsapException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.exception.model;
package com.asap.server.common.exception.model;

import com.asap.server.exception.Error;
import com.asap.server.common.exception.Error;

public class UnauthorizedException extends AsapException {
public UnauthorizedException(Error error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.config.jwt;
package com.asap.server.common.jwt;

import com.asap.server.exception.model.UnauthorizedException;
import com.asap.server.exception.Error;
import com.asap.server.common.exception.model.UnauthorizedException;
import com.asap.server.common.exception.Error;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
import io.jsonwebtoken.Header;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.config.redis;
package com.asap.server.infra.redis;

import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.common.utils;
package com.asap.server.infra.slack;

import com.slack.api.Slack;
import com.slack.api.model.block.Blocks;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.config.querydsl;
package com.asap.server.persistence.config.querydsl;

import com.querydsl.jpa.impl.JPAQueryFactory;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import java.time.LocalDateTime;
import jakarta.persistence.EntityListeners;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import com.asap.server.domain.enums.Duration;
import com.asap.server.persistence.domain.enums.Duration;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import com.asap.server.domain.enums.PlaceType;
import com.asap.server.persistence.domain.enums.PlaceType;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.enums.TimeSlot;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.enums.TimeSlot;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.FetchType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.domain;
package com.asap.server.persistence.domain;

import com.asap.server.domain.enums.Role;
import com.asap.server.persistence.domain.enums.Role;
import jakarta.persistence.FetchType;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.domain.enums;
package com.asap.server.persistence.domain.enums;

import com.asap.server.exception.Error;
import com.asap.server.exception.model.BadRequestException;
import com.asap.server.common.exception.Error;
import com.asap.server.common.exception.model.BadRequestException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.stream.Stream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.domain.enums;
package com.asap.server.persistence.domain.enums;

import com.asap.server.exception.Error;
import com.asap.server.exception.model.BadRequestException;
import com.asap.server.common.exception.Error;
import com.asap.server.common.exception.model.BadRequestException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.asap.server.domain.enums;
package com.asap.server.persistence.domain.enums;

import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.domain.enums;
package com.asap.server.persistence.domain.enums;

import com.asap.server.exception.Error;
import com.asap.server.exception.model.BadRequestException;
import com.asap.server.common.exception.Error;
import com.asap.server.common.exception.model.BadRequestException;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.repository;
package com.asap.server.persistence.repository;

import com.asap.server.domain.AvailableDate;
import com.asap.server.domain.Meeting;
import com.asap.server.persistence.domain.AvailableDate;
import com.asap.server.persistence.domain.Meeting;
import org.springframework.data.repository.Repository;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.repository;
package com.asap.server.persistence.repository;

import com.asap.server.domain.Meeting;
import com.asap.server.domain.PreferTime;
import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.PreferTime;
import org.springframework.data.repository.Repository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.asap.server.repository;
package com.asap.server.persistence.repository;

import com.asap.server.domain.TimeBlock;
import com.asap.server.domain.TimeBlockUser;
import com.asap.server.domain.User;
import com.asap.server.persistence.domain.TimeBlock;
import com.asap.server.persistence.domain.TimeBlockUser;
import com.asap.server.persistence.domain.User;
import org.springframework.data.repository.Repository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.repository.meeting;
package com.asap.server.persistence.repository.meeting;

import com.asap.server.domain.Meeting;
import com.asap.server.persistence.domain.Meeting;
import org.springframework.data.repository.Repository;

import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.repository.meeting;
package com.asap.server.persistence.repository.meeting;

import com.asap.server.domain.Meeting;
import com.asap.server.persistence.domain.Meeting;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.asap.server.repository.meeting;
package com.asap.server.persistence.repository.meeting;

import com.asap.server.domain.Meeting;
import com.querydsl.jpa.impl.JPAQueryFactory;
import lombok.RequiredArgsConstructor;
import static com.asap.server.persistence.domain.QMeeting.meeting;
import static com.asap.server.persistence.domain.QUser.user;

import com.asap.server.persistence.domain.Meeting;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.Optional;

import static com.asap.server.domain.QMeeting.meeting;
import static com.asap.server.domain.QUser.user;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public class MeetingRepositoryImpl implements MeetingRepositoryCustom {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.asap.server.repository.timeblock;
package com.asap.server.persistence.repository.timeblock;

import com.asap.server.domain.AvailableDate;
import com.asap.server.domain.TimeBlock;
import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.AvailableDate;
import com.asap.server.persistence.domain.TimeBlock;
import com.asap.server.persistence.domain.enums.TimeSlot;
import org.springframework.data.repository.Repository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.repository.timeblock;
package com.asap.server.persistence.repository.timeblock;

import com.asap.server.repository.timeblock.dto.TimeBlockDto;
import com.asap.server.persistence.repository.timeblock.dto.TimeBlockDto;
import java.util.List;

public interface TimeBlockRepositoryCustom {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.asap.server.repository.timeblock;
package com.asap.server.persistence.repository.timeblock;

import static com.asap.server.domain.QAvailableDate.availableDate;
import static com.asap.server.domain.QTimeBlock.timeBlock;
import static com.asap.server.domain.QTimeBlockUser.timeBlockUser;
import static com.asap.server.persistence.domain.QAvailableDate.availableDate;
import static com.asap.server.persistence.domain.QTimeBlock.timeBlock;
import static com.asap.server.persistence.domain.QTimeBlockUser.timeBlockUser;

import com.asap.server.repository.timeblock.dto.QTimeBlockDto;
import com.asap.server.repository.timeblock.dto.TimeBlockDto;
import com.asap.server.persistence.repository.timeblock.dto.QTimeBlockDto;
import com.asap.server.persistence.repository.timeblock.dto.TimeBlockDto;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.List;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.asap.server.repository.timeblock.dto;
package com.asap.server.persistence.repository.timeblock.dto;

import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.enums.TimeSlot;
import com.querydsl.core.annotations.QueryProjection;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.repository.user;
package com.asap.server.persistence.repository.user;

import com.asap.server.domain.Meeting;
import com.asap.server.domain.User;
import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.User;
import org.springframework.data.repository.Repository;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.asap.server.repository.user;
package com.asap.server.persistence.repository.user;

import com.asap.server.domain.Meeting;
import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.enums.TimeSlot;
import com.asap.server.service.vo.UserVo;

import java.time.LocalDate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.asap.server.repository.user;
package com.asap.server.persistence.repository.user;

import static com.asap.server.domain.QAvailableDate.availableDate;
import static com.asap.server.domain.QTimeBlock.timeBlock;
import static com.asap.server.domain.QTimeBlockUser.timeBlockUser;
import static com.asap.server.domain.QUser.user;
import static com.asap.server.persistence.domain.QAvailableDate.availableDate;
import static com.asap.server.persistence.domain.QTimeBlock.timeBlock;
import static com.asap.server.persistence.domain.QTimeBlockUser.timeBlockUser;
import static com.asap.server.persistence.domain.QUser.user;

import com.asap.server.domain.Meeting;
import com.asap.server.domain.enums.TimeSlot;
import com.asap.server.persistence.domain.Meeting;
import com.asap.server.persistence.domain.enums.TimeSlot;
import com.asap.server.service.vo.QUserVo;
import com.asap.server.service.vo.UserVo;
import com.querydsl.jpa.impl.JPAQueryFactory;
Expand Down
Loading
Loading