refactor: Memory -> Category 도메인명 변경 및 API URI 변경 #595

android/Staccato_AN/app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".presentation.memoryupdate.MemoryUpdateActivity"
+            android:name=".presentation.categoryupdate.CategoryUpdateActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -85,7 +85,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".presentation.memorycreation.MemoryCreationActivity"
+            android:name=".presentation.categorycreation.CategoryCreationActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

android/Staccato_AN/app/src/main/java/com/on/staccato/data/category/CategoryApiService.kt

@@ -0,0 +1,51 @@
+package com.on.staccato.data.category
+
+import com.on.staccato.data.ApiResult
+import com.on.staccato.data.dto.category.CategoriesResponse
+import com.on.staccato.data.dto.category.CategoryCreationResponse
+import com.on.staccato.data.dto.category.CategoryRequest
+import com.on.staccato.data.dto.category.CategoryResponse
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface CategoryApiService {
+    @GET(CATEGORY_PATH_WITH_ID)
+    suspend fun getCategory(
+        @Path(CATEGORY_ID) categoryId: Long,
+    ): ApiResult<CategoryResponse>
+
+    @GET(CATEGORY_PATH_WITH_CANDIDATES)
+    suspend fun getCategories(
+        @Query(CURRENT_DATE) currentDate: String?,
+    ): ApiResult<CategoriesResponse>
+
+    @POST(CATEGORIES_PATH)
+    suspend fun postCategory(
+        @Body categoryRequest: CategoryRequest,
+    ): ApiResult<CategoryCreationResponse>
+
+    @PUT(CATEGORY_PATH_WITH_ID)
+    suspend fun putCategory(
+        @Path(CATEGORY_ID) categoryId: Long,
+        @Body categoryRequest: CategoryRequest,
+    ): ApiResult<Unit>
+
+    @DELETE(CATEGORY_PATH_WITH_ID)
+    suspend fun deleteCategory(
+        @Path(CATEGORY_ID) categoryId: Long,
+    ): ApiResult<Unit>
+
+    companion object {
+        const val CATEGORIES_PATH = "/categories"
+        private const val CANDIDATES_PATH = "/candidates"
+        private const val CATEGORY_ID = "categoryId"
+        private const val CATEGORY_PATH_WITH_ID = "$CATEGORIES_PATH/{$CATEGORY_ID}"
+        private const val CATEGORY_PATH_WITH_CANDIDATES = "$CATEGORIES_PATH$CANDIDATES_PATH"
+        private const val CURRENT_DATE = "currentDate"
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/category/CategoryDataSource.kt

@@ -0,0 +1,22 @@
+package com.on.staccato.data.category
+
+import com.on.staccato.data.ApiResult
+import com.on.staccato.data.dto.category.CategoriesResponse
+import com.on.staccato.data.dto.category.CategoryCreationResponse
+import com.on.staccato.data.dto.category.CategoryResponse
+import com.on.staccato.domain.model.NewCategory
+
+interface CategoryDataSource {
+    suspend fun getCategory(categoryId: Long): ApiResult<CategoryResponse>
+
+    suspend fun getCategories(currentDate: String?): ApiResult<CategoriesResponse>
+
+    suspend fun createCategory(newCategory: NewCategory): ApiResult<CategoryCreationResponse>
+
+    suspend fun updateCategory(
+        categoryId: Long,
+        newCategory: NewCategory,
+    ): ApiResult<Unit>
+
+    suspend fun deleteCategory(categoryId: Long): ApiResult<Unit>
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/category/CategoryDefaultRepository.kt

@@ -0,0 +1,33 @@
+package com.on.staccato.data.category
+
+import com.on.staccato.data.ApiResult
+import com.on.staccato.data.dto.category.CategoryCreationResponse
+import com.on.staccato.data.dto.mapper.toDomain
+import com.on.staccato.data.handle
+import com.on.staccato.domain.model.Category
+import com.on.staccato.domain.model.CategoryCandidates
+import com.on.staccato.domain.model.NewCategory
+import com.on.staccato.domain.repository.CategoryRepository
+import javax.inject.Inject
+
+class CategoryDefaultRepository
+    @Inject
+    constructor(
+        private val categoryDataSource: CategoryDataSource,
+    ) : CategoryRepository {
+        override suspend fun getCategory(categoryId: Long): ApiResult<Category> =
+            categoryDataSource.getCategory(categoryId).handle { it.toDomain() }
+
+        override suspend fun getCategories(currentDate: String?): ApiResult<CategoryCandidates> =
+            categoryDataSource.getCategories(currentDate).handle { it.toDomain() }
+
+        override suspend fun createCategory(newCategory: NewCategory): ApiResult<CategoryCreationResponse> =
+            categoryDataSource.createCategory(newCategory).handle { it }
+
+        override suspend fun updateCategory(
+            categoryId: Long,
+            newCategory: NewCategory,
+        ): ApiResult<Unit> = categoryDataSource.updateCategory(categoryId, newCategory).handle()
+
+        override suspend fun deleteCategory(categoryId: Long): ApiResult<Unit> = categoryDataSource.deleteCategory(categoryId).handle()
+    }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/category/CategoryRemoteDataSource.kt

@@ -0,0 +1,44 @@
+package com.on.staccato.data.category
+
+import com.on.staccato.data.ApiResult
+import com.on.staccato.data.dto.category.CategoriesResponse
+import com.on.staccato.data.dto.category.CategoryCreationResponse
+import com.on.staccato.data.dto.category.CategoryResponse
+import com.on.staccato.data.dto.mapper.toDto
+import com.on.staccato.domain.model.NewCategory
+import javax.inject.Inject
+
+class CategoryRemoteDataSource
+    @Inject
+    constructor(
+        private val categoryApiService: CategoryApiService,
+    ) : CategoryDataSource {
+        override suspend fun getCategory(categoryId: Long): ApiResult<CategoryResponse> =
+            categoryApiService.getCategory(
+                categoryId,
+            )
+
+        override suspend fun getCategories(currentDate: String?): ApiResult<CategoriesResponse> =
+            categoryApiService.getCategories(
+                currentDate,
+            )
+
+        override suspend fun createCategory(newCategory: NewCategory): ApiResult<CategoryCreationResponse> =
+            categoryApiService.postCategory(
+                newCategory.toDto(),
+            )
+
+        override suspend fun updateCategory(
+            categoryId: Long,
+            newCategory: NewCategory,
+        ): ApiResult<Unit> =
+            categoryApiService.putCategory(
+                categoryId,
+                newCategory.toDto(),
+            )
+
+        override suspend fun deleteCategory(categoryId: Long): ApiResult<Unit> =
+            categoryApiService.deleteCategory(
+                categoryId,
+            )
+    }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/comment/CommentApiService.kt

@@ -13,31 +13,32 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface CommentApiService {
-    @GET(COMMENTS_URI)
+    @GET(COMMENTS_PATH_V2)
     suspend fun getComments(
         @Query(STACCATO_ID) staccatoId: Long,
     ): ApiResult<CommentsResponse>
 
-    @POST(COMMENTS_URI)
+    @POST(COMMENTS_PATH_V2)
     suspend fun postComment(
         @Body commentRequest: CommentRequest,
     ): ApiResult<Unit>
 
-    @PUT(COMMENTS_URI_WITH_COMMENT_ID)
+    @PUT(COMMENTS_PATH_WITH_COMMENT_ID)
     suspend fun putComment(
         @Path(COMMENT_ID) commentId: Long,
         @Body commentUpdateRequest: CommentUpdateRequest,
     ): ApiResult<Unit>
 
-    @DELETE(COMMENTS_URI_WITH_COMMENT_ID)
+    @DELETE(COMMENTS_PATH_WITH_COMMENT_ID)
     suspend fun deleteComment(
         @Path(COMMENT_ID) commentId: Long,
     ): ApiResult<Unit>
 
     companion object {
-        private const val COMMENTS_URI = "/comments"
-        private const val STACCATO_ID = "momentId"
+        private const val COMMENTS_PATH = "/comments"
+        private const val COMMENTS_PATH_V2 = "$COMMENTS_PATH/v2"
+        private const val STACCATO_ID = "staccatoId"
         private const val COMMENT_ID = "commentId"
-        private const val COMMENTS_URI_WITH_COMMENT_ID = "$COMMENTS_URI/{$COMMENT_ID}"
+        private const val COMMENTS_PATH_WITH_COMMENT_ID = "$COMMENTS_PATH/{$COMMENT_ID}"
     }
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoriesResponse.kt

@@ -0,0 +1,17 @@
+package com.on.staccato.data.dto.category
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CategoriesResponse(
+    @SerialName("categories") val categories: List<CategoryCandidateResponse>,
+)
+
+@Serializable
+data class CategoryCandidateResponse(
+    @SerialName("categoryId") val categoryId: Long,
+    @SerialName("categoryTitle") val categoryTitle: String,
+    @SerialName("startAt") val startAt: String,
+    @SerialName("endAt") val endAt: String,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoryCreationResponse.kt

@@ -0,0 +1,9 @@
+package com.on.staccato.data.dto.category
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CategoryCreationResponse(
+    @SerialName("categoryId") val categoryId: Long,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/memory/MemoryRequest.kt → android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoryRequest.kt

@@ -1,12 +1,12 @@
-package com.on.staccato.data.dto.memory
+package com.on.staccato.data.dto.category
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class MemoryRequest(
-    @SerialName("memoryThumbnailUrl") val memoryThumbnailUrl: String? = null,
-    @SerialName("memoryTitle") val memoryTitle: String,
+data class CategoryRequest(
+    @SerialName("categoryThumbnailUrl") val categoryThumbnailUrl: String? = null,
+    @SerialName("categoryTitle") val categoryTitle: String,
     @SerialName("description") val description: String? = null,
     @SerialName("startAt") val startAt: String? = null,
     @SerialName("endAt") val endAt: String? = null,

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/memory/MemoryResponse.kt → android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoryResponse.kt

@@ -1,17 +1,17 @@
-package com.on.staccato.data.dto.memory
+package com.on.staccato.data.dto.category
 
 import com.on.staccato.data.dto.member.MemberDto
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class MemoryResponse(
-    @SerialName("memoryId") val memoryId: Long,
-    @SerialName("memoryThumbnailUrl") val memoryThumbnailUrl: String? = null,
-    @SerialName("memoryTitle") val memoryTitle: String,
+data class CategoryResponse(
+    @SerialName("categoryId") val categoryId: Long,
+    @SerialName("categoryThumbnailUrl") val categoryThumbnailUrl: String? = null,
+    @SerialName("categoryTitle") val categoryTitle: String,
     @SerialName("startAt") val startAt: String? = null,
     @SerialName("endAt") val endAt: String? = null,
     @SerialName("description") val description: String? = null,
     @SerialName("mates") val mates: List<MemberDto>,
-    @SerialName("moments") val staccatos: List<MemoryStaccatoDto>,
+    @SerialName("staccatos") val staccatos: List<CategoryStaccatoDto>,
 )

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/memory/MemoryStaccatoDto.kt → android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoryStaccatoDto.kt

@@ -1,12 +1,12 @@
-package com.on.staccato.data.dto.memory
+package com.on.staccato.data.dto.category
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class MemoryStaccatoDto(
-    @SerialName("momentId") val staccatoId: Long,
+data class CategoryStaccatoDto(
+    @SerialName("staccatoId") val staccatoId: Long,
     @SerialName("staccatoTitle") val staccatoTitle: String,
-    @SerialName("momentImageUrl") val staccatoImageUrl: String? = null,
+    @SerialName("staccatoImageUrl") val staccatoImageUrl: String? = null,
     @SerialName("visitedAt") val visitedAt: String,
 )

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/comment/CommentRequest.kt

@@ -5,6 +5,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class CommentRequest(
-    @SerialName("momentId") val staccatoId: Long,
+    @SerialName("staccatoId") val staccatoId: Long,
     @SerialName("content") val content: String,
 )

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/mapper/CategoryMapper.kt

@@ -0,0 +1,54 @@
+package com.on.staccato.data.dto.mapper
+
+import com.on.staccato.data.dto.category.CategoriesResponse
+import com.on.staccato.data.dto.category.CategoryRequest
+import com.on.staccato.data.dto.category.CategoryResponse
+import com.on.staccato.data.dto.category.CategoryStaccatoDto
+import com.on.staccato.domain.model.Category
+import com.on.staccato.domain.model.CategoryCandidate
+import com.on.staccato.domain.model.CategoryCandidates
+import com.on.staccato.domain.model.CategoryStaccato
+import com.on.staccato.domain.model.NewCategory
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+fun CategoryResponse.toDomain() =
+    Category(
+        categoryId = categoryId,
+        categoryThumbnailUrl = categoryThumbnailUrl,
+        categoryTitle = categoryTitle,
+        startAt = startAt?.let { LocalDate.parse(startAt) },
+        endAt = endAt?.let { LocalDate.parse(endAt) },
+        description = description,
+        mates = mates.map { it.toDomain() },
+        staccatos = staccatos.map { it.toDomain() },
+    )
+
+fun CategoriesResponse.toDomain(): CategoryCandidates =
+    CategoryCandidates(
+        this.categories.map {
+            CategoryCandidate(
+                categoryId = it.categoryId,
+                categoryTitle = it.categoryTitle,
+                startAt = LocalDate.parse(it.startAt),
+                endAt = LocalDate.parse(it.endAt),
+            )
+        },
+    )
+
+fun CategoryStaccatoDto.toDomain() =
+    CategoryStaccato(
+        staccatoId = staccatoId,
+        staccatoTitle = staccatoTitle,
+        staccatoImageUrl = staccatoImageUrl,
+        visitedAt = LocalDateTime.parse(visitedAt),
+    )
+
+fun NewCategory.toDto() =
+    CategoryRequest(
+        categoryThumbnailUrl = categoryThumbnailUrl,
+        categoryTitle = categoryTitle,
+        description = description,
+        startAt = startAt?.toString(),
+        endAt = endAt?.toString(),
+    )