MJU-SW-Contest-2024 · HamBeomJoon · Aug 5, 2024 · Aug 4, 2024 · Aug 5, 2024 · Aug 5, 2024
diff --git a/.DS_Store b/.DS_Store
diff --git a/Nabi/.gitignore b/Nabi/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+
diff --git a/Nabi/data/src/main/java/com/nabi/data/datasource/DiaryRemoteDataSource.kt b/Nabi/data/src/main/java/com/nabi/data/datasource/DiaryRemoteDataSource.kt
@@ -2,9 +2,13 @@ package com.nabi.data.datasource
 
 import com.nabi.data.model.BaseResponse
 import com.nabi.data.model.PageableResponse
+import com.nabi.data.model.diary.AddDiaryRequestDTO
+import com.nabi.data.model.diary.AddDiaryResponseDTO
 import com.nabi.data.model.diary.DiaryDetailResponseDTO
 import com.nabi.data.model.diary.ResponseMonthDiaryDTO
 import com.nabi.data.model.diary.SearchDiaryResponseDTO
+import com.nabi.data.model.diary.UpdateDiaryRequestDTO
+import com.nabi.data.model.diary.UpdateDiaryResponseDTO
 
 interface DiaryRemoteDataSource {
     suspend fun getMonthlyDiary(
@@ -19,5 +23,19 @@ interface DiaryRemoteDataSource {
         sort: String
     ): Result<BaseResponse<PageableResponse<SearchDiaryResponseDTO>>>
 
-    suspend fun getDiaryDetail(accessToken: String, diaryId: Int): Result<BaseResponse<DiaryDetailResponseDTO>>
+    suspend fun getDiaryDetail(
+        accessToken: String,
+        diaryId: Int
+    ): Result<BaseResponse<DiaryDetailResponseDTO>>
+
+    suspend fun addDiary(
+        accessToken: String,
+        body: AddDiaryRequestDTO
+    ): Result<BaseResponse<AddDiaryResponseDTO>>
+
+    suspend fun updateDiary(
+        accessToken: String,
+        id: Int,
+        body: UpdateDiaryRequestDTO
+    ): Result<BaseResponse<UpdateDiaryResponseDTO>>
 }
diff --git a/Nabi/data/src/main/java/com/nabi/data/datasourceImpl/DiaryRemoteDataSourceImpl.kt b/Nabi/data/src/main/java/com/nabi/data/datasourceImpl/DiaryRemoteDataSourceImpl.kt
@@ -3,9 +3,13 @@ package com.nabi.data.datasourceImpl
 import com.nabi.data.datasource.DiaryRemoteDataSource
 import com.nabi.data.model.BaseResponse
 import com.nabi.data.model.PageableResponse
+import com.nabi.data.model.diary.AddDiaryRequestDTO
+import com.nabi.data.model.diary.AddDiaryResponseDTO
 import com.nabi.data.model.diary.DiaryDetailResponseDTO
 import com.nabi.data.model.diary.ResponseMonthDiaryDTO
 import com.nabi.data.model.diary.SearchDiaryResponseDTO
+import com.nabi.data.model.diary.UpdateDiaryRequestDTO
+import com.nabi.data.model.diary.UpdateDiaryResponseDTO
 import com.nabi.data.service.DiaryService
 import javax.inject.Inject
 
@@ -80,4 +84,49 @@ class DiaryRemoteDataSourceImpl @Inject constructor(
             Result.failure(e)
         }
     }
+
+    override suspend fun addDiary(
+        accessToken: String,
+        body: AddDiaryRequestDTO
+    ): Result<BaseResponse<AddDiaryResponseDTO>> {
+        return try {
+            val response = diaryService.addDiary(accessToken, body)
+
+            if (response.isSuccessful) {
+                val diaryResponse = response.body()
+                if (diaryResponse != null) {
+                    Result.success(diaryResponse)
+                } else {
+                    Result.failure(Exception("Add Diary Fail: response body is null"))
+                }
+            } else {
+                Result.failure(Exception("Add Diary fail: ${response.message()}"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun updateDiary(
+        accessToken: String,
+        id: Int,
+        body: UpdateDiaryRequestDTO
+    ): Result<BaseResponse<UpdateDiaryResponseDTO>> {
+        return try {
+            val response = diaryService.updateDiary(accessToken, id, body)
+
+            if (response.isSuccessful) {
+                val diaryResponse = response.body()
+                if (diaryResponse != null) {
+                    Result.success(diaryResponse)
+                } else {
+                    Result.failure(Exception("Update Diary Fail: response body is null"))
+                }
+            } else {
+                Result.failure(Exception("Update Diary Fail: ${response.message()}"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
 }
diff --git a/Nabi/data/src/main/java/com/nabi/data/mapper/HomeMapper.kt b/Nabi/data/src/main/java/com/nabi/data/mapper/HomeMapper.kt
@@ -15,7 +15,7 @@ object HomeMapper {
                     RecentFiveDiary(
                         content = diary.content,
                         diaryEntryDate = diary.diaryEntryDate,
-                        emotion = diary.emotion
+                        emotion = diary.emotion ?: ""
                     )
                 }
             )

diff --git a/Nabi/data/src/main/java/com/nabi/data/model/diary/AddDiaryRequestDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/diary/AddDiaryRequestDTO.kt
@@ -0,0 +1,6 @@
+package com.nabi.data.model.diary
+
+data class AddDiaryRequestDTO(
+    val content: String,
+    val diaryEntryDate: String
+)
diff --git a/Nabi/data/src/main/java/com/nabi/data/model/diary/AddDiaryResponseDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/diary/AddDiaryResponseDTO.kt
@@ -0,0 +1,13 @@
+package com.nabi.data.model.diary
+
+
+import com.google.gson.annotations.SerializedName
+
+data class AddDiaryResponseDTO(
+    @SerializedName("content")
+    val content: String,
+    @SerializedName("diaryEntryDate")
+    val diaryEntryDate: String,
+    @SerializedName("id")
+    val id: Int
+)
diff --git a/Nabi/data/src/main/java/com/nabi/data/model/diary/UpdateDiaryRequestDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/diary/UpdateDiaryRequestDTO.kt
@@ -0,0 +1,5 @@
+package com.nabi.data.model.diary
+
+data class UpdateDiaryRequestDTO (
+    val content: String
+)
diff --git a/Nabi/data/src/main/java/com/nabi/data/model/diary/UpdateDiaryResponseDTO.kt b/Nabi/data/src/main/java/com/nabi/data/model/diary/UpdateDiaryResponseDTO.kt
@@ -0,0 +1,15 @@
+package com.nabi.data.model.diary
+
+
+import com.google.gson.annotations.SerializedName
+
+data class UpdateDiaryResponseDTO(
+    @SerializedName("content")
+    val content: String,
+    @SerializedName("diaryEntryDate")
+    val diaryEntryDate: String,
+    @SerializedName("DiaryId")
+    val diaryId: Int,
+    @SerializedName("userId")
+    val userId: Int
+)
diff --git a/Nabi/data/src/main/java/com/nabi/data/repository/DiaryRepositoryImpl.kt b/Nabi/data/src/main/java/com/nabi/data/repository/DiaryRepositoryImpl.kt
@@ -2,9 +2,13 @@ package com.nabi.data.repository
 
 import com.nabi.data.datasource.DiaryRemoteDataSource
 import com.nabi.data.mapper.DiaryMapper
+import com.nabi.data.model.diary.AddDiaryRequestDTO
+import com.nabi.data.model.diary.UpdateDiaryRequestDTO
 import com.nabi.domain.model.PageableInfo
+import com.nabi.domain.model.diary.AddDiaryInfo
 import com.nabi.domain.model.diary.DiaryInfo
 import com.nabi.domain.model.diary.SearchDiary
+import com.nabi.domain.model.diary.UpdateDiaryInfo
 import com.nabi.domain.repository.DiaryRepository
 import javax.inject.Inject
 
@@ -50,13 +54,24 @@ class DiaryRepositoryImpl @Inject constructor(
             if (res != null) {
                 val data = res.data
                 if (data != null) {
-                    val pageableInfo = PageableInfo(totalPages = data.totalPages, totalElements = data.totalElements, elementSize = data.size, currentPageNumber = data.number, isLastPage = data.last)
+                    val pageableInfo = PageableInfo(
+                        totalPages = data.totalPages,
+                        totalElements = data.totalElements,
+                        elementSize = data.size,
+                        currentPageNumber = data.number,
+                        isLastPage = data.last
+                    )
 
-                    if(data.size == 0) {
+                    if (data.size == 0) {
                         Result.success(Pair(pageableInfo, emptyList()))
-                    }
-                    else {
-                        val searchDiaryList = data.content.map { SearchDiary(it.previewContent, it.diaryEntryDate, it.diaryId) }
+                    } else {
+                        val searchDiaryList = data.content.map {
+                            SearchDiary(
+                                it.previewContent,
+                                it.diaryEntryDate,
+                                it.diaryId
+                            )
+                        }
                         Result.success(Pair(pageableInfo, searchDiaryList))
                     }
                 } else {
@@ -78,14 +93,16 @@ class DiaryRepositoryImpl @Inject constructor(
             if (res != null) {
                 val data = res.data
                 if (data != null) {
-                    Result.success(DiaryInfo(
-                        content = data.content,
-                        diaryId = data.diaryId,
-                        nickname = data.nickname,
-                        emotion = data.emotion,
-                        diaryEntryDate = data.diaryEntryDate,
-                        isBookmarked = data.isBookmarked
-                    ))
+                    Result.success(
+                        DiaryInfo(
+                            content = data.content,
+                            diaryId = data.diaryId,
+                            nickname = data.nickname,
+                            emotion = data.emotion,
+                            diaryEntryDate = data.diaryEntryDate,
+                            isBookmarked = data.isBookmarked
+                        )
+                    )
                 } else {
                     Result.failure(Exception("Month diary List data is null"))
                 }
@@ -96,4 +113,64 @@ class DiaryRepositoryImpl @Inject constructor(
             Result.failure(result.exceptionOrNull() ?: Exception("Unknown error"))
         }
     }
+
+    override suspend fun addDiary(
+        accessToken: String,
+        content: String,
+        diaryEntryDate: String
+    ): Result<AddDiaryInfo> {
+        val result =
+            diaryRemoteDataSource.addDiary(accessToken, AddDiaryRequestDTO(content, diaryEntryDate))
+
+        return if (result.isSuccess) {
+            val res = result.getOrNull()
+            if (res != null) {
+                val data = res.data
+                if (data != null) {
+                    val addDiaryInfo = AddDiaryInfo(
+                        content = data.content,
+                        diaryEntryDate = data.diaryEntryDate
+                    )
+                    Result.success(addDiaryInfo)
+                } else {
+                    Result.failure(Exception("Add Diary Failed: data is null"))
+                }
+            } else {
+                Result.failure(Exception("Add Diary Failed: response body is null"))
+            }
+        } else {
+            Result.failure(result.exceptionOrNull() ?: Exception("Unknown error"))
+        }
+    }
+
+    override suspend fun updateDiary(
+        accessToken: String,
+        id: Int,
+        content: String
+    ): Result<UpdateDiaryInfo> {
+        val result =
+            diaryRemoteDataSource.updateDiary(accessToken, id, UpdateDiaryRequestDTO(content))
+
+        return if (result.isSuccess) {
+            val res = result.getOrNull()
+            if (res != null) {
+                val data = res.data
+                if (data != null) {
+                    val updateDiaryInfo = UpdateDiaryInfo(
+                        diaryId = data.diaryId,
+                        content = data.content,
+                        diaryEntryDate = data.diaryEntryDate
+                    )
+                    Result.success(updateDiaryInfo)
+                } else {
+                    Result.failure(Exception("Update Diary Failed: data is null"))
+                }
+            } else {
+                Result.failure(Exception("Update Diary Failed: response body is null"))
+            }
+        } else {
+            Result.failure(result.exceptionOrNull() ?: Exception("Unknown error"))
+        }
+    }
+
 }
diff --git a/Nabi/data/src/main/java/com/nabi/data/service/DiaryService.kt b/Nabi/data/src/main/java/com/nabi/data/service/DiaryService.kt
@@ -1,13 +1,22 @@
 package com.nabi.data.service
 
 import com.nabi.data.model.BaseResponse
+import com.nabi.data.model.MessageResponseDTO
 import com.nabi.data.model.PageableResponse
+import com.nabi.data.model.auth.SignInRequestDTO
+import com.nabi.data.model.diary.AddDiaryRequestDTO
+import com.nabi.data.model.diary.AddDiaryResponseDTO
 import com.nabi.data.model.diary.DiaryDetailResponseDTO
 import com.nabi.data.model.diary.ResponseMonthDiaryDTO
 import com.nabi.data.model.diary.SearchDiaryResponseDTO
+import com.nabi.data.model.diary.UpdateDiaryRequestDTO
+import com.nabi.data.model.diary.UpdateDiaryResponseDTO
 import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
+import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -34,4 +43,17 @@ interface DiaryService {
         @Header("Authorization") accessToken: String,
         @Path("diaryId") diaryId: Int
     ): Response<BaseResponse<DiaryDetailResponseDTO>>
+
+    @POST("/diarys")
+    suspend fun addDiary(
+        @Header("Authorization") accessToken: String,
+        @Body body: AddDiaryRequestDTO
+    ): Response<BaseResponse<AddDiaryResponseDTO>>
+
+    @PATCH("/diarys/{id}")
+    suspend fun updateDiary(
+        @Header("Authorization") accessToken: String,
+        @Path("id") id: Int,
+        @Body body: UpdateDiaryRequestDTO
+    ): Response<BaseResponse<UpdateDiaryResponseDTO>>
 }
diff --git a/Nabi/domain/src/main/java/com/nabi/domain/model/diary/AddDiaryInfo.kt b/Nabi/domain/src/main/java/com/nabi/domain/model/diary/AddDiaryInfo.kt
@@ -0,0 +1,6 @@
+package com.nabi.domain.model.diary
+
+data class AddDiaryInfo(
+    val content: String,
+    val diaryEntryDate: String
+)
diff --git a/Nabi/domain/src/main/java/com/nabi/domain/model/diary/UpdateDiaryInfo.kt b/Nabi/domain/src/main/java/com/nabi/domain/model/diary/UpdateDiaryInfo.kt
@@ -0,0 +1,7 @@
+package com.nabi.domain.model.diary
+
+data class UpdateDiaryInfo(
+    val diaryId: Int,
+    val content: String,
+    val diaryEntryDate: String
+)
diff --git a/Nabi/domain/src/main/java/com/nabi/domain/repository/DiaryRepository.kt b/Nabi/domain/src/main/java/com/nabi/domain/repository/DiaryRepository.kt
@@ -1,8 +1,10 @@
 package com.nabi.domain.repository
 
 import com.nabi.domain.model.PageableInfo
+import com.nabi.domain.model.diary.AddDiaryInfo
 import com.nabi.domain.model.diary.DiaryInfo
 import com.nabi.domain.model.diary.SearchDiary
+import com.nabi.domain.model.diary.UpdateDiaryInfo
 
 interface DiaryRepository {
     suspend fun getMonthlyDiary(accessToken: String, year: Int, month: Int): Result<List<DiaryInfo>>
@@ -16,4 +18,16 @@ interface DiaryRepository {
     ): Result<Pair<PageableInfo, List<SearchDiary>>>
 
     suspend fun getDiaryDetail(accessToken: String, diaryId: Int): Result<DiaryInfo>
+
+    suspend fun addDiary(
+        accessToken: String,
+        content: String,
+        diaryEntryDate: String
+    ): Result<AddDiaryInfo>
+
+    suspend fun updateDiary(
+        accessToken: String,
+        id: Int,
+        content: String
+    ): Result<UpdateDiaryInfo>
 }
diff --git a/Nabi/domain/src/main/java/com/nabi/domain/usecase/diary/AddDiaryUseCase.kt b/Nabi/domain/src/main/java/com/nabi/domain/usecase/diary/AddDiaryUseCase.kt
@@ -0,0 +1,14 @@
+package com.nabi.domain.usecase.diary
+
+import com.nabi.domain.model.diary.AddDiaryInfo
+import com.nabi.domain.repository.DiaryRepository
+
+class AddDiaryUseCase(private val repository: DiaryRepository) {
+    suspend operator fun invoke(
+        accessToken: String,
+        content: String,
+        diaryEntryDate: String
+    ): Result<AddDiaryInfo> {
+        return repository.addDiary("Bearer $accessToken", content, diaryEntryDate)
+    }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@
		.externalNativeBuild
		.cxx
		local.properties