Feature/#96 컨퍼런스 조회

android/2023-emmsale/app/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     kotlin("plugin.serialization") version "1.8.21"
     id("kotlin-kapt")
     id("com.google.firebase.crashlytics")
+    id("kotlin-parcelize")
 }
 
 android {
@@ -78,7 +79,6 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation("androidx.browser:browser:1.5.0")
     implementation("androidx.work:work-runtime-ktx:2.8.1")
-    implementation("com.google.firebase:firebase-messaging-ktx:23.2.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     implementation("androidx.fragment:fragment-ktx:1.6.1")
@@ -95,13 +95,12 @@ dependencies {
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-messaging-ktx")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
-    implementation("com.google.firebase:firebase-messaging:23.2.0")
 
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.8.2")
     testImplementation("org.assertj", "assertj-core", "3.22.0")
     testImplementation("io.mockk:mockk-android:1.13.5")
     testImplementation("io.mockk:mockk-agent:1.13.5")
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
 
     // imageview
     implementation("de.hdodenhof:circleimageview:3.1.0")

android/2023-emmsale/app/src/main/AndroidManifest.xml

@@ -17,9 +17,12 @@
         android:theme="@style/Theme.Emmsale"
         android:usesCleartextTraffic="true"
         tools:targetApi="33">
+        <activity
+            android:name=".presentation.ui.main.event.conferenceFilter.ConferenceFilterActivity"
+            android:exported="true" />
         <activity
             android:name=".presentation.ui.main.MainActivity"
-            android:exported="false" />
+            android:exported="true" />
         <activity
             android:name=".presentation.ui.onboarding.OnboardingActivity"
             android:exported="true" />

android/2023-emmsale/app/src/main/java/com/emmsale/data/common/ServiceFactory.kt

@@ -36,6 +36,6 @@ class ServiceFactory {
     fun <T> create(service: Class<T>): T = retrofit.create(service)
 
     companion object {
-        private const val BASE_URL = "https://kerdy.kro.kr/"
+        private const val BASE_URL = "https://prod.kerdy.kro.kr"
     }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/event/Event.kt → android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/Conference.kt

@@ -1,14 +1,14 @@
-package com.emmsale.data.event
+package com.emmsale.data.conference
 
 import java.time.LocalDateTime
 
-data class Event(
+data class Conference(
     val id: Long,
     val name: String,
     val startDate: LocalDateTime,
     val endDate: LocalDateTime,
-    val status: String,
+    val status: ConferenceStatus,
     val tags: List<String>,
-    val posterUrl: String,
+    val posterUrl: String?,
     val dDay: Int,
 )

android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/ConferenceRepository.kt

@@ -0,0 +1,13 @@
+package com.emmsale.data.conference
+
+import com.emmsale.data.common.ApiResult
+
+interface ConferenceRepository {
+    suspend fun getConferences(
+        category: EventCategory,
+        year: Int? = null,
+        month: Int? = null,
+        status: ConferenceStatus? = null,
+        tag: String? = null,
+    ): ApiResult<List<Conference>>
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/ConferenceRepositoryImpl.kt

@@ -0,0 +1,27 @@
+package com.emmsale.data.conference
+
+import com.emmsale.data.common.ApiResult
+import com.emmsale.data.common.handleApi
+import com.emmsale.data.conference.dto.ConferenceApiModel
+import com.emmsale.data.conference.dto.toData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class ConferenceRepositoryImpl(
+    private val dispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val conferenceService: ConferenceService,
+) : ConferenceRepository {
+    override suspend fun getConferences(
+        category: EventCategory,
+        year: Int?,
+        month: Int?,
+        status: ConferenceStatus?,
+        tag: String?,
+    ): ApiResult<List<Conference>> = withContext(dispatcher) {
+        handleApi(
+            conferenceService.getEvents(category.text, year, month, status?.text, tag),
+            List<ConferenceApiModel>::toData
+        )
+    }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/event/EventService.kt → android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/ConferenceService.kt

@@ -1,13 +1,14 @@
-package com.emmsale.data.event
+package com.emmsale.data.conference
 
-import com.emmsale.data.event.dto.ConferenceApiModel
+import com.emmsale.data.conference.dto.ConferenceApiModel
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-interface EventService {
-    @GET("/events/conferences")
+interface ConferenceService {
+    @GET("/events")
     suspend fun getEvents(
+        @Query("category") category: String,
         @Query("year") year: Int? = null,
         @Query("month") month: Int? = null,
         @Query("status") status: String? = null,

android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/ConferenceStatus.kt

@@ -0,0 +1,12 @@
+package com.emmsale.data.conference
+
+enum class ConferenceStatus(val text: String) {
+    IN_PROGRESS("진행 중"),
+    SCHEDULED("진행 예정"),
+    ENDED("종료된 행사");
+
+    companion object {
+        fun from(status: String): ConferenceStatus = values().find { it.text == status }
+            ?: throw IllegalArgumentException("${status}는 올바르지 않은 행사 상태입니다.")
+    }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/EventCategory.kt

@@ -0,0 +1,6 @@
+package com.emmsale.data.conference
+
+enum class EventCategory(val text: String) {
+    CONFERENCE("CONFERENCE"),
+    COMPETITION("COMPETITION");
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/event/dto/ConferenceApiModel.kt → android/2023-emmsale/app/src/main/java/com/emmsale/data/conference/dto/ConferenceApiModel.kt

@@ -1,6 +1,7 @@
-package com.emmsale.data.event.dto
+package com.emmsale.data.conference.dto
 
-import com.emmsale.data.event.Event
+import com.emmsale.data.conference.Conference
+import com.emmsale.data.conference.ConferenceStatus
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
@@ -21,16 +22,16 @@ data class ConferenceApiModel(
     @SerialName("tags")
     val tags: List<String>,
     @SerialName("imageUrl")
-    val posterUrl: String,
+    val posterUrl: String? = null,
     @SerialName("remainingDays")
     val dDay: Int,
 ) {
-    fun toData(): Event = Event(
+    fun toData(): Conference = Conference(
         id = id,
         name = name,
         startDate = parseDate(startDate),
         endDate = parseDate(endDate),
-        status = status,
+        status = ConferenceStatus.from(status),
         tags = tags,
         posterUrl = posterUrl,
         dDay = dDay,
@@ -46,4 +47,4 @@ data class ConferenceApiModel(
     }
 }
 
-fun List<ConferenceApiModel>.toData(): List<Event> = map { it.toData() }
+fun List<ConferenceApiModel>.toData(): List<Conference> = map { it.toData() }

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/ConferenceTag.kt

@@ -0,0 +1,6 @@
+package com.emmsale.data.eventTag
+
+class ConferenceTag(
+    id: Long,
+    name: String,
+) : EventTag(id, name)

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/EventTag.kt

@@ -0,0 +1,6 @@
+package com.emmsale.data.eventTag
+
+sealed class EventTag(
+    val id: Long,
+    val name: String,
+)

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/EventTagRepository.kt

@@ -0,0 +1,8 @@
+package com.emmsale.data.eventTag
+
+import com.emmsale.data.common.ApiResult
+import com.emmsale.data.conference.EventCategory
+
+interface EventTagRepository {
+    suspend fun getEventTags(category: EventCategory): ApiResult<List<EventTag>>
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/EventTagRepositoryImpl.kt

@@ -0,0 +1,23 @@
+package com.emmsale.data.eventTag
+
+import com.emmsale.data.common.ApiResult
+import com.emmsale.data.common.handleApi
+import com.emmsale.data.conference.EventCategory
+import com.emmsale.data.eventTag.dto.ConferenceTagApiModel
+import com.emmsale.data.eventTag.mapper.toData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class EventTagRepositoryImpl(
+    private val dispatcher: CoroutineDispatcher = Dispatchers.IO,
+    private val eventTagService: EventTagService,
+) : EventTagRepository {
+    override suspend fun getEventTags(category: EventCategory): ApiResult<List<EventTag>> =
+        withContext(dispatcher) {
+            handleApi(
+                response = eventTagService.getConferenceTags(category.text),
+                mapToDomain = List<ConferenceTagApiModel>::toData
+            )
+        }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/EventTagService.kt

@@ -0,0 +1,13 @@
+package com.emmsale.data.eventTag
+
+import com.emmsale.data.eventTag.dto.ConferenceTagApiModel
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface EventTagService {
+    @GET("/event/tag")
+    suspend fun getConferenceTags(
+        @Query("category") category: String,
+    ): Response<List<ConferenceTagApiModel>>
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/FakeEventTagService.kt

@@ -0,0 +1,41 @@
+package com.emmsale.data.eventTag
+
+import com.emmsale.data.eventTag.dto.ConferenceTagApiModel
+import retrofit2.Response
+
+class FakeEventTagService : EventTagService {
+    override suspend fun getConferenceTags(
+        category: String,
+    ): Response<List<ConferenceTagApiModel>> = Response.success(provideConferenceTags())
+
+    private fun provideConferenceTags(): List<ConferenceTagApiModel> = listOf(
+        ConferenceTagApiModel(
+            id = 1,
+            name = "백엔드"
+        ),
+        ConferenceTagApiModel(
+            id = 2,
+            name = "프론트엔드"
+        ),
+        ConferenceTagApiModel(
+            id = 3,
+            name = "안드로이드"
+        ),
+        ConferenceTagApiModel(
+            id = 4,
+            name = "IOS"
+        ),
+        ConferenceTagApiModel(
+            id = 5,
+            name = "AI"
+        ),
+        ConferenceTagApiModel(
+            id = 6,
+            name = "알고리즘"
+        ),
+        ConferenceTagApiModel(
+            id = 7,
+            name = "정보보안"
+        ),
+    )
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/dto/ConferenceTagApiModel.kt

@@ -0,0 +1,12 @@
+package com.emmsale.data.eventTag.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ConferenceTagApiModel(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("name")
+    val name: String,
+)

android/2023-emmsale/app/src/main/java/com/emmsale/data/eventTag/mapper/ConferenceTagMapper.kt

@@ -0,0 +1,17 @@
+package com.emmsale.data.eventTag.mapper
+
+import com.emmsale.data.eventTag.ConferenceTag
+import com.emmsale.data.eventTag.EventTag
+import com.emmsale.data.eventTag.dto.ConferenceTagApiModel
+
+fun ConferenceTagApiModel.toData(): EventTag = ConferenceTag(
+    id = id,
+    name = name,
+)
+
+fun List<ConferenceTagApiModel>.toData(): List<EventTag> = map { it.toData() }
+
+fun ConferenceTag.toApiModel(): ConferenceTagApiModel = ConferenceTagApiModel(
+    id = id,
+    name = name,
+)

android/2023-emmsale/app/src/main/java/com/emmsale/di/RepositoryContainer.kt

@@ -2,8 +2,10 @@ package com.emmsale.di
 
 import com.emmsale.data.activity.ActivityRepository
 import com.emmsale.data.activity.ActivityRepositoryImpl
-import com.emmsale.data.event.EventRepository
-import com.emmsale.data.event.EventRepositoryImpl
+import com.emmsale.data.conference.ConferenceRepository
+import com.emmsale.data.conference.ConferenceRepositoryImpl
+import com.emmsale.data.eventTag.EventTagRepository
+import com.emmsale.data.eventTag.EventTagRepositoryImpl
 import com.emmsale.data.eventdetail.EventDetailRepository
 import com.emmsale.data.eventdetail.EventDetailRepositoryImpl
 import com.emmsale.data.fcmToken.FcmTokenRepository
@@ -35,12 +37,15 @@ class RepositoryContainer(
     val memberRepository: MemberRepository by lazy {
         MemberRepositoryImpl(memberService = serviceContainer.memberService)
     }
-    val eventRepository: EventRepository by lazy {
-        EventRepositoryImpl(eventService = serviceContainer.eventService)
+    val conferenceRepository: ConferenceRepository by lazy {
+        ConferenceRepositoryImpl(conferenceService = serviceContainer.conferenceService)
     }
     val fcmTokenRepository: FcmTokenRepository by lazy {
         FcmTokenRepositoryImpl(fcmTokenService = serviceContainer.fcmTokenService)
     }
+    val eventTagRepository: EventTagRepository by lazy {
+        EventTagRepositoryImpl(eventTagService = serviceContainer.eventTagService)
+    }
     val eventDetailRepository: EventDetailRepository by lazy {
         EventDetailRepositoryImpl(eventDetailService = serviceContainer.eventDetailService)
     }