test ; 테스트

feedme/Dockerfile

@@ -27,4 +27,4 @@ RUN ./gradlew clean build -x test
 ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app/build/libs/feedme-0.0.1-SNAPSHOT.jar"]
 
 # Expose port 8080
-EXPOSE 8080
+EXPOSE 8085

feedme/build.gradle

@@ -27,6 +27,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-websocket'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	version = '0.0.1-SNAPSHOT'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	runtimeOnly 'com.h2database:h2'
@@ -59,7 +61,7 @@ dependencies {
 	//redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-	// .env 받아오기
+	// ..env 받아오기
 	implementation 'io.github.cdimascio:java-dotenv:5.2.2'
 
 	//JUnit4 추가

feedme/src/main/java/com/todoslave/feedme/DTO/AlarmSetRequestDTO.java

@@ -0,0 +1,10 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Getter;
+
+@Getter
+public class AlarmSetRequestDTO {
+
+  int alarmTime;
+
+}

feedme/src/main/java/com/todoslave/feedme/DTO/CreatureChatResponseDTO.java

@@ -0,0 +1,12 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class CreatureChatResponseDTO {
+    private LocalDate day;
+    private List<String> contents;
+}

feedme/src/main/java/com/todoslave/feedme/DTO/CreatureInfoResponseDTO.java

@@ -9,6 +9,7 @@ public class CreatureInfoResponseDTO {
 
     private String name;
     private String img;
+    private int level;
     private int exp;
     private int day;
 

feedme/src/main/java/com/todoslave/feedme/DTO/CreatureMakeRequestDTO.java

@@ -9,6 +9,8 @@ public class CreatureMakeRequestDTO {
 
     String keyword;
 
-//    MultipartFile photo;
+    // AI 구현시 이걸로 바꿔야함
+    // MultipartFile photo;
     String photo;
+
 }

feedme/src/main/java/com/todoslave/feedme/DTO/CreatureTodoResponseDTO.java

@@ -12,6 +12,5 @@ public class CreatureTodoResponseDTO {
     private String content;
     private LocalDate createdAt;
     private int isCompleted;
-
-
+//    private boolean diaryIsCompleted;
 }

feedme/src/main/java/com/todoslave/feedme/DTO/DiaryRequestDTO.java

@@ -0,0 +1,11 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+
+@Data
+public class DiaryRequestDTO {
+
+    private int skip;
+    private int limit;
+}

feedme/src/main/java/com/todoslave/feedme/DTO/DiaryResponseDTO.java

@@ -0,0 +1,14 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class DiaryResponseDTO {
+
+    private String content;
+    private LocalDateTime createdAt;
+    private String diaryImg;
+
+}

feedme/src/main/java/com/todoslave/feedme/DTO/FeedCommentDTO.java

@@ -6,6 +6,7 @@
 
 @Data
 public class FeedCommentDTO {
+    private String email;
     private int feedComentId;
     private String nickname;
     private String comment;

feedme/src/main/java/com/todoslave/feedme/DTO/FeedDTO.java

@@ -2,16 +2,20 @@
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 public class FeedDTO {
         private int feedId;
+        private String email;
         private String nickname;
         private String img;
         private String caption;
-        private String time;
+        private LocalDateTime lastCreateTime;
         private int likes;
+        private boolean myLike;
+
         private List<FeedCommentDTO> comments;
     }
 

feedme/src/main/java/com/todoslave/feedme/DTO/FeedResponseDTO.java

@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 
 @Data
@@ -14,6 +15,6 @@ public class FeedResponseDTO {
     private String author;
     private String likeCnt;
 
-    private Timestamp createdAt;
+    private LocalDateTime createdAt;
 
 }

feedme/src/main/java/com/todoslave/feedme/DTO/FriendInfoResponseDTO.java

@@ -0,0 +1,17 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FriendInfoResponseDTO {
+
+  private int friendId;
+  private String roomId;
+  private String nickname;
+  private String creatureNickname;
+  private String creatureImg;
+  private int level;
+  private int exp;
+  private int join;
+
+}

feedme/src/main/java/com/todoslave/feedme/DTO/FriendReqResponseDTO.java

@@ -1,8 +1,11 @@
 package com.todoslave.feedme.DTO;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import lombok.Data;
 
 @Data
+@JsonInclude(Include.NON_NULL)
 public class FriendReqResponseDTO {
 
   // 친구 요청 ID

feedme/src/main/java/com/todoslave/feedme/DTO/FriendReqRequestDTO.java → feedme/src/main/java/com/todoslave/feedme/DTO/FriendRequestDTO.java

@@ -1,9 +1,10 @@
 package com.todoslave.feedme.DTO;
 
+import lombok.Data;
 import lombok.Getter;
 
-@Getter
-public class FriendReqRequestDTO {
+@Data
+public class FriendRequestDTO {
 
   // 상대방 닉네임
   private String counterpartNickname;

feedme/src/main/java/com/todoslave/feedme/DTO/FriendResponseDTO.java

@@ -7,5 +7,6 @@ public class FriendResponseDTO {
 
   private int friendId;
   private String counterpartNickname;
+  private String creatureimg;
 
 }

feedme/src/main/java/com/todoslave/feedme/DTO/MemberChatMessageRequestDTO.java

@@ -5,6 +5,9 @@
 @Getter
 public class MemberChatMessageRequestDTO {
 
-  private String message;
+
+  int sendId;
+  String content;
+
 
 }

feedme/src/main/java/com/todoslave/feedme/DTO/MemberChatResponseDTO.java

@@ -0,0 +1,12 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MemberChatResponseDTO {
+    private int memberId;
+    private List<CreatureChatResponseDTO> chatData;
+
+}

feedme/src/main/java/com/todoslave/feedme/DTO/MemberSearchResponseDTO.java

@@ -6,5 +6,6 @@
 public class MemberSearchResponseDTO {
     String nickname;
     boolean isFriend;
+    boolean isRequested;
     String creatureImg;
 }

feedme/src/main/java/com/todoslave/feedme/DTO/MemberSignupRequestDTO.java

@@ -3,16 +3,18 @@
 import lombok.Data;
 
 import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class MemberSignupRequestDTO {
 
-    String email;
+    private String email;
 
-    String nickname;
+    private String nickname;
 
-    String userRole = "ROLE_USER";
-
-    Timestamp birthday;
+    private String userRole = "ROLE_USER";
 
+//    Timestamp birthday;
+    private LocalDate birthday;
 }

feedme/src/main/java/com/todoslave/feedme/DTO/MypageResponseDTO.java

@@ -5,6 +5,8 @@
 import java.time.LocalDate;
 @Data
 public class MypageResponseDTO {
+
+    private int sendId;
     private String nickname;
     private String email;
     private LocalDate brithday;

feedme/src/main/java/com/todoslave/feedme/DTO/TodoCreateRequestDTO.java

@@ -1,8 +1,9 @@
 package com.todoslave.feedme.DTO;
 
+import lombok.Data;
 import lombok.Getter;
 
-@Getter
+@Data
 public class TodoCreateRequestDTO {
 
   private String content;

feedme/src/main/java/com/todoslave/feedme/DTO/TodoDailyRequestDTO.java

@@ -1,9 +1,11 @@
 package com.todoslave.feedme.DTO;
 
 import java.time.LocalDate;
+
+import lombok.Data;
 import lombok.Getter;
 
-@Getter
+@Data
 public class TodoDailyRequestDTO {
 
   private LocalDate date;

feedme/src/main/java/com/todoslave/feedme/DTO/TodoModifyRequestDTO.java

@@ -1,8 +1,9 @@
 package com.todoslave.feedme.DTO;
 
+import lombok.Data;
 import lombok.Getter;
 
-@Getter
+@Data
 public class TodoModifyRequestDTO {
 
   private int id;

feedme/src/main/java/com/todoslave/feedme/DTO/TodoRequestDTO.java

@@ -1,9 +1,11 @@
 package com.todoslave.feedme.DTO;
 
 import java.time.LocalDate;
+
+import lombok.Data;
 import lombok.Getter;
 
-@Getter
+@Data
 public class TodoRequestDTO {
 
   private LocalDate date;

feedme/src/main/java/com/todoslave/feedme/FeedmeApplication.java

@@ -23,7 +23,7 @@ public static void main(String[] args) {
 		System.setProperty("DB_USERNAME", dotenv.get("DB_USERNAME"));
 		System.setProperty("DB_PASSWORD", dotenv.get("DB_PASSWORD"));
 		System.setProperty("JWT_SECRET_KEY", dotenv.get("JWT_SECRET_KEY"));
-
+		System.setProperty("GPT_SECRET_KEY", dotenv.get("GPT_SECRET_KEY"));
 		// Run the Spring Boot application
 		SpringApplication.run(FeedmeApplication.class, args);
 	}

feedme/src/main/java/com/todoslave/feedme/config/CorsConfig.java

@@ -11,9 +11,10 @@ public class CorsConfig implements WebMvcConfigurer{
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-            .allowedOrigins("http://localhost:8080", "null") // 'null' 오리진 허용
+            .allowedOrigins("https://i11b104.p.ssafy.io/api/", "https://i11b104.p.ssafy.io") // 'null' 오리진 허용
             .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
             .allowedHeaders("*")
             .allowCredentials(true);
     }
 }
+

feedme/src/main/java/com/todoslave/feedme/config/WebSocketConfig.java

@@ -1,3 +1,30 @@
+//package com.todoslave.feedme.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+//import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+//import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+//import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+//
+//@Configuration
+//@EnableWebSocketMessageBroker
+//public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+//
+//  @Override
+//  public void configureMessageBroker(MessageBrokerRegistry config) {
+//    config.enableSimpleBroker("/chatting", "/chatRoom");
+//    config.setApplicationDestinationPrefixes("/chat");
+//  }
+//
+//  @Override
+//  public void registerStompEndpoints(StompEndpointRegistry registry) {
+//    registry.addEndpoint("/friendChat")
+//        .setAllowedOriginPatterns("http://localhost:8080","null") // 명시적인 오리진 사용
+//        .withSockJS();
+//  }
+//}
+
+//0810 진기가 보내준 파일
 package com.todoslave.feedme.config;
 
 import org.springframework.context.annotation.Configuration;
@@ -18,8 +45,10 @@ public void configureMessageBroker(MessageBrokerRegistry config) {
 
   @Override
   public void registerStompEndpoints(StompEndpointRegistry registry) {
-    registry.addEndpoint("/friendChat")
-        .setAllowedOriginPatterns("http://localhost:8080","null") // 명시적인 오리진 사용
+    registry.addEndpoint("/ws/friendChat")
+
+        .setAllowedOriginPatterns("*")
         .withSockJS();
+
   }
-}
+}