Merge pull request #80 from ttoklip/develop

메인업데이트

.gitignore

@@ -12,6 +12,7 @@ build
 captures
 .externalNativeBuild
 .cxx
+google-services.json
 local.properties
 .idea
 constant.xml

README.md

@@ -0,0 +1,17 @@
+![in1.png](https://raw.githubusercontent.com/ttoklip/BackEnd/main/introduce/in1.png)
+
+![in2.png](https://raw.githubusercontent.com/ttoklip/BackEnd/main/introduce/in2.png)
+
+![in3.png](https://raw.githubusercontent.com/ttoklip/BackEnd/main/introduce/in3.png)
+
+![in4.png](https://raw.githubusercontent.com/ttoklip/BackEnd/main/introduce/in4.png)
+
+
+## 아키텍쳐 
+<img width="755" alt="hangunhee39_ttoklip_architecure" src="https://github.com/ttoklip/Android/assets/77563098/c3640f5d-ea24-46bd-807b-023127e81ea0">
+
+
+## 맴버 
+|              [한건희](https://github.com/hangunhee39)                |              [김규진](https://github.com/kyujin0911)                |            [박승연](https://github.com/40food)                      |             [심영수](https://github.com/posite)                    |
+|:------------------------------------------------------------------:|:------------------------------------------------------------------:|:------------------------------------------------------------------:|:---------------------------------------------------------------:|
+| 24.01. ~  | 24.01. ~ | 24.01. ~ | 24.01. ~ 24.02. |

app/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'kotlin-kapt'
     id 'com.google.dagger.hilt.android'
     id 'dagger.hilt.android.plugin'
+    id 'com.google.gms.google-services'
 }
 
 Properties properties = new Properties()
@@ -119,6 +120,9 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
 
+    implementation platform('com.google.firebase:firebase-bom:32.7.2')
+    implementation 'com.google.firebase:firebase-messaging-ktx'
+
     //flexBox(flexLayout)
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 

app/src/main/AndroidManifest.xml

@@ -10,6 +10,9 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission
+        android:name="android.permission.POST_NOTIFICATIONS"
+        android:minSdkVersion="33" />
 
     <application
         android:name=".TtoklipApplication"
@@ -23,6 +26,7 @@
         android:theme="@style/Theme.Ttoklip"
         android:usesCleartextTraffic="true"
         tools:targetApi="31"
+        android:enableOnBackInvokedCallback="true"
         android:requestLegacyExternalStorage="true">
 
         <meta-data
@@ -103,35 +107,46 @@
             android:name=".presentation.signup.SignupActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.hometown.TogetherActivity"
+            android:name=".presentation.hometown.together.TogetherActivity"
             android:screenOrientation="portrait"
             android:exported="false" />
         <activity
-            android:name=".presentation.hometown.CommunicationActivity"
+            android:name=".presentation.hometown.communication.CommunicationActivity"
             android:screenOrientation="portrait"
             android:exported="false" />
         <activity
-            android:name=".presentation.hometown.WriteTogetherActivity"
+            android:name=".presentation.hometown.together.write.WriteTogetherActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
         <activity
-            android:name=".presentation.hometown.WriteCommunicationActivity"
+            android:name=".presentation.hometown.communication.write.WriteCommunicationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
         <activity
-            android:name=".presentation.hometown.ReadCommunicationActivity"
+            android:name=".presentation.hometown.communication.read.ReadCommunicationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
-            android:exported="false" />
+            android:exported="true" />
         <activity
             android:name=".presentation.hometown.TradeLocationActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
+
+        <activity
+            android:name=".presentation.otheruser.OtherUserActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.otheruser.OtherTipActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan"
+            android:exported="false" />
         <activity
-            android:name=".presentation.hometown.ReadTogetherActivity"
+            android:name=".presentation.hometown.together.read.ReadTogetherActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
@@ -221,6 +236,15 @@
 
         <activity android:name=".presentation.honeytip.read.ReadQuestionActivity" />
 
+        <service
+            android:name=".util.TtoklipFirebaseMessagingService"
+            android:enabled="true"
+            android:exported="true"
+            android:stopWithTask="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>

app/src/main/java/com/umc/ttoklip/data/api/FCMApi.kt

@@ -0,0 +1,15 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.CommonResponse
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.fcm.FCMTokenRequest
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.PATCH
+
+interface FCMApi {
+    @PATCH("/api/v1/notification/fcm_token")
+    suspend fun patchFCMToken(
+        @Body request : FCMTokenRequest
+    ): Response<ResponseBody<CommonResponse>>
+}

app/src/main/java/com/umc/ttoklip/data/api/HomeApi.kt

@@ -2,12 +2,19 @@ package com.umc.ttoklip.data.api
 
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.home.HomeResponse
+import com.umc.ttoklip.data.model.home.NotificationResponse
 import retrofit2.Response
 import retrofit2.http.GET
+import retrofit2.http.Query
 
 interface HomeApi {
 
     @GET("/api/v1/home")
     suspend fun getHomeMainApi(): Response<ResponseBody<HomeResponse>>
 
+    @GET("/api/v1/notification/my-notification")
+    suspend fun getNotifications(
+        @Query("notificationCategory") category: String
+    ): Response<ResponseBody<NotificationResponse>>
+
 }

app/src/main/java/com/umc/ttoklip/data/api/HoneyTipApi.kt

@@ -33,7 +33,7 @@ interface HoneyTipApi {
         @Part("title") title: RequestBody,
         @Part("content") content: RequestBody,
         @Part("category") category: RequestBody,
-        @Part images: Array<MultipartBody.Part>,
+        @Part images: List<MultipartBody.Part?>,
         @Part("url") url: RequestBody
     ): Response<ResponseBody<CreateHoneyTipResponse>>
 
@@ -68,7 +68,7 @@ interface HoneyTipApi {
         @Part("title") title: RequestBody,
         @Part("content") content: RequestBody,
         @Part("category") category: RequestBody,
-        @Part images: Array<MultipartBody.Part>,
+        @Part images: List<MultipartBody.Part?>,
         @Part("url") url: RequestBody
     ): Response<ResponseBody<CreateHoneyTipResponse>>
 
@@ -96,7 +96,7 @@ interface HoneyTipApi {
         @Part("title") title: RequestBody,
         @Part("content") content: RequestBody,
         @Part("category") category: RequestBody,
-        @Part images: Array<MultipartBody.Part>
+        @Part images: List<MultipartBody.Part?>
     ): Response<ResponseBody<CreateHoneyTipResponse>>
 
     @GET("/api/v1/question/post/{postId}")

app/src/main/java/com/umc/ttoklip/data/api/KakaoApi.kt

@@ -2,7 +2,10 @@ package com.umc.ttoklip.data.api
 
 import com.umc.ttoklip.R
 import com.umc.ttoklip.data.model.KakaoResponse
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.login.LoginResponse
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Query
@@ -12,5 +15,5 @@ interface KakaoApi {
     fun getSearchKeyword(
         @Header("Authorization") key: String,
         @Query("query") query:String
-    ): Call<KakaoResponse.ResultSearchKeyword>
+    ): Response<ResponseBody<KakaoResponse.ResultSearchKeyword>>
 }

app/src/main/java/com/umc/ttoklip/data/api/MyBlockUserApi.kt → app/src/main/java/com/umc/ttoklip/data/api/MyPage3Api.kt

@@ -2,16 +2,23 @@ package com.umc.ttoklip.data.api
 
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.mypage.MyBlockUserResponse
+import com.umc.ttoklip.data.model.mypage.NoticeResponse
+import com.umc.ttoklip.data.model.mypage.RestrictedResponse
 import retrofit2.Response
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Path
 
-interface MyBlockUserApi {
+interface MyPage3Api {
+    @GET("/api/v1/my-page/restricted")
+    suspend fun getRestrictedReason(): Response<ResponseBody<RestrictedResponse>>
+
     @GET("/api/v1/my-page/blocked")
     suspend fun getMyBlockedUser(): Response<ResponseBody<MyBlockUserResponse>>
 
     @DELETE("/api/v1/my-page/unblock/{targetId}")
     suspend fun deleteBlockUser(@Path("targetId") userId: Long): Response<ResponseBody<Unit>>
 
+    @GET("api/v1/notice")
+    suspend fun getNotices(): Response<ResponseBody<NoticeResponse>>
 }

app/src/main/java/com/umc/ttoklip/data/api/MyPostApi.kt

@@ -7,6 +7,7 @@ import com.umc.ttoklip.data.model.mypage.MyQuestionResponse
 import com.umc.ttoklip.data.model.mypage.MyTogetherResponse
 import retrofit2.Response
 import retrofit2.http.GET
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface MyPostApi {
@@ -16,6 +17,13 @@ interface MyPostApi {
     @GET("/api/v1/my-page/participate-deals")
     suspend fun getMyTogethers(@Query("page") page: Int): Response<ResponseBody<MyTogetherResponse>>
 
+    @GET("/api/v1/stranger/participate-deals/{userId}")
+    suspend fun getStrangerDeals(
+        @Query("page") page: Int,
+        @Path("userId") userId: Int
+    ): Response<ResponseBody<MyTogetherResponse>>
+
+
     @GET("/api/v1/my-page/honeytip")
     suspend fun getMyHoneyTips(@Query("page") page: Int): Response<ResponseBody<MyHoneyTipsResponse>>
 

app/src/main/java/com/umc/ttoklip/data/api/NaverApi.kt

@@ -0,0 +1,13 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.naver.GeocodingResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface NaverApi {
+    @GET("map-geocode/v2/geocode")
+    suspend fun fetchGeocoding(
+        @Query("query") query: String
+    ): Response<GeocodingResponse>
+}

app/src/main/java/com/umc/ttoklip/data/api/OtherApi.kt

@@ -0,0 +1,24 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.mypage.MyHoneyTipsResponse
+import com.umc.ttoklip.data.model.stranger.OtherUserInfoResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface OtherApi {
+
+    @GET("/api/v1/stranger")
+    suspend fun getStrangeInfo(
+        @Query("nickname") nickname : String,
+    ): Response<ResponseBody<OtherUserInfoResponse>>
+
+    @GET("/api/v1/stranger/honeytip/{userId}")
+    suspend fun getStrangerTip(
+        @Path("userId") userId : Int,
+        @Query("page") page : Int,
+    ): Response<ResponseBody<MyHoneyTipsResponse>>
+
+}

app/src/main/java/com/umc/ttoklip/data/api/ReadCommsApi.kt

@@ -2,6 +2,7 @@ package com.umc.ttoklip.data.api
 
 import com.umc.ttoklip.data.model.ResponseBody
 import com.umc.ttoklip.data.model.StandardResponse
+import com.umc.ttoklip.data.model.town.CommentResponse
 import com.umc.ttoklip.data.model.town.CreateCommentRequest
 import com.umc.ttoklip.data.model.town.DeleteCommunicationResponse
 import com.umc.ttoklip.data.model.town.ReportRequest
@@ -31,13 +32,13 @@ interface ReadCommsApi {
     suspend fun createCommunicationComment(
         @Body body: CreateCommentRequest,
         @Path("postId") postId: Long
-    ): Response<ResponseBody<Unit>>
+    ): Response<ResponseBody<CommentResponse>>
 
     //소통해요 댓글 삭제
     @DELETE("/api/v1/town/comms/comment/{commentId}")
     suspend fun deleteCommunicationComment(
         @Path("commentId") commentId: Long
-    ): Response<ResponseBody<Unit>>
+    ): Response<ResponseBody<CommentResponse>>
 
     //소통해요 스크랩 추가
     @POST("/api/v1/town/comms/scrap/{postId}")
@@ -73,9 +74,9 @@ interface ReadCommsApi {
     ): Response<ResponseBody<StandardResponse>>
 
     //소통해요 댓글 신고
-    @POST("/api/v1/town/comms/comment/report/{postId}")
+    @POST("/api/v1/town/comms/comment/report/{commentId}")
     suspend fun reportCommunicationComment(
-        @Body body: ReportRequest,
+        @Body body: com.umc.ttoklip.data.model.honeytip.request.ReportRequest,
         @Path("commentId") commentId: Long
-    ): Response<ResponseBody<Unit>>
+    ): Response<ResponseBody<CommentResponse>>
 }