Developer

.gitignore

@@ -51,3 +51,9 @@ application-stage.yml
 application-prod.yml
 application-local.yml
 !/docker/elasticsearch
+/src/main/resources/firebase/
+
+## FCM
+secrets/
+secrets/
+**/firebase*.json

build.gradle

@@ -45,6 +45,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'io.github.resilience4j:resilience4j-spring-boot3:2.2.0'
+    implementation 'io.github.resilience4j:resilience4j-reactor:2.2.0'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
 
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
 
@@ -66,6 +70,10 @@ dependencies {
     annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    //FCM
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+
 }
 
 tasks.named('test') {

src/main/java/org/atdev/artrip/domain/Enum/KeywordType.java

@@ -1,6 +1,6 @@
-package org.atdev.artrip.domain.Enum;
+    package org.atdev.artrip.domain.Enum;
 
-public enum KeywordType {
-    GENRE,
-    STYLE
-}
+    public enum KeywordType {
+        GENRE,
+        STYLE
+    }

src/main/java/org/atdev/artrip/domain/Enum/Platform.java

@@ -0,0 +1,6 @@
+package org.atdev.artrip.domain.Enum;
+
+public enum Platform {
+    ANDROID,
+    IOS
+}

src/main/java/org/atdev/artrip/domain/Notification.java

@@ -7,7 +7,7 @@
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "notification", schema = "art_dev")
+@Table(name = "notification")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/org/atdev/artrip/domain/RecentExhibit.java

@@ -8,7 +8,7 @@
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "recent_exhibit", schema = "art_dev")
+@Table(name = "recent_exhibit")
 @Data
 public class RecentExhibit {
     @Id

src/main/java/org/atdev/artrip/domain/Stamp.java

@@ -7,7 +7,7 @@
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "stamp", schema = "art_dev")
+@Table(name = "stamp")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/CreateExhibitRequest.java

@@ -10,29 +10,17 @@
 @Data
 public class CreateExhibitRequest {
 
+    private Long exhibitHallId;
     private String title;
     private String description;
-
-    private Long exhibitHallId;
-    private String exhibitHallName;
-    private String address;
-    private String country;
-    private String region;
-    private String phone;
+    private String ticketUrl;
+    private String posterUrl;
 
     private LocalDateTime startDate;
     private LocalDateTime endDate;
 
-    private String openingHours;
-
     private Status status;
 
-    private String posterUrl; // 이미지 URL
-    private String ticketUrl;
-
-    private BigDecimal latitude;
-    private BigDecimal longitude;
-
     private List<Long> keywordIds;
 
 }

src/main/java/org/atdev/artrip/domain/admin/exhibit/dto/ExhibitAdminResponse.java

@@ -30,9 +30,6 @@ public class ExhibitAdminResponse {
     private String posterUrl;
     private String ticketUrl;
 
-    private BigDecimal latitude;
-    private BigDecimal longitude;
-
     private List<keywordInfo> keywords;
 
     private LocalDateTime createdAt;

src/main/java/org/atdev/artrip/domain/admin/exhibit/service/AdminExhibitService.java

@@ -71,17 +71,10 @@ public ExhibitAdminResponse getExhibit (Long exhibitId) {
     public Long createExhibit(CreateExhibitRequest request) {
         log.info("Admin Creating exhibit : title={}", request);
 
-        ExhibitHall exhibitHall = getOrCreateExhibitHall(
-                request.getExhibitHallId(),
-                request.getExhibitHallName(),
-                request.getAddress(),
-                request.getCountry(),
-                request.getRegion(),
-                request.getPhone(),
-                request.getOpeningHours());
+        ExhibitHall exhibitHall = exhibitHallRepository.findById(request.getExhibitHallId())
+                .orElseThrow(() -> new GeneralException(ExhibitError._EXHIBIT_HALL_NOT_FOUND));
 
         List<Keyword> keywords = List.of();
-
         if (request.getKeywordIds() != null && !request.getKeywordIds().isEmpty()) {
             keywords = keywordRepository.findAllById(request.getKeywordIds());
             if (keywords.size() != request.getKeywordIds().size()) {
@@ -98,8 +91,6 @@ public Long createExhibit(CreateExhibitRequest request) {
                 .status(request.getStatus())
                 .ticketUrl(request.getTicketUrl())
                 .posterUrl(request.getPosterUrl())
-                .latitude(request.getLatitude())
-                .longitude(request.getLongitude())
                 .createdAt(LocalDateTime.now())
                 .updatedAt(LocalDateTime.now())
                 .build();
@@ -242,8 +233,6 @@ public ExhibitAdminResponse convertToAdminResponse(Exhibit exhibit) {
                 .status(exhibit.getStatus())
                 .posterUrl(exhibit.getPosterUrl())
                 .ticketUrl(exhibit.getTicketUrl())
-                .latitude(exhibit.getLatitude())
-                .longitude(exhibit.getLongitude())
                 .keywords(exhibit.getKeywords().stream()
                         .map(this::convertToKeywordInfo)
                         .collect(Collectors.toList()))

src/main/java/org/atdev/artrip/domain/admin/exhibitHall/dto/CreateExhibitHallRequest.java

@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class CreateExhibitHallRequest {
 
@@ -14,4 +16,6 @@ public class CreateExhibitHallRequest {
     private String openingHours;
     private Boolean isDomestic;
     private String closedDays;
+    private BigDecimal longitude;
+    private BigDecimal latitude;
 }

src/main/java/org/atdev/artrip/domain/admin/exhibitHall/dto/ExhibitHallResponse.java

@@ -3,6 +3,8 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 @Builder
 public class ExhibitHallResponse {
@@ -18,5 +20,7 @@ public class ExhibitHallResponse {
     private Boolean isDomestic;
     private Long exhibitCount;
     private String closedDays;
+    private BigDecimal longitude;
+    private BigDecimal latitude;
 
 }

src/main/java/org/atdev/artrip/domain/admin/exhibitHall/service/AdminExhibitHallService.java

@@ -71,6 +71,8 @@ public Long createExhibitHall(CreateExhibitHallRequest request) {
                 .openingHours(request.getOpeningHours())
                 .closedDays(request.getClosedDays())
                 .isDomestic(request.getIsDomestic())
+                .longitude(request.getLongitude())
+                .latitude(request.getLatitude())
                 .createdAt(LocalDateTime.now())
                 .updatedAt(LocalDateTime.now())
                 .build();
@@ -153,6 +155,8 @@ private ExhibitHallResponse convertToResponse(ExhibitHall hall) {
                 .isDomestic(hall.getIsDomestic())
                 .exhibitCount(exhibitCount)
                 .closedDays(hall.getClosedDays())
+                .latitude(hall.getLatitude())
+                .longitude(hall.getLongitude())
                 .build();
     }
 }

src/main/java/org/atdev/artrip/domain/auth/Oauth/CustomOAuth2UserService.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.atdev.artrip.domain.Enum.Provider;
 import org.atdev.artrip.domain.Enum.Role;
-import org.atdev.artrip.domain.SocialAccounts;
+import org.atdev.artrip.domain.auth.data.SocialAccounts;
 import org.atdev.artrip.domain.auth.data.User;
 import org.atdev.artrip.domain.auth.repository.UserRepository;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

src/main/java/org/atdev/artrip/domain/SocialAccounts.java → src/main/java/org/atdev/artrip/domain/auth/data/SocialAccounts.java

@@ -1,15 +1,14 @@
-package org.atdev.artrip.domain;
+package org.atdev.artrip.domain.auth.data;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.atdev.artrip.domain.Enum.Provider;
-import org.atdev.artrip.domain.auth.data.User;
 import org.hibernate.annotations.CreationTimestamp;
 
 import java.time.LocalDateTime;
 
 @Entity
-@Table(name = "social_accounts", schema = "art_dev")
+@Table(name = "social_accounts")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/org/atdev/artrip/domain/auth/data/User.java

@@ -4,12 +4,9 @@
 import jakarta.validation.constraints.Email;
 import lombok.*;
 import org.atdev.artrip.domain.Enum.Role;
-import org.atdev.artrip.domain.SocialAccounts;
-import org.hibernate.annotations.CreationTimestamp;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +45,7 @@ public class User {
     @Column(name = "push_token")
     private String pushToken;
 
+    @Builder.Default
     @Column(nullable = false)
     private boolean onboardingCompleted=false;
 

src/main/java/org/atdev/artrip/domain/auth/jwt/JwtProvider.java

@@ -6,7 +6,6 @@
 import io.jsonwebtoken.security.Keys;
 import lombok.extern.slf4j.Slf4j;
 import org.atdev.artrip.domain.auth.jwt.exception.JwtAuthenticationException;
-import org.atdev.artrip.domain.auth.web.dto.ReissueRequest;
 import org.atdev.artrip.global.apipayload.code.status.UserError;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

src/main/java/org/atdev/artrip/domain/auth/repository/SocialRepository.java

@@ -1,6 +1,6 @@
 package org.atdev.artrip.domain.auth.repository;
 
-import org.atdev.artrip.domain.SocialAccounts;
+import org.atdev.artrip.domain.auth.data.SocialAccounts;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/org/atdev/artrip/domain/auth/service/AuthService.java

@@ -14,16 +14,16 @@
 import lombok.extern.slf4j.Slf4j;
 import org.atdev.artrip.domain.Enum.Provider;
 import org.atdev.artrip.domain.Enum.Role;
-import org.atdev.artrip.domain.SocialAccounts;
+import org.atdev.artrip.domain.auth.data.SocialAccounts;
 import org.atdev.artrip.domain.auth.data.User;
 import org.atdev.artrip.domain.auth.jwt.JwtGenerator;
 import org.atdev.artrip.domain.auth.jwt.JwtProvider;
 import org.atdev.artrip.domain.auth.jwt.JwtToken;
 import org.atdev.artrip.domain.auth.jwt.repository.RefreshTokenRedisRepository;
 import org.atdev.artrip.domain.auth.repository.UserRepository;
-import org.atdev.artrip.domain.auth.web.dto.ReissueRequest;
-import org.atdev.artrip.domain.auth.web.dto.SocialLoginResponse;
-import org.atdev.artrip.domain.auth.web.dto.SocialUserInfo;
+import org.atdev.artrip.domain.auth.web.dto.request.ReissueRequest;
+import org.atdev.artrip.domain.auth.web.dto.response.SocialLoginResponse;
+import org.atdev.artrip.domain.auth.web.dto.response.SocialUserInfo;
 import org.atdev.artrip.global.apipayload.code.status.UserError;
 import org.atdev.artrip.global.apipayload.exception.GeneralException;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +34,6 @@
 import java.net.URL;
 import java.security.interfaces.RSAPublicKey;
 import java.util.List;
-import java.util.Optional;
 
 @Slf4j
 @Service

src/main/java/org/atdev/artrip/domain/auth/web/controller/AuthController.java

@@ -1,19 +1,13 @@
 package org.atdev.artrip.domain.auth.web.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.atdev.artrip.domain.auth.jwt.JwtToken;
-import org.atdev.artrip.domain.auth.jwt.repository.RefreshTokenRedisRepository;
 import org.atdev.artrip.domain.auth.service.AuthService;
-import org.atdev.artrip.domain.auth.web.dto.ReissueRequest;
-import org.atdev.artrip.domain.auth.web.dto.SocialLoginRequest;
-import org.atdev.artrip.domain.auth.web.dto.SocialLoginResponse;
+import org.atdev.artrip.domain.auth.web.dto.request.ReissueRequest;
+import org.atdev.artrip.domain.auth.web.dto.request.SocialLoginRequest;
+import org.atdev.artrip.domain.auth.web.dto.response.SocialLoginResponse;
 import org.atdev.artrip.global.apipayload.CommonResponse;
 import org.atdev.artrip.global.apipayload.code.status.CommonError;
 import org.atdev.artrip.global.apipayload.code.status.UserError;

src/main/java/org/atdev/artrip/domain/auth/web/dto/ReissueRequest.java → src/main/java/org/atdev/artrip/domain/auth/web/dto/request/ReissueRequest.java

@@ -1,4 +1,4 @@
-package org.atdev.artrip.domain.auth.web.dto;
+package org.atdev.artrip.domain.auth.web.dto.request;
 
 import lombok.Data;
 

src/main/java/org/atdev/artrip/domain/auth/web/dto/SocialLoginRequest.java → src/main/java/org/atdev/artrip/domain/auth/web/dto/request/SocialLoginRequest.java

@@ -1,4 +1,4 @@
-package org.atdev.artrip.domain.auth.web.dto;
+package org.atdev.artrip.domain.auth.web.dto.request;
 
 import lombok.Data;
 

src/main/java/org/atdev/artrip/domain/auth/web/dto/SocialLoginResponse.java → src/main/java/org/atdev/artrip/domain/auth/web/dto/response/SocialLoginResponse.java

@@ -1,4 +1,4 @@
-package org.atdev.artrip.domain.auth.web.dto;
+package org.atdev.artrip.domain.auth.web.dto.response;
 
 
 import lombok.AllArgsConstructor;

src/main/java/org/atdev/artrip/domain/auth/web/dto/SocialUserInfo.java → src/main/java/org/atdev/artrip/domain/auth/web/dto/response/SocialUserInfo.java

@@ -1,4 +1,4 @@
-package org.atdev.artrip.domain.auth.web.dto;
+package org.atdev.artrip.domain.auth.web.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/org/atdev/artrip/domain/exhibit/data/Exhibit.java

@@ -13,7 +13,7 @@
 import java.util.Set;
 
 @Entity
-@Table(name = "exhibit", schema = "art_dev")
+@Table(name = "exhibit")
 @EntityListeners(ExhibitEntityListener.class)
 @Getter
 @Setter
@@ -59,14 +59,6 @@ public class Exhibit {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
-    @Column(name = "latitude")
-    private BigDecimal latitude;
-
-    @Column(name = "longitude")
-    private BigDecimal longitude;
-
-    //enum 생성 정렬 등등
-
     @ManyToMany
     @Builder.Default
     @JoinTable(

src/main/java/org/atdev/artrip/domain/exhibit/reponse/ExhibitDetailResponse.java

@@ -4,6 +4,8 @@
 import lombok.Getter;
 import org.atdev.artrip.domain.Enum.Status;
 
+import java.math.BigDecimal;
+
 @Getter
 @Builder
 public class ExhibitDetailResponse {
@@ -21,4 +23,7 @@ public class ExhibitDetailResponse {
     private String hallAddress;
     private String hallOpeningHours;
     private String hallPhone;
+    private Double hallLatitude;
+    private Double hallLongitude;
+
 }