[TERK-102/Refactor] mbrId 관련 네이밍 수정

SSG-sausage · Jan 16, 2023 · cb2dd71 · cb2dd71
1 parent bee583d
commit cb2dd71
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,6 @@
 version: '3'
-
 services:
-  mysql:
+  mysql_member:
     container_name: mysql_member
     image: mysql/mysql-server:5.7
     environment:
@@ -11,6 +10,48 @@ services:
       MYSQL_DATABASE: "member"
     ports:
       - "3306:3306"
+    command:
+      - "mysqld"
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+  mysql_item:
+    container_name: mysql_item
+    image: mysql/mysql-server:5.7
+    environment:
+      MYSQL_ROOT_HOST: '%'
+      MYSQL_USER: "sausage"
+      MYSQL_PASSWORD: "sausage"
+      MYSQL_DATABASE: "item"
+    ports:
+      - "3307:3306"
+    command:
+      - "mysqld"
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+  mysql_order:
+    container_name: mysql_order
+    image: mysql/mysql-server:5.7
+    environment:
+      MYSQL_ROOT_HOST: '%'
+      MYSQL_USER: "sausage"
+      MYSQL_PASSWORD: "sausage"
+      MYSQL_DATABASE: "order"
+    ports:
+      - "3308:3306"
+    command:
+      - "mysqld"
+      - "--character-set-server=utf8mb4"
+      - "--collation-server=utf8mb4_unicode_ci"
+  mysql_dutch_pay:
+    container_name: mysql_dutch_pay
+    image: mysql/mysql-server:5.7
+    environment:
+      MYSQL_ROOT_HOST: '%'
+      MYSQL_USER: "sausage"
+      MYSQL_PASSWORD: "sausage"
+      MYSQL_DATABASE: "dutch_pay"
+    ports:
+      - "3309:3306"
     command:
       - "mysqld"
       - "--character-set-server=utf8mb4"

diff --git a/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrFindListResponse.java b/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrFindListResponse.java
@@ -24,7 +24,7 @@ public static MbrFindListResponse of(List<Mbr> mbrList) {
 
         return MbrFindListResponse
                 .builder()
-                .mbrMap((HashMap<Long, MbrInfo>) mbrList.stream().collect(Collectors.toMap(Mbr::getId, MbrInfo::of)))
+                .mbrMap((HashMap<Long, MbrInfo>) mbrList.stream().collect(Collectors.toMap(Mbr::getMbrId, MbrInfo::of)))
                 .build();
 
     }

diff --git a/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrFindResponse.java b/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrFindResponse.java
@@ -33,7 +33,7 @@ public class MbrFindResponse {
 
     public static MbrFindResponse of(Mbr mbr) {
         return MbrFindResponse.builder()
-                .mbrId(mbr.getId())
+                .mbrId(mbr.getMbrId())
                 .mbrLoginId(mbr.getMbrLoginId())
                 .mbrNm(mbr.getMbrNm())
                 .mbrImgUrl(mbr.getMbrImgUrl())

diff --git a/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrInfo.java b/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrInfo.java
@@ -33,7 +33,7 @@ public class MbrInfo {
 
     public static MbrInfo of(Mbr mbr) {
         return MbrInfo.builder()
-                .mbrId(mbr.getId())
+                .mbrId(mbr.getMbrId())
                 .mbrLoginId(mbr.getMbrLoginId())
                 .mbrNm(mbr.getMbrNm())
                 .mbrImgUrl(mbr.getMbrImgUrl())

diff --git a/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrLoginResponse.java b/src/main/java/com/ssg/sausagememberapi/member/dto/response/MbrLoginResponse.java
@@ -30,7 +30,7 @@ public class MbrLoginResponse {
 
     public static MbrLoginResponse of(Mbr mbr) {
         return MbrLoginResponse.builder()
-                .mbrId(mbr.getId())
+                .mbrId(mbr.getMbrId())
                 .mbrLoginId(mbr.getMbrLoginId())
                 .mbrNm(mbr.getMbrNm())
                 .mbrImgUrl(mbr.getMbrImgUrl())

diff --git a/src/main/java/com/ssg/sausagememberapi/member/entity/Mbr.java b/src/main/java/com/ssg/sausagememberapi/member/entity/Mbr.java
@@ -27,7 +27,7 @@ public class Mbr extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "MBR_ID")
-    private Long id;
+    private Long mbrId;
 
     @Column(name = "MBR_LOGIN_ID", nullable = false)
     private String mbrLoginId;