Merge branch 'develop' into feature/526

Nexters · Nov 3, 2024 · 485bd87 · 485bd87
2 parents cc2af92 + da26443
commit 485bd87
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/api/src/main/kotlin/com/nexters/bottles/api/bottle/controller/BottleControllerV2.kt b/api/src/main/kotlin/com/nexters/bottles/api/bottle/controller/BottleControllerV2.kt
@@ -42,7 +42,7 @@ class BottleControllerV2(
 
     // TODO: 따닥 방지
     @ApiOperation("마이페이지 - 추가로 보틀 받기")
-    @GetMapping("/additional-random")
+    @PostMapping("/additional-random")
     @AuthRequired
     fun getAdditionalRandomBottle(@AuthUserId userId: Long) {
         return bottleFacadeV2.getAdditionalRandomBottle(userId)

diff --git a/api/src/main/kotlin/com/nexters/bottles/api/user/facade/UserFacade.kt b/api/src/main/kotlin/com/nexters/bottles/api/user/facade/UserFacade.kt
@@ -54,7 +54,8 @@ class UserFacade(
             userId = userId,
             alimyTurnedOn = nativeAlimyRequest.alimyTurnedOn,
             deviceName = nativeAlimyRequest.deviceName,
-            appVersion = nativeAlimyRequest.appVersion
+            appVersion = nativeAlimyRequest.appVersion,
+            deviceId = nativeAlimyRequest.deviceId,
         )
     }
 }
diff --git a/api/src/main/kotlin/com/nexters/bottles/api/user/facade/dto/NativeSettingRegisterRequest.kt b/api/src/main/kotlin/com/nexters/bottles/api/user/facade/dto/NativeSettingRegisterRequest.kt
@@ -4,5 +4,6 @@ data class NativeSettingRegisterRequest(
     val alimyTurnedOn: Boolean = false,
     val deviceName: String? = null,
     val appVersion: String? = null,
+    val deviceId: String? = null,
 ) {
 }
diff --git a/api/src/main/resources/sql/ddl/table_query.sql b/api/src/main/resources/sql/ddl/table_query.sql
@@ -16,10 +16,11 @@ CREATE TABLE user
     is_match_activated      BOOLEAN      DEFAULT TRUE              NOT NULL comment '매칭 활성화 여부',
     last_random_matched_at  DATETIME     DEFAULT CURRENT_TIMESTAMP comment '유저의 최근 랜덤 매칭 시간으로, 랜덤 매칭시 갱신',
     is_notification_enabled tinyint(1)  default 0                 not null comment '핸드폰 알림 허용 여부',
-    device_name             varchar(255) null,
-    app_version             varchar(255) null,
-    created_at              DATETIME     DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    updated_at              DATETIME     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL
+    device_name             varchar(255)                          null,
+    app_version             varchar(255)                          null,
+    deviceId                varchar(255)                          null,
+    created_at             DATETIME     DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at             DATETIME     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL
 ) AUTO_INCREMENT = 10;
 
 CREATE TABLE user_profile

diff --git a/app/src/main/kotlin/com/nexters/bottles/app/user/domain/User.kt b/app/src/main/kotlin/com/nexters/bottles/app/user/domain/User.kt
@@ -57,6 +57,8 @@ class User(
 
     var deviceName: String? = null,
 
+    var deviceId: String? = null,
+
     var appVersion: String? = null,
 ) : BaseEntity() {
 

diff --git a/app/src/main/kotlin/com/nexters/bottles/app/user/service/UserService.kt b/app/src/main/kotlin/com/nexters/bottles/app/user/service/UserService.kt
@@ -173,11 +173,12 @@ class UserService(
     }
 
     @Transactional
-    fun changeNativeSetting(userId: Long, alimyTurnedOn: Boolean, deviceName: String?, appVersion: String?) {
+    fun changeNativeSetting(userId: Long, alimyTurnedOn: Boolean, deviceName: String?, appVersion: String?, deviceId: String?) {
         userRepository.findByIdOrNull(userId)?.let {
             it.isNotificationEnabled = alimyTurnedOn
             it.appVersion = appVersion
             it.deviceName = deviceName
+            it.deviceId = deviceId
         }
     }
 }