Merge pull request #288 from ASAP-as-soon-as-possible/develop

1.2.0

README.md

@@ -1,42 +1,48 @@
-# 🔜 ASAP : AS SOON AS POSSIBLE
-최적의 회의시간대를 결정해 회의 이전 불필요한 시간적, 감정적 소비를 줄여주는 웹서비스
-
-# 👨🏻‍💻 Contributors
-|  <div align = center>강원용 </div> | <div align = center> 도소현 </div> |
-|:----------|:----------|
-|<div align = center> <img src = "https://github.com/ASAP-as-soon-as-possible/ASAP_Server/assets/79795051/f3b50777-cc04-4245-af19-826b9054c53f.png" width = "17" height = "17"/> [KWY0218](https://github.com/KWY0218) </div> |<div align = center> <img src = "https://github.com/ASAP-as-soon-as-possible/ASAP_Server/assets/79795051/f3b50777-cc04-4245-af19-826b9054c53f.png" width = "17" height = "17"/> [sohyundoh](https://github.com/sohyundoh) </div>|
-| <img src = "https://github.com/ASAP-as-soon-as-possible/ASAP_Server/assets/79795051/08d4e1e6-9f8d-4607-9394-4f58259a6e49.png" width = "250" height = "380"/>| <img src = "https://github.com/ASAP-as-soon-as-possible/ASAP_Server/assets/79795051/5d82b08d-9970-418f-8f9a-70d634839e30.png" width = "250" height = "380"/> |
-| [참여자 : 회의 가능 시간 뷰] <br/> 참여자 정보 및 회의 가능 시간 입력 API    |[링크 입장 뷰] 유효한 회의 확인 API,<br/> 토큰 유효성 확인 API |
-| [방장으로 입장] 방장 정보 입력 API  | [방장 : 회의 가능 시간 뷰] <br/> 회의 가능 시간 입력 API|
-| [방장 뷰] 최적의 회의시간 API   | [방장 뷰] 종합 일정 시간표 API  |
-| [방장 뷰] 회의 시간 확정 API| [회의 생성 뷰] 회의 생성 API |
-| [방장 뷰] 큐카드 정보 불러오는 API  |[가능 시간 입력 뷰] 선택지 제공 |
-
-# 💼 Server Architecture
-![image](https://github.com/ASAP-as-soon-as-possible/ASAP_Server/assets/79795051/d1aae75e-4ce9-4b1e-9b70-8a5ea07e37e2)
-
-# 🗂️ Directory
+### **💁‍♂️ Introduction**
+
+![image](https://github.com/user-attachments/assets/e9d91189-cecd-4f55-8a2b-9bbf4aa1045c)
+![image](https://github.com/user-attachments/assets/5ab65502-bdc4-4ab1-955b-9b23c9c5498f)
+
+
+ASAP은선호도 분석을 통해 최대 인원이 참석 가능한 회의시간을 자동으로 결정해 줌으로써, **다수가 시간을 조율하며 딜레이되는 시간을 줄여주는 서비스** 입니다.
+
+회의 관련 정보를 하나의 큐카드로 정리해 제공함으로써 회의 시간 외 추가 공지사항을 단톡방에 올리는 수고로움 또한 덜어주고자 합니다.
+
+한마디로 ASAP은 **회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽고 빠르고 간편하게 처리해주는 웹서비스**입니다.
+
+### **🚎 Architecture**
+
+![image](https://github.com/user-attachments/assets/cae98903-bc3d-4e4c-b60f-b499747b227f)
+
+
+### **📈 DataBase Schema**
+
+![image](https://github.com/user-attachments/assets/abdca3ac-b608-44fe-aa9b-c623864b7bee)
+
+
+### **🗂️ Directory**
+
 ```
-├── java
-│   └── com
-│       └── asap
-│           └── server
-│               ├── common
-│               │   ├── advice
-│               │   ├── dto
-│               │   └── utils
-│               ├── config
-│               │   ├── jwt
-│               │   ├── resolver
-│               │   │   ├── meeting
-│               │   │   └── user
-│               │   └── swagger
-│               ├── controller
-│               ├── domain
-│               │   └── enums
-│               ├── exception
-│               │   └── model
-│               ├── repository
-│               └── service
-└── test
+├─common # 각 계층에서 공통으로 사용하는 유틸리티와 예외 처리 기능을 제공합니다.
+│  ├─exception
+│  ├─jwt
+│  └─utils
+├─infra # 외부 API 통합 및 외부 시스템과의 연동 설정을 담당합니다.
+│  ├─redis
+│  └─slack
+├─persistence # 데이터베이스와의 상호작용을 위한 영속성 관련 기능을 제공합니다.
+│  ├─config
+│  ├─domain
+│  └─repository
+├─presentation # 사용자의 요청을 처리하고 응답을 반환하는 UI 관련 기능을 제공합니다.
+│  ├─common
+│  ├─config
+│  └─controller
+└─service # 애플리케이션의 핵심 비즈니스 로직을 구현합니다.
 ```
+
+### **👥 Contributors**
+
+| 강원용| 도소현|
+|:-----:|:------:|
+| [KWY0218](https://github.com/KWY0218) | [sohyundoh](https://github.com/sohyundoh) |

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.asap'
-version = '1.1.1'
+version = '1.2.0'
 
 java {
     sourceCompatibility = '17'

src/main/java/com/asap/server/exception/Error.java → src/main/java/com/asap/server/common/exception/Error.java

@@ -1,4 +1,4 @@
-package com.asap.server.exception;
+package com.asap.server.common.exception;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/com/asap/server/exception/Success.java → src/main/java/com/asap/server/common/exception/Success.java

@@ -1,4 +1,4 @@
-package com.asap.server.exception;
+package com.asap.server.common.exception;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/com/asap/server/exception/model/AsapException.java → src/main/java/com/asap/server/common/exception/model/AsapException.java

@@ -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

src/main/java/com/asap/server/exception/model/BadRequestException.java → src/main/java/com/asap/server/common/exception/model/BadRequestException.java

@@ -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) {

src/main/java/com/asap/server/exception/model/ConflictException.java → src/main/java/com/asap/server/common/exception/model/ConflictException.java

@@ -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{
 

src/main/java/com/asap/server/exception/model/ForbiddenException.java → src/main/java/com/asap/server/common/exception/model/ForbiddenException.java

@@ -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) {

src/main/java/com/asap/server/exception/model/HostTimeForbiddenException.java → src/main/java/com/asap/server/common/exception/model/HostTimeForbiddenException.java

@@ -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

src/main/java/com/asap/server/exception/model/InternalErrorException.java → src/main/java/com/asap/server/common/exception/model/InternalErrorException.java

@@ -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) {

src/main/java/com/asap/server/exception/model/NotFoundException.java → src/main/java/com/asap/server/common/exception/model/NotFoundException.java

@@ -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) {

src/main/java/com/asap/server/exception/model/TooManyRequestException.java → src/main/java/com/asap/server/common/exception/model/TooManyRequestException.java

@@ -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 {
 

src/main/java/com/asap/server/exception/model/UnauthorizedException.java → src/main/java/com/asap/server/common/exception/model/UnauthorizedException.java

@@ -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) {

src/main/java/com/asap/server/config/jwt/JwtService.java → src/main/java/com/asap/server/common/jwt/JwtService.java

@@ -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;

src/main/java/com/asap/server/config/redis/RedisConfig.java → src/main/java/com/asap/server/infra/redis/RedisConfig.java

@@ -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;

src/main/java/com/asap/server/common/utils/SlackUtil.java → src/main/java/com/asap/server/infra/slack/SlackUtil.java

@@ -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;

src/main/java/com/asap/server/config/querydsl/QueryDslConfig.java → src/main/java/com/asap/server/persistence/config/querydsl/QueryDslConfig.java

@@ -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;

src/main/java/com/asap/server/domain/AuditingTimeEntity.java → src/main/java/com/asap/server/persistence/domain/AuditingTimeEntity.java

@@ -1,4 +1,4 @@
-package com.asap.server.domain;
+package com.asap.server.persistence.domain;
 
 import java.time.LocalDateTime;
 import jakarta.persistence.EntityListeners;

src/main/java/com/asap/server/domain/AvailableDate.java → src/main/java/com/asap/server/persistence/domain/AvailableDate.java

@@ -1,4 +1,4 @@
-package com.asap.server.domain;
+package com.asap.server.persistence.domain;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

src/main/java/com/asap/server/domain/ConfirmedDateTime.java → src/main/java/com/asap/server/persistence/domain/ConfirmedDateTime.java

@@ -1,4 +1,4 @@
-package com.asap.server.domain;
+package com.asap.server.persistence.domain;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

src/main/java/com/asap/server/domain/Meeting.java → src/main/java/com/asap/server/persistence/domain/Meeting.java

@@ -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;

src/main/java/com/asap/server/domain/Place.java → src/main/java/com/asap/server/persistence/domain/Place.java

@@ -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;

src/main/java/com/asap/server/domain/TimeBlock.java → src/main/java/com/asap/server/persistence/domain/TimeBlock.java

@@ -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;

src/main/java/com/asap/server/domain/TimeBlockUser.java → src/main/java/com/asap/server/persistence/domain/TimeBlockUser.java

@@ -1,4 +1,4 @@
-package com.asap.server.domain;
+package com.asap.server.persistence.domain;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

src/main/java/com/asap/server/domain/User.java → src/main/java/com/asap/server/persistence/domain/User.java

@@ -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;

src/main/java/com/asap/server/domain/enums/Duration.java → src/main/java/com/asap/server/persistence/domain/enums/Duration.java

@@ -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;

src/main/java/com/asap/server/domain/enums/PlaceType.java → src/main/java/com/asap/server/persistence/domain/enums/PlaceType.java

@@ -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;

src/main/java/com/asap/server/domain/enums/Role.java → src/main/java/com/asap/server/persistence/domain/enums/Role.java

@@ -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;

src/main/java/com/asap/server/domain/enums/TimeSlot.java → src/main/java/com/asap/server/persistence/domain/enums/TimeSlot.java

@@ -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;

src/main/java/com/asap/server/repository/AvailableDateRepository.java → src/main/java/com/asap/server/persistence/repository/AvailableDateRepository.java

@@ -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;