Merge pull request #5 from KAKAO-TOUR-API-CONTEST/develop

fix : table absorption

build.gradle

@@ -46,7 +46,16 @@ dependencies {
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
     //implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    compileOnly 'org.projectlombok:lombok'
+	// graphQL 클래스, 인터페이스를 제공하는 라이브러리
+	implementation 'com.graphql-java-kickstart:graphql-spring-boot-starter:11.0.0'
+	runtimeOnly 'com.graphql-java-kickstart:graphiql-spring-boot-starter:11.0.0'
+	// graphQL 쿼리 요청에 사용되는 라이브러리
+	implementation 'com.graphql-java-kickstart:playground-spring-boot-starter:11.0.0'
+
+
+
+
+	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/com/example/ai_jeju/controller/PhotoBookController.java

@@ -2,5 +2,10 @@
 
 public class PhotoBookController {
 
+    //공유하기 버튼 누르면 (만료시간이 포함된 링크 생성하기)
+
+
+
+
 
 }

src/main/java/com/example/ai_jeju/domain/Stay.java

@@ -19,11 +19,11 @@ public class Stay {
     @Column(name = "name", updatable = false, unique = true)
     String name;
 
-    @Column(name = "latitude", updatable = false, unique = true)
-    double latitude;
+    @Column(name = "mapX", updatable = false, unique = true)
+    double mapX;
 
-    @Column(name = "longitude", updatable = false, unique = true)
-    double longitude;
+    @Column(name = "mapY", updatable = false, unique = true)
+    double mapY;
 
     @Column(name = "address", updatable = false, unique = true)
     String address;

src/main/java/com/example/ai_jeju/domain/Store.java

@@ -0,0 +1,76 @@
+package com.example.ai_jeju.domain;
+
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Table(name="stores")
+@NoArgsConstructor(access= AccessLevel.PROTECTED) //기본생성자
+@Getter
+@Entity
+@AllArgsConstructor // 모든 필드를 초기화하는 생성자
+@Builder // 빌더 패턴
+public class Store {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "storeId", updatable = false, unique = true)
+    private Long storeId;
+
+    @Column(name = "name",updatable = false)
+    String name;
+
+    //이미지 소스
+    @Column(name = "imgSrc",updatable = false)
+    boolean imgSrc;
+
+    @Column(name = "address",updatable = false)
+    String address;
+
+
+    @Column(name = "mapX",updatable = false)
+    double mapX;
+
+    @Column(name = "mapY",updatable = false)
+    double mapY;
+
+
+
+
+    /**
+     카테고리 value
+     1 : 숙박
+     2 : 음식점
+     3 : 레져
+     */
+
+    //유모차 대여여부
+    @Column(name = "stroller",updatable = false)
+    boolean stroller;
+
+    //유모차 편의성
+    @Column(name = "strollerVal",updatable = false)
+    int strollerVal;
+
+    //아이 스페어 체어
+    @Column(name = "babySpareChair",updatable = false)
+    boolean babySpareChair;
+
+    //아이 놀이방
+    @Column(name = "playground",updatable = false)
+    boolean playground;
+
+    //노키즈존 여부
+    @Column(name = "noKidsZone",updatable = false)
+    boolean noKidsZone;
+
+    @Column(name = "categoryId",updatable = false)
+    int categoryId;
+
+    @Column(name = "operationTime",updatable = false)
+    String operationTime;
+
+    @Column(name = "tel",updatable = false)
+    String tel;
+
+}

src/main/java/com/example/ai_jeju/dto/ChildRequest.java

@@ -0,0 +1,15 @@
+package com.example.ai_jeju.dto;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import lombok.Getter;
+
+@Getter
+public class ChildRequest {
+
+
+    private String birthDate;
+    private String childName;
+    private Boolean gender;
+    private long childProfile;
+}

src/main/java/com/example/ai_jeju/dto/SignUpRequest.java

@@ -15,7 +15,10 @@ public class SignUpRequest {
     private String email;
     private String profile;
     private String provider;
-    //함께 보낼 동반 아동에 대한 정보 -> 여러명일 수도 있으므로 배열 형식으로 받는다.
-    private List<Child> child;
+    /**
+     * 함께 보낼 동반 아동에 대한 정보 -> 여러명일 수도 있으므로 배열 형식으로 받는다.
+     * private List<Child> child;
+     */
+    private List<ChildRequest> child;
 
 }

src/main/java/com/example/ai_jeju/handler/SignUpHandler.java

@@ -3,6 +3,7 @@
 import com.example.ai_jeju.domain.Child;
 import com.example.ai_jeju.domain.RefreshToken;
 import com.example.ai_jeju.domain.User;
+import com.example.ai_jeju.dto.ChildRequest;
 import com.example.ai_jeju.dto.SignUpRequest;
 import com.example.ai_jeju.generator.NickNameGenerator;
 import com.example.ai_jeju.jwt.TokenProvider;
@@ -63,7 +64,7 @@ public String successHadler(HttpServletRequest request,
         String accessToken = tokenProvider.generateToken(newUser, REFRESH_TOKEN_DURATION);
         /*-------------------------------------------*/
         //동반아동
-        List<Child> childList = signUpRequest.getChild();
+        List<ChildRequest> childList = signUpRequest.getChild();
         for(int i=0; i<childList.size(); i++){
             Child child = Child.builder()
                     .userId(newUser.getId())

src/main/java/com/example/ai_jeju/service/UserService.java

@@ -3,6 +3,7 @@
 import com.example.ai_jeju.domain.Child;
 import com.example.ai_jeju.domain.RefreshToken;
 import com.example.ai_jeju.domain.User;
+import com.example.ai_jeju.dto.ChildRequest;
 import com.example.ai_jeju.dto.WithdrawRequest;
 import com.example.ai_jeju.dto.SignUpRequest;
 import com.example.ai_jeju.generator.NickNameGenerator;
@@ -69,7 +70,6 @@ public String signUp( SignUpRequest signUpRequest, HttpServletRequest request, H
 
         // db에 회원정보 없음 -> 새로운 회원 추가
         else{
-
             return successHadler(request,response,signUpRequest);
         }
     }
@@ -162,9 +162,10 @@ public String successHadler(HttpServletRequest request,
         String accessToken = tokenProvider.generateToken(newUser, REFRESH_TOKEN_DURATION);
         /*-------------------------------------------*/
         //동반아동
-        List<Child> childList = signUpRequest.getChild();
+        List<ChildRequest> childList = signUpRequest.getChild();
         for(int i=0; i<childList.size(); i++){
             Child child = Child.builder()
+                    //유저 아이디의 값 그대로 주기.
                     .userId(newUser.getId())
                     .childName(childList.get(i).getChildName())
                     .birthDate(childList.get(i).getBirthDate())

src/main/resources/application.properties

@@ -30,3 +30,6 @@ spring.cloud.aws.credentials.accessKey=${AWS_ACCESS_KEY_ID}
 spring.cloud.aws.credentials.secretKey=${AWS_SECRET_KEY}
 spring.cloud.aws.s3.bucket=ai-jeju
 spring.cloud.aws.region.static=ap-northeast-2
+
+#graphQL ?? ??
+spring.graphql.graphiql.enabled=true