Skip to content

Commit 2b19399

Browse files
esadakcamesadakcam
committed
Remove user microservice
1 parent c65755f commit 2b19399

File tree

16 files changed

+80
-296
lines changed

16 files changed

+80
-296
lines changed

‎server/api-gw/build.gradle.kts‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎server/apigw/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dependencies {
2+
implementation("org.springframework.cloud:spring-cloud-starter-gateway-mvc")
3+
implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
4+
}

server/api-gw/src/main/java/com/continiousdisappointment/apigw/ApiGwApplication.java renamed to server/apigw/src/main/java/com/continiousdisappointment/apigw/ApiGwApplication.java

File renamed without changes.

server/user/src/main/java/com/continiousdisappointment/chat/domain/User.java renamed to server/apigw/src/main/java/com/continiousdisappointment/apigw/domain/User.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.continiousdisappointment.user.domain;
1+
package com.continiousdisappointment.apigw.domain;
22

33
public record User(Integer id, String username) {
44
public User {

server/user/src/main/java/com/continiousdisappointment/chat/service/UserService.java renamed to server/apigw/src/main/java/com/continiousdisappointment/apigw/service/UserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.continiousdisappointment.user.service;
1+
package com.continiousdisappointment.apigw.service;
22

33
import org.springframework.http.*;
44
import org.springframework.security.core.Authentication;

server/api-gw/src/main/resources/application.yaml renamed to server/apigw/src/main/resources/application.yaml

File renamed without changes.

server/api-gw/src/test/java/com/continiousdisappointment/apigw/ApiGwApplicationTests.java renamed to server/apigw/src/test/java/com/continiousdisappointment/apigw/ApiGwApplicationTests.java

File renamed without changes.

‎server/build.gradle.kts‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
plugins {
2-
java
3-
id("org.springframework.boot") version "3.4.5"
4-
id("io.spring.dependency-management") version "1.1.7"
2+
id("org.springframework.boot") version "3.2.5" apply false
3+
id("io.spring.dependency-management") version "1.1.4" apply false
4+
id("java")
55
}
66

7-
group = "com.continiousdisappointment"
8-
version = "0.0.1-SNAPSHOT"
7+
subprojects {
8+
apply(plugin = "java")
9+
apply(plugin = "org.springframework.boot")
10+
apply(plugin = "io.spring.dependency-management")
911

10-
java {
11-
toolchain {
12-
languageVersion = JavaLanguageVersion.of(21)
13-
}
14-
}
12+
group = "com.continuousdisappointment"
13+
version = "0.0.1-SNAPSHOT"
1514

16-
configurations {
17-
compileOnly {
18-
extendsFrom(configurations.annotationProcessor.get())
19-
}
20-
}
15+
java {
16+
sourceCompatibility = JavaVersion.VERSION_21
17+
}
2118

22-
repositories {
23-
mavenCentral()
24-
}
19+
repositories {
20+
mavenCentral()
21+
}
2522

26-
extra["springCloudVersion"] = "2024.0.1"
27-
28-
dependencies {
29-
implementation("org.springframework.boot:spring-boot-starter-actuator")
30-
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
31-
implementation("org.springframework.boot:spring-boot-starter-web")
32-
implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
33-
implementation("org.springframework.cloud:spring-cloud-starter-gateway-mvc")
34-
compileOnly("org.projectlombok:lombok")
35-
annotationProcessor("org.projectlombok:lombok")
36-
testImplementation("org.springframework.boot:spring-boot-starter-test")
37-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
38-
}
23+
dependencies {
24+
implementation("org.springframework.boot:spring-boot-starter-web")
25+
implementation("org.springframework.boot:spring-boot-starter-actuator")
26+
compileOnly("org.projectlombok:lombok")
27+
annotationProcessor("org.projectlombok:lombok")
3928

40-
dependencyManagement {
41-
imports {
42-
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
43-
}
44-
}
29+
testImplementation("org.springframework.boot:spring-boot-starter-test")
30+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
31+
}
32+
33+
tasks.withType<org.springframework.boot.gradle.tasks.bundling.BootJar> {
34+
enabled = true
35+
}
36+
37+
tasks.withType<org.springframework.boot.gradle.tasks.run.BootRun> {
38+
enabled = true
39+
}
4540

46-
tasks.withType<Test> {
47-
useJUnitPlatform()
41+
tasks.withType<Test> {
42+
useJUnitPlatform()
43+
}
4844
}

‎server/chat/build.gradle.kts‎

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,3 @@
1-
plugins {
2-
java
3-
id("org.springframework.boot") version "3.4.5"
4-
id("io.spring.dependency-management") version "1.1.7"
5-
}
6-
7-
group = "com.continiousdisappointment"
8-
version = "0.0.1-SNAPSHOT"
9-
10-
java {
11-
toolchain {
12-
languageVersion = JavaLanguageVersion.of(21)
13-
}
14-
}
15-
16-
configurations {
17-
compileOnly {
18-
extendsFrom(configurations.annotationProcessor.get())
19-
}
20-
}
21-
22-
repositories {
23-
mavenCentral()
24-
}
25-
26-
extra["springCloudVersion"] = "2024.0.1"
27-
281
dependencies {
29-
implementation("org.springframework.boot:spring-boot-starter-actuator")
302
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
31-
implementation("org.springframework.boot:spring-boot-starter-web")
32-
implementation("org.springframework.security:spring-security-oauth2-core")
33-
compileOnly("org.projectlombok:lombok")
34-
annotationProcessor("org.projectlombok:lombok")
35-
testImplementation("org.springframework.boot:spring-boot-starter-test")
36-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
37-
}
38-
39-
dependencyManagement {
40-
imports {
41-
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
42-
}
43-
}
44-
45-
tasks.withType<Test> {
46-
useJUnitPlatform()
47-
}
3+
}

‎server/chat/src/main/java/com/continiousdisappointment/chat/controller/ChatController.java‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.http.ResponseEntity;
55

66
import com.continiousdisappointment.chat.service.ChatService;
7-
import com.continiousdisappointment.chat.service.UserService;
87
import com.continiousdisappointment.chat.domain.chat.Chat;
98
import com.continiousdisappointment.chat.domain.chat.Message;
109
import com.continiousdisappointment.chat.domain.chat.Role;
@@ -19,46 +18,48 @@
1918
@RequiredArgsConstructor
2019
@RequestMapping("/chat")
2120
public class ChatController {
22-
private final ChatService chatService;
23-
private final UserService userService;
21+
// private final ChatService chatService;
2422

25-
@GetMapping
26-
public ResponseEntity<List<Chat>> getChats() {
27-
var user = userService.getUserInfo();
28-
return ResponseEntity.ok(chatService.getChatsOfUser(user.id()));
29-
}
23+
// @GetMapping
24+
// public ResponseEntity<List<Chat>> getChats() {
25+
// var user = userService.getUserInfo();
26+
// return ResponseEntity.ok(chatService.getChatsOfUser(user.id()));
27+
// }
3028

31-
@GetMapping("/{chatId}")
32-
public ResponseEntity<Chat> getChat(@PathVariable String chatId) {
33-
var user = userService.getUserInfo();
34-
return ResponseEntity.ok(chatService.getChatById(user.id(), chatId));
35-
}
29+
// @GetMapping("/{chatId}")
30+
// public ResponseEntity<Chat> getChat(@PathVariable String chatId) {
31+
// var user = userService.getUserInfo();
32+
// return ResponseEntity.ok(chatService.getChatById(user.id(), chatId));
33+
// }
3634

37-
@PostMapping
38-
public ResponseEntity<Chat> createChat(@RequestBody CreateChatDto dto) {
39-
var user = userService.getUserInfo();
40-
return ResponseEntity.ok(chatService.createChat(user.id(), dto.title()));
41-
}
35+
// @PostMapping
36+
// public ResponseEntity<Chat> createChat(@RequestBody CreateChatDto dto) {
37+
// var user = userService.getUserInfo();
38+
// return ResponseEntity.ok(chatService.createChat(user.id(), dto.title()));
39+
// }
4240

43-
@PutMapping("/{chatId}")
44-
public ResponseEntity<Chat> updateChat(
45-
@PathVariable("chatId") String chatId,
46-
@RequestParam String title) {
47-
var user = userService.getUserInfo();
48-
return ResponseEntity.ok(chatService.updateChat(user.id(), chatId, title));
49-
}
41+
// @PutMapping("/{chatId}")
42+
// public ResponseEntity<Chat> updateChat(
43+
// @PathVariable("chatId") String chatId,
44+
// @RequestParam String title) {
45+
// var user = userService.getUserInfo();
46+
// return ResponseEntity.ok(chatService.updateChat(user.id(), chatId, title));
47+
// }
5048

51-
@DeleteMapping("/{chatId}")
52-
public ResponseEntity<Void> deleteChat(@PathVariable("chatId") String chatId) {
53-
var user = userService.getUserInfo();
54-
chatService.deleteChat(user.id(), chatId);
55-
return ResponseEntity.ok().build();
56-
}
49+
// @DeleteMapping("/{chatId}")
50+
// public ResponseEntity<Void> deleteChat(@PathVariable("chatId") String chatId)
51+
// {
52+
// var user = userService.getUserInfo();
53+
// chatService.deleteChat(user.id(), chatId);
54+
// return ResponseEntity.ok().build();
55+
// }
5756

58-
@PostMapping("/{chatId}/messages")
59-
public ResponseEntity<Message> addMessage(@PathVariable("chatId") String chatId,
60-
@RequestBody AddMessageToChatDto dto) {
61-
var user = userService.getUserInfo();
62-
return ResponseEntity.ok(chatService.addMessageToChat(user.id(), chatId, dto.content(), Role.USER));
63-
}
57+
// @PostMapping("/{chatId}/messages")
58+
// public ResponseEntity<Message> addMessage(@PathVariable("chatId") String
59+
// chatId,
60+
// @RequestBody AddMessageToChatDto dto) {
61+
// var user = userService.getUserInfo();
62+
// return ResponseEntity.ok(chatService.addMessageToChat(user.id(), chatId,
63+
// dto.content(), Role.USER));
64+
// }
6465
}

0 commit comments

Comments
 (0)