diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6f2e50aa..c44e77a7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,10 +32,10 @@ android { signingConfigs { create("release") { - keyAlias = "jjbaksa_release_key" - keyPassword = "" + keyAlias = "jjbaksk_release_key" + keyPassword = getPropertyKey("keyPassword") storeFile = file("./jjbaksa.jks") - storePassword = "" + storePassword = getPropertyKey("storePassword") } } @@ -46,14 +46,16 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + isDebuggable = true } getByName("release") { isMinifyEnabled = true - signingConfig = signingConfigs.getByName("release") + // signingConfig = signingConfigs.getByName("release") proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + isDebuggable = false } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ff59496d..292049a9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,32 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile +# Don't note duplicate definition (Legacy Apche Http Client) +-dontnote android.net.http.* +-dontnote org.apache.http.** + +# Add when compile with JDK 1.7 +-keepattributes EnclosingMethod + +# Firebase Authentication +-keepattributes *Annotation* + +# Firebase Realtime database +-keepattributes Signature + +-dontwarn okhttp3.** +-dontwarn okio.** + +-dontnote okhttp3.** + +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index b2b01acd..4be8dd2c 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 1, - "versionName": "1.0.0", + "versionCode": 2, + "versionName": "1.0.1", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/util/RefreshManager.kt b/app/src/main/java/com/jjbaksa/jjbaksa/util/RefreshManager.kt index d5a7bffc..1c2cb9ea 100644 --- a/app/src/main/java/com/jjbaksa/jjbaksa/util/RefreshManager.kt +++ b/app/src/main/java/com/jjbaksa/jjbaksa/util/RefreshManager.kt @@ -22,7 +22,7 @@ object RefreshManager { level = if (BuildConfig.DEBUG) { HttpLoggingInterceptor.Level.BODY } else { - HttpLoggingInterceptor.Level.HEADERS + HttpLoggingInterceptor.Level.BODY } } val refreshHeaderInterceptor = Interceptor { chain: Interceptor.Chain -> diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index fe6c6290..383bcfeb 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -3,6 +3,7 @@ object KotlinDependencies { const val coroutine = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutineVersion}" const val inject = "javax.inject:javax.inject:1" + const val kotlin_serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinSerializationVersion}" } object AndroidXDependencies { diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 4da25ba2..2b04634d 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -41,4 +41,5 @@ object Versions { const val datastoreVersion = "1.0.0" const val glideVersion = "4.15.1" + const val kotlinSerializationVersion = "1.3.2" } diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro index ff59496d..292049a9 100644 --- a/data/proguard-rules.pro +++ b/data/proguard-rules.pro @@ -18,4 +18,32 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile +# Don't note duplicate definition (Legacy Apche Http Client) +-dontnote android.net.http.* +-dontnote org.apache.http.** + +# Add when compile with JDK 1.7 +-keepattributes EnclosingMethod + +# Firebase Authentication +-keepattributes *Annotation* + +# Firebase Realtime database +-keepattributes Signature + +-dontwarn okhttp3.** +-dontwarn okio.** + +-dontnote okhttp3.** + +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions \ No newline at end of file diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 4acf5c81..74d42589 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,3 +1,5 @@ +import ThirdPartyDependencies.gson + plugins { id("java-library") kotlin("jvm") @@ -14,6 +16,7 @@ dependencies { implementation(kotlin) implementation(inject) implementation(coroutine) + implementation(gson) } } diff --git a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/Inquiry.kt b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/Inquiry.kt index c07da6a5..60666122 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/Inquiry.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/Inquiry.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.inquiry +import com.google.gson.annotations.SerializedName + data class Inquiry( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryContent.kt index aae22348..e2baf585 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryContent.kt @@ -1,13 +1,24 @@ package com.jjbaksa.domain.model.inquiry +import com.google.gson.annotations.SerializedName + data class InquiryContent( + @SerializedName("id") val id: Long = 0, + @SerializedName("answer") val answer: String = "", + @SerializedName("content") val content: String = "", + @SerializedName("createdAt") val createdAt: String = "", + @SerializedName("createdBy") val createdBy: String = "", + @SerializedName("inquiryImages") val inquiryImages: List = emptyList(), + @SerializedName("isSecreted") val isSecreted: Int = 0, + @SerializedName("title") var title: String = "", + @SerializedName("expandable") var expandable: Boolean = false ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryImages.kt b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryImages.kt index df5e0c81..844c3572 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryImages.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/inquiry/InquiryImages.kt @@ -1,7 +1,12 @@ package com.jjbaksa.domain.model.inquiry +import com.google.gson.annotations.SerializedName + data class InquiryImages( + @SerializedName("imageUrl") val imageUrl: String = "", + @SerializedName("originalName") val originalName: String = "", + @SerializedName("path") val path: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/mainpage/UserLocation.kt b/domain/src/main/java/com/jjbaksa/domain/model/mainpage/UserLocation.kt index 23b0b61e..4affb909 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/mainpage/UserLocation.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/mainpage/UserLocation.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.mainpage +import com.google.gson.annotations.SerializedName + data class UserLocation( + @SerializedName("latitude") val latitude: Double = 37.toDouble(), + @SerializedName("longitude") val longitude: Double = 127.toDouble(), ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/post/Post.kt b/domain/src/main/java/com/jjbaksa/domain/model/post/Post.kt index 6fec3181..7b41af03 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/post/Post.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/post/Post.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.post +import com.google.gson.annotations.SerializedName + data class Post( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/post/PostContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/post/PostContent.kt index 694c84c8..6d9eb52c 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/post/PostContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/post/PostContent.kt @@ -1,7 +1,12 @@ package com.jjbaksa.domain.model.post +import com.google.gson.annotations.SerializedName + data class PostContent( + @SerializedName("id") val id: Int = 0, + @SerializedName("title") val title: String = "", + @SerializedName("createdAt") val createdAt: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/post/PostDetail.kt b/domain/src/main/java/com/jjbaksa/domain/model/post/PostDetail.kt index 1720c984..db69a559 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/post/PostDetail.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/post/PostDetail.kt @@ -1,8 +1,14 @@ package com.jjbaksa.domain.model.post +import com.google.gson.annotations.SerializedName + data class PostDetail( + @SerializedName("id") val id: Int = 0, + @SerializedName("title") val title: String = "", + @SerializedName("content") val content: String = "", + @SerializedName("createdAt") val createdAt: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShops.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShops.kt index 2d1b34ce..9ea3b1fe 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShops.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShops.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class FollowerReviewShops( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShopsContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShopsContent.kt index 684c455d..88951d61 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShopsContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/FollowerReviewShopsContent.kt @@ -1,10 +1,18 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class FollowerReviewShopsContent( + @SerializedName("id") val id: Int = 0, + @SerializedName("content") val content: String = "", + @SerializedName("rate") val rate: Int = 0, + @SerializedName("createdAt") val createdAt: String = "", + @SerializedName("userReviewResponse") val userReviewResponse: UserReview = UserReview(), + @SerializedName("shopPlaceId") val shopPlaceId: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShops.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShops.kt index 32b1f661..84b8d313 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShops.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShops.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class MyReviewShops( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShopsContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShopsContent.kt index bebd6a5c..cf053a45 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShopsContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/MyReviewShopsContent.kt @@ -1,8 +1,14 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class MyReviewShopsContent( + @SerializedName("id") val id: Int = 0, + @SerializedName("content") val content: String = "", + @SerializedName("rate") val rate: Int = 0, + @SerializedName("createdAt") val createdAt: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewImages.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewImages.kt index 4b8475e8..31113d2d 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewImages.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewImages.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class ReviewImages( + @SerializedName("originalName") val originalName: String? = "", + @SerializedName("imageUrl") val imageUrl: String? = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShop.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShop.kt index df23330e..bf78a51d 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShop.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShop.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class ReviewShop( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopContent.kt index bf8023b3..9d0696da 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopContent.kt @@ -1,10 +1,18 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class ReviewShopContent( + @SerializedName("shopId") val shopId: Int = 0, + @SerializedName("placeId") val placeId: String = "", + @SerializedName("name") val name: String = "", + @SerializedName("category") val category: String = "", + @SerializedName("scrap") val scrap: Int = 0, + @SerializedName("photos") val photos: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopDetail.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopDetail.kt index 589afc89..61f1512f 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopDetail.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopDetail.kt @@ -1,9 +1,16 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class ReviewShopDetail( + @SerializedName("id") val id: Int? = 0, + @SerializedName("content") val content: String? = "", + @SerializedName("rate") val rate: Int? = 0, + @SerializedName("createdAt") val createdAt: String? = "", + @SerializedName("reviewImages") val reviewImages: List? = emptyList(), ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopLastDate.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopLastDate.kt index 34a2db58..4c0be1cd 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopLastDate.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/ReviewShopLastDate.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName + data class ReviewShopLastDate( + @SerializedName("lastDate") val lastDate: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/review/UserReview.kt b/domain/src/main/java/com/jjbaksa/domain/model/review/UserReview.kt index f3dcbbf9..1c109e6e 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/review/UserReview.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/review/UserReview.kt @@ -1,10 +1,15 @@ package com.jjbaksa.domain.model.review +import com.google.gson.annotations.SerializedName import com.jjbaksa.domain.model.user.UserProfileImage data class UserReview( + @SerializedName("id") val id: Int = 0, + @SerializedName("account") val account: String = "", + @SerializedName("nickname") val nickname: String = "", + @SerializedName("profileImage") val profileImage: UserProfileImage = UserProfileImage() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/scrap/AddShopScrap.kt b/domain/src/main/java/com/jjbaksa/domain/model/scrap/AddShopScrap.kt index a9224f6a..8fa6c98b 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/scrap/AddShopScrap.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/scrap/AddShopScrap.kt @@ -1,9 +1,16 @@ package com.jjbaksa.domain.model.scrap +import com.google.gson.annotations.SerializedName + data class AddShopScrap( + @SerializedName("id") val id: Int = 0, + @SerializedName("createdAt") val createdAt: Long = 0, + @SerializedName("updatedAt") val updatedAt: Long = 0, + @SerializedName("directory") val directory: Int = 0, + @SerializedName("shopId") val shopId: Int = 0 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/scrap/Scraps.kt b/domain/src/main/java/com/jjbaksa/domain/model/scrap/Scraps.kt index a2e2a507..88790222 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/scrap/Scraps.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/scrap/Scraps.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.scrap +import com.google.gson.annotations.SerializedName + data class Scraps( + @SerializedName("content") val content: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/scrap/ScrapsContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/scrap/ScrapsContent.kt index eb53c4c7..7e22b6b3 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/scrap/ScrapsContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/scrap/ScrapsContent.kt @@ -1,15 +1,28 @@ package com.jjbaksa.domain.model.scrap +import com.google.gson.annotations.SerializedName + data class ScrapsContent( + @SerializedName("placeId") val placeId: String = "", + @SerializedName("name") val name: String = "", + @SerializedName("photo") val photo: String = "", + @SerializedName("category") val category: String = "", + @SerializedName("totalRating") val totalRating: Int = 0, + @SerializedName("ratingCount") val ratingCount: Int = 0, + @SerializedName("address") val address: String = "", + @SerializedName("scrapId") val scrapId: Int = 0, + @SerializedName("createdAt") val createdAt: Long = 0, + @SerializedName("updatedAt") val updatedAt: Long = 0, + @SerializedName("directory") val directory: Int = 0, ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/scrap/ShopScrap.kt b/domain/src/main/java/com/jjbaksa/domain/model/scrap/ShopScrap.kt index 785fd518..9dd27f1f 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/scrap/ShopScrap.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/scrap/ShopScrap.kt @@ -1,12 +1,22 @@ package com.jjbaksa.domain.model.scrap +import com.google.gson.annotations.SerializedName + data class ShopScrap( + @SerializedName("scrapId") val scrapId: Int = 0, + @SerializedName("placeId") val placeId: String = "", + @SerializedName("category") val category: String = "", + @SerializedName("name") val name: String = "", + @SerializedName("totalRating") val totalRating: Int = 0, + @SerializedName("ratingCount") val ratingCount: Int = 0, + @SerializedName("address") val address: String = "", + @SerializedName("photo") val photo: List = emptyList(), ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/search/AutoKeyword.kt b/domain/src/main/java/com/jjbaksa/domain/model/search/AutoKeyword.kt index d4ac4945..b316acc8 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/search/AutoKeyword.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/search/AutoKeyword.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.search +import com.google.gson.annotations.SerializedName + data class AutoKeyword( + @SerializedName("autoCompletes") val autoCompletes: List ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/search/Shop.kt b/domain/src/main/java/com/jjbaksa/domain/model/search/Shop.kt index 54bb95ed..24117dcd 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/search/Shop.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/search/Shop.kt @@ -1,16 +1,30 @@ package com.jjbaksa.domain.model.search +import com.google.gson.annotations.SerializedName + data class Shop( + @SerializedName("dist") var dist: Double = 0.0, + @SerializedName("category") var category: String = "", + @SerializedName("formattedAddress") val formattedAddress: String = "", + @SerializedName("lat") val lat: Double = 0.0, + @SerializedName("lng") val lng: Double = 0.0, + @SerializedName("name") val name: String = "", + @SerializedName("openNow") val openNow: Boolean = false, + @SerializedName("photoToken") val photoToken: String = "", + @SerializedName("placeId") val placeId: String = "", + @SerializedName("ratingCount") val ratingCount: Int = 0, + @SerializedName("totalRating") val totalRating: Int = 0, + @SerializedName("type") var type: Int = 1 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/search/ShopData.kt b/domain/src/main/java/com/jjbaksa/domain/model/search/ShopData.kt index 0a509303..d7c81aea 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/search/ShopData.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/search/ShopData.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.search +import com.google.gson.annotations.SerializedName + data class ShopData( + @SerializedName("shopQueryResponseList") val shopQueryResponseList: MutableList = mutableListOf(), + @SerializedName("pageToken") val pageToken: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/Close.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/Close.kt index 4254018e..b1b1b64b 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/Close.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/Close.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class Close( + @SerializedName("day") val day: Int = 0, + @SerializedName("time") val time: Int = 0 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/Open.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/Open.kt index e14e2e33..a70c9869 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/Open.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/Open.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class Open( + @SerializedName("day") val day: Int = 0, + @SerializedName("time") val time: Int = 0 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/Period.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/Period.kt index cb2283c1..0a4dca84 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/Period.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/Period.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class Period( + @SerializedName("close") val close: Close = Close(), + @SerializedName("open") val open: Open = Open() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt index e8050c32..4f3258cc 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopDetail.kt @@ -1,18 +1,34 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class ShopDetail( + @SerializedName("shopId") val shopId: Int = 0, + @SerializedName("placeId") val placeId: String = "", + @SerializedName("category") val category: String = "", + @SerializedName("name") val name: String = "", + @SerializedName("totalRating") val totalRating: Int = 0, + @SerializedName("ratingCount") val ratingCount: Int = 0, + @SerializedName("scrap") val scrap: Int = 0, + @SerializedName("photos") val photos: List = emptyList(), + @SerializedName("formattedAddress") val formattedAddress: String = "", + @SerializedName("formattedPhoneNumber") val formattedPhoneNumber: String = "", + @SerializedName("openNow") val openNow: Boolean = false, + @SerializedName("period") val period: List = emptyList(), + @SerializedName("lat") val lat: Double = 0.0, + @SerializedName("lng") val lng: Double = 0.0 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMaps.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMaps.kt index 16175213..423ba62e 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMaps.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMaps.kt @@ -1,5 +1,8 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class ShopsMaps( + @SerializedName("shopsMapsContent") val shopsMapsContent: List = emptyList() ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMapsContent.kt b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMapsContent.kt index 5210d7ff..ecae6c74 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMapsContent.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/shop/ShopsMapsContent.kt @@ -1,9 +1,16 @@ package com.jjbaksa.domain.model.shop +import com.google.gson.annotations.SerializedName + data class ShopsMapsContent( + @SerializedName("placeId") val placeId: String = "", + @SerializedName("name") val name: String = "", + @SerializedName("lat") val lat: Double = 0.0, + @SerializedName("lng") val lng: Double = 0.0, + @SerializedName("photo") val photo: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/FindPasswordReq.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/FindPasswordReq.kt index 20d6e2a6..3836383a 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/FindPasswordReq.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/FindPasswordReq.kt @@ -1,7 +1,12 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class FindPasswordReq( + @SerializedName("account") val account: String, + @SerializedName("email") val email: String, + @SerializedName("code") val code: String ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/Login.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/Login.kt index 1e26b514..e7eac0d1 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/Login.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/Login.kt @@ -1,8 +1,14 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class Login( + @SerializedName("accessToken") val accessToken: String = "", + @SerializedName("refreshToken") val refreshToken: String = "", + @SerializedName("errorMessage") var errorMessage: String = "", + @SerializedName("isSuccess") val isSuccess: Boolean = false ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/LoginReq.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/LoginReq.kt index cf520a99..e1143340 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/LoginReq.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/LoginReq.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class LoginReq( + @SerializedName("account") val account: String, + @SerializedName("password") val password: String ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/PasswordAndNicknameReq.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/PasswordAndNicknameReq.kt index 4fa65cd0..03f9dcad 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/PasswordAndNicknameReq.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/PasswordAndNicknameReq.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class PasswordAndNicknameReq( + @SerializedName("password") val password: String? = null, + @SerializedName("nickname") val nickname: String? = null ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpReq.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpReq.kt index 8362a8b4..ffb67704 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpReq.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpReq.kt @@ -1,8 +1,14 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class SignUpReq( + @SerializedName("account") val account: String, + @SerializedName("email") val email: String, + @SerializedName("nickname") val nickname: String, + @SerializedName("password") val password: String ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpResp.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpResp.kt index d8c847de..6fcf874d 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpResp.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/SignUpResp.kt @@ -1,10 +1,18 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class SignUpResp( + @SerializedName("account") val account: String, + @SerializedName("email") val email: String, + @SerializedName("id") val id: Long, + @SerializedName("nickname") val nickname: String, + @SerializedName("oauthType") val oauthType: String, + @SerializedName("userType") val userType: String ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/User.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/User.kt index 7fc05b67..fca48996 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/User.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/User.kt @@ -1,11 +1,20 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class User( + @SerializedName("id") val id: Long = 0, + @SerializedName("account") val account: String = "", + @SerializedName("nickname") val nickname: String = "", + @SerializedName("email") val email: String = "", + @SerializedName("profileImage") val profileImage: UserProfileImage = UserProfileImage(), + @SerializedName("userCountResponse") val userCountResponse: UserCount = UserCount(), + @SerializedName("userType") val userType: String = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/UserCount.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/UserCount.kt index bcf3ca5a..824e144d 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/UserCount.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/UserCount.kt @@ -1,7 +1,12 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class UserCount( + @SerializedName("id") val id: Long = 0, + @SerializedName("friendCount") val friendCount: Int = 0, + @SerializedName("reviewCount") val reviewCount: Int = 0 ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/UserInfo.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/UserInfo.kt index cfb1054d..7b6a5cbd 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/UserInfo.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/UserInfo.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class UserInfo( + @SerializedName("id") val id: String, + @SerializedName("email") val email: String ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/UserProfileImage.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/UserProfileImage.kt index 65fb8d78..62b0dadc 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/UserProfileImage.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/UserProfileImage.kt @@ -1,8 +1,14 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class UserProfileImage( + @SerializedName("id") val id: Long? = 0, + @SerializedName("originalName") val originalName: String? = "", + @SerializedName("path") val path: String? = "", + @SerializedName("url") val url: String? = "" ) diff --git a/domain/src/main/java/com/jjbaksa/domain/model/user/WithdrawalReasonReq.kt b/domain/src/main/java/com/jjbaksa/domain/model/user/WithdrawalReasonReq.kt index a1716749..11009cb5 100644 --- a/domain/src/main/java/com/jjbaksa/domain/model/user/WithdrawalReasonReq.kt +++ b/domain/src/main/java/com/jjbaksa/domain/model/user/WithdrawalReasonReq.kt @@ -1,6 +1,10 @@ package com.jjbaksa.domain.model.user +import com.google.gson.annotations.SerializedName + data class WithdrawalReasonReq( + @SerializedName("reason") val reason: String, + @SerializedName("discomfort") val discomfort: String )