Dev 2

build.gradle

@@ -1,71 +1,43 @@
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.5.10'
-	id 'io.spring.dependency-management' version '1.1.7'
-	id 'org.asciidoctor.jvm.convert' version '4.0.5'
+    id 'java'
+    id 'org.springframework.boot' version '3.5.9'
+    id 'io.spring.dependency-management' version '1.1.7'
 }
 
-group = 'com.spring-study'
+group = 'com.example'
 version = '0.0.1-SNAPSHOT'
-description = '채팅 어플리케이션'
+description = 'chatting'
 
 java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
-	}
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
 }
 
 repositories {
-	mavenCentral()
-}
-
-ext {
-	set('snippetsDir', file("build/generated-snippets"))
-	set('springCloudVersion', "2025.0.1")
-	set('tanzuScgExtensionsVersion', "1.0.1")
+    mavenCentral()
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springframework.boot:spring-boot-starter-web-services'
-	implementation 'com.vmware.tanzu.springcloudgateway.extensions:access-control'
-	implementation 'org.springframework.cloud:spring-cloud-starter-gateway-server-webflux'
-	compileOnly 'org.projectlombok:lombok'
-	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	runtimeOnly 'com.mysql:mysql-connector-j'
-	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'org.springframework.boot:spring-boot-testcontainers'
-	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
-	testImplementation 'org.springframework.security:spring-security-test'
-	testImplementation 'org.testcontainers:junit-jupiter'
-	testImplementation 'org.testcontainers:mysql'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-}
-
-dependencyManagement {
-	imports {
-		mavenBom "com.vmware.tanzu.springcloudgateway.extensions:extensions-bom:${tanzuScgExtensionsVersion}"
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-	}
+    implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    compileOnly 'org.projectlombok:lombok'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5'
 }
 
 tasks.named('test') {
-	outputs.dir snippetsDir
-	useJUnitPlatform()
-}
-
-tasks.named('asciidoctor') {
-	inputs.dir snippetsDir
-	dependsOn test
+    useJUnitPlatform()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/example/chatting/ChattingApplication.java

@@ -0,0 +1,13 @@
+package com.example.chatting;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ChattingApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ChattingApplication.class, args);
+    }
+
+}

src/main/java/com/example/chatting/controller/FriendController.java

@@ -0,0 +1,44 @@
+package com.example.chatting.controller;
+
+import com.example.chatting.domain.enums.FriendEnum;
+import com.example.chatting.dto.response.FriendListResponseDto;
+import com.example.chatting.service.FriendService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/friends")
+public class FriendController {
+    private final FriendService friendService;
+
+    @GetMapping("")
+    public ResponseEntity<List<FriendListResponseDto>> getFriendList(UUID uid) {
+        return ResponseEntity.ok(friendService.getFriendList(uid));
+    }
+
+    @GetMapping("/{name}")
+    public ResponseEntity<List<FriendListResponseDto>> searchFriend(@PathVariable String name, UUID uid) {
+        return ResponseEntity.ok(friendService.searchFriend(uid, name));
+    }
+
+    @PatchMapping("/{id}/block")
+    public ResponseEntity<FriendListResponseDto> blockFriend(@PathVariable UUID id, UUID uid) {
+        return ResponseEntity.ok(friendService.blockFriend(uid, id));
+    }
+
+    @PatchMapping("/{id}/hide")
+    public ResponseEntity<FriendListResponseDto> hideFriend(@PathVariable UUID id, UUID uid) {
+        return ResponseEntity.ok(friendService.hideFriend(uid, id));
+    }
+
+    @GetMapping("/blacklist")
+    public ResponseEntity<List<FriendListResponseDto>> getBlockFriendList(UUID uid) {
+        return ResponseEntity.ok(friendService.getBlockFriendList(uid));
+    }
+
+}

src/main/java/com/example/chatting/controller/FriendRequestController.java

@@ -0,0 +1,45 @@
+package com.example.chatting.controller;
+
+import com.example.chatting.domain.FriendRequest;
+import com.example.chatting.domain.enums.FriendRequestEnum;
+import com.example.chatting.dto.request.FriendRequestDto;
+import com.example.chatting.dto.response.FriendRequestResponseDto;
+import com.example.chatting.service.FriendRequestService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/friend-requests")
+public class FriendRequestController {
+    private final FriendRequestService friendRequestService;
+
+    @PostMapping("")
+    public ResponseEntity<String> sendFriend(@RequestBody FriendRequestDto friendRequestDto, UUID uid){
+        friendRequestService.sendFriend(uid, friendRequestDto);
+        return ResponseEntity.ok("친구 요청 전송 성공");
+    }
+
+    @GetMapping("")
+    public ResponseEntity<List<FriendRequestResponseDto>> requestFriendList(UUID uid) {
+        return ResponseEntity.ok(friendRequestService.requestFriendList(uid));
+    }
+
+    @PatchMapping("/{requestId}/accept")
+    public ResponseEntity<String> acceptRequest(@PathVariable Long requestId, UUID uid) {
+        friendRequestService.acceptRequest(uid, requestId, FriendRequestEnum.ACCEPT);
+        return ResponseEntity.ok("친구 요청 수락");
+    }
+
+    @PatchMapping("/{requestId}/decline")
+    public ResponseEntity<String> declineRequest(@PathVariable Long requestId, UUID uid) {
+        friendRequestService.acceptRequest(uid, requestId, FriendRequestEnum.DECLINE);
+        return ResponseEntity.ok("친구 요청 거절");
+    }
+
+}

src/main/java/com/example/chatting/domain/Friend.java

@@ -0,0 +1,52 @@
+package com.example.chatting.domain;
+
+
+import com.example.chatting.domain.enums.FriendEnum;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicUpdate;
+
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "friend")
+@NoArgsConstructor
+@Getter
+@DynamicUpdate
+@Builder
+@AllArgsConstructor
+public class Friend {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "uid", nullable = false)
+    private User uid;
+
+    @ManyToOne
+    @JoinColumn(name = "fid", nullable = false)
+    private User fid;
+
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    @Enumerated(EnumType.STRING)
+    private FriendEnum status;
+
+    public Friend(User uid, User fid, LocalDate createdAt, FriendEnum status) {
+        this.uid = uid;
+        this.fid = fid;
+        this.createdAt = createdAt;
+        this.status = status;
+    }
+
+    public void updateStatus(FriendEnum status) {
+        this.status = status;
+    }
+}
+

src/main/java/com/example/chatting/domain/FriendRequest.java

@@ -0,0 +1,48 @@
+package com.example.chatting.domain;
+
+import com.example.chatting.domain.enums.FriendEnum;
+import com.example.chatting.domain.enums.FriendRequestEnum;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "friend_request")
+@Getter
+@NoArgsConstructor
+@Builder
+@AllArgsConstructor
+public class FriendRequest {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "requester", nullable = false)
+    private User requester; //요청 보낸 사람
+
+    @ManyToOne
+    @JoinColumn(name = "respondent", nullable = false)
+    private User respondent; //요청 받는 사람
+
+    @Enumerated(EnumType.STRING)
+    private FriendRequestEnum status;
+
+    @Column(name = "created_at")
+    private LocalDate createdAt;
+
+    public FriendRequest(LocalDate createdAt, FriendRequestEnum status, User respondent, User requester) {
+        this.createdAt = createdAt;
+        this.status = status;
+        this.respondent = respondent;
+        this.requester = requester;
+    }
+
+    public void updateStatus(FriendRequestEnum status) {
+        this.status = status;
+    }
+}