Feature/tgyuu/#69

core/common/src/main/java/com/wap/wapp/core/commmon/util/DateUtil.kt

@@ -1,18 +1,28 @@
 package com.wap.wapp.core.commmon.util
 
 import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 object DateUtil {
 
+    fun generateNowTime(zoneId: ZoneId = ZoneId.of("Asia/Seoul")): LocalTime = LocalTime.now(zoneId)
+
     fun generateNowDate(zoneId: ZoneId = ZoneId.of("Asia/Seoul")): LocalDate = LocalDate.now(zoneId)
 
+    fun generateNowDateTime(zoneId: ZoneId = ZoneId.of("Asia/Seoul")): LocalDateTime =
+        LocalDateTime.now(zoneId)
+
     const val YEAR_MONTH_START_INDEX = 0
     const val YEAR_MONTH_END_INDEX = 7
     const val MONTH_DATE_START_INDEX = 5
     const val DAYS_IN_WEEK = 7
 
+    // 현재 날짜에서 시간, 분만 반환해주는 포맷 ex 19:00
+    val HHmmFormatter = DateTimeFormatter.ofPattern("HH:mm")
+
     // 현재 날짜에서 일만 반환해주는 포맷 ex 2023-11-20 -> 20
     val ddFormatter = DateTimeFormatter.ofPattern("dd")
 

core/data/src/main/java/com/wap/wapp/core/data/repository/event/EventRepository.kt

@@ -2,16 +2,16 @@ package com.wap.wapp.core.data.repository.event
 
 import com.wap.wapp.core.model.event.Event
 import java.time.LocalDate
+import java.time.LocalDateTime
 
 interface EventRepository {
     suspend fun getMonthEvents(date: LocalDate): Result<List<Event>>
 
     suspend fun postEvent(
-        date: LocalDate,
         eventTitle: String,
         eventContent: String,
         eventLocation: String,
-        eventDate: String,
-        eventTime: String,
+        eventStartDateTime: LocalDateTime,
+        eventEndDateTime: LocalDateTime,
     ): Result<Unit>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/event/EventRepositoryImpl.kt

@@ -1,9 +1,10 @@
 package com.wap.wapp.core.data.repository.event
 
 import com.wap.wapp.core.model.event.Event
-import com.wap.wapp.core.network.model.event.EventRequest
 import com.wap.wapp.core.network.source.event.EventDataSource
 import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 class EventRepositoryImpl @Inject constructor(
@@ -17,21 +18,17 @@ class EventRepositoryImpl @Inject constructor(
         }
 
     override suspend fun postEvent(
-        date: LocalDate,
         eventTitle: String,
         eventContent: String,
         eventLocation: String,
-        eventDate: String,
-        eventTime: String,
+        eventStartDateTime: LocalDateTime,
+        eventEndDateTime: LocalDateTime,
     ): Result<Unit> =
         eventDataSource.postEvent(
-            date = date,
-            EventRequest(
-                title = eventTitle,
-                content = eventContent,
-                location = eventLocation,
-                period = eventDate,
-                time = eventTime,
-            ),
+            title = eventTitle,
+            content = eventContent,
+            location = eventLocation,
+            startDateTime = eventStartDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+            endDateTime = eventEndDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
         )
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyRepository.kt

@@ -10,13 +10,13 @@ interface SurveyRepository {
     suspend fun getSurvey(surveyId: String): Result<Survey>
 
     suspend fun postSurvey(
-        eventId: Int,
+        eventId: String,
         userId: String,
         title: String,
         content: String,
         surveyAnswerList: List<SurveyAnswer>,
         surveyedAt: LocalDateTime,
     ): Result<Unit>
 
-    suspend fun isSubmittedSurvey(eventId: Int, userId: String): Result<Boolean>
+    suspend fun isSubmittedSurvey(eventId: String, userId: String): Result<Boolean>
 }

core/data/src/main/java/com/wap/wapp/core/data/repository/survey/SurveyRepositoryImpl.kt

@@ -45,7 +45,7 @@ class SurveyRepositoryImpl @Inject constructor(
     }
 
     override suspend fun postSurvey(
-        eventId: Int,
+        eventId: String,
         userId: String,
         title: String,
         content: String,
@@ -62,7 +62,7 @@ class SurveyRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun isSubmittedSurvey(eventId: Int, userId: String): Result<Boolean> {
+    override suspend fun isSubmittedSurvey(eventId: String, userId: String): Result<Boolean> {
         return surveyDataSource.isSubmittedSurvey(eventId, userId)
     }
 

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/event/PostEventUseCase.kt → core/domain/src/main/java/com/wap/wapp/core/domain/usecase/event/RegisterEventUseCase.kt

@@ -2,26 +2,28 @@ package com.wap.wapp.core.domain.usecase.event
 
 import com.wap.wapp.core.data.repository.event.EventRepository
 import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
 import javax.inject.Inject
 
-class PostEventUseCase @Inject constructor(
+class RegisterEventUseCase @Inject constructor(
     private val eventRepository: EventRepository,
 ) {
     suspend operator fun invoke(
-        date: LocalDate,
         eventTitle: String,
         eventContent: String,
         eventLocation: String,
-        eventDate: String,
-        eventTime: String,
+        eventStartDate: LocalDate,
+        eventStartTime: LocalTime,
+        eventEndDate: LocalDate,
+        eventEndTime: LocalTime,
     ): Result<Unit> = runCatching {
         eventRepository.postEvent(
-            date = date,
             eventTitle = eventTitle,
             eventContent = eventContent,
             eventLocation = eventLocation,
-            eventDate = eventDate,
-            eventTime = eventTime,
+            eventStartDateTime = LocalDateTime.of(eventStartDate, eventStartTime),
+            eventEndDateTime = LocalDateTime.of(eventEndDate, eventEndTime),
         )
     }
 }

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/IsSubmittedSurveyUseCase.kt

@@ -8,7 +8,7 @@ class IsSubmittedSurveyUseCase @Inject constructor(
     private val userRepository: UserRepository,
     private val surveyRepository: SurveyRepository,
 ) {
-    suspend operator fun invoke(eventId: Int): Result<Boolean> {
+    suspend operator fun invoke(eventId: String): Result<Boolean> {
         return runCatching {
             val userId = userRepository.getUserId().getOrThrow()
 

core/domain/src/main/java/com/wap/wapp/core/domain/usecase/survey/PostSurveyUseCase.kt

@@ -11,7 +11,7 @@ class PostSurveyUseCase @Inject constructor(
     private val surveyRepository: SurveyRepository,
 ) {
     suspend operator fun invoke(
-        eventId: Int,
+        eventId: String,
         title: String,
         content: String,
         surveyAnswerList: List<SurveyAnswer>,

core/model/src/main/java/com/wap/wapp/core/model/event/Event.kt

@@ -1,12 +1,12 @@
 package com.wap.wapp.core.model.event
 
-import java.time.LocalDate
+import java.time.LocalDateTime
 
 data class Event(
     val content: String,
-    val eventId: Int,
+    val eventId: String,
     val location: String,
-    val period: LocalDate,
     val title: String,
-    val time: String = "",
+    val startDateTime: LocalDateTime,
+    val endDateTime: LocalDateTime,
 )

core/model/src/main/java/com/wap/wapp/core/model/survey/SurveyForm.kt

@@ -4,14 +4,14 @@ import java.time.LocalDateTime
 
 // 운영진이 등록하는 설문 모델
 data class SurveyForm(
-    val eventId: Int,
+    val eventId: String,
     val title: String,
     val content: String,
     val surveyQuestionList: List<SurveyQuestion>,
     val deadline: LocalDateTime,
 ) {
     constructor() : this(
-        -1,
+        "",
         "",
         "",
         emptyList(),

core/network/src/main/java/com/wap/wapp/core/network/model/event/EventRequest.kt

@@ -4,7 +4,7 @@ data class EventRequest(
     val title: String = "",
     val content: String = "",
     val location: String = "",
-    val period: String = "",
-    val time: String = "",
-    val eventId: Int = 0,
+    val startDateTime: String = "",
+    val endDateTime: String = "",
+    val eventId: String = "",
 )

core/network/src/main/java/com/wap/wapp/core/network/model/event/EventResponse.kt

@@ -1,16 +1,16 @@
 package com.wap.wapp.core.network.model.event
 
 import com.wap.wapp.core.model.event.Event
-import java.time.LocalDate
+import com.wap.wapp.core.network.utils.toISOLocalDateTime
 import java.time.format.DateTimeFormatter
 
 data class EventResponse(
     val content: String = "",
-    val eventId: Int = 0,
+    val eventId: String = "",
     val location: String = "",
-    val period: String = "",
     val title: String = "",
-    val time: String = "",
+    val startDateTime: String = "",
+    val endDateTime: String = "",
 ) {
     private val formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
 
@@ -19,7 +19,7 @@ data class EventResponse(
         eventId = eventId,
         location = location,
         title = title,
-        period = LocalDate.parse(this.period, formatter),
-        time = time,
+        startDateTime = startDateTime.toISOLocalDateTime(),
+        endDateTime = endDateTime.toISOLocalDateTime(),
     )
 }

core/network/src/main/java/com/wap/wapp/core/network/model/survey/SurveyRequest.kt

@@ -4,7 +4,7 @@ import com.wap.wapp.core.model.survey.SurveyAnswer
 
 data class SurveyRequest(
     val surveyId: String,
-    val eventId: Int,
+    val eventId: String,
     val userId: String,
     val title: String,
     val content: String,

core/network/src/main/java/com/wap/wapp/core/network/model/survey/form/SurveyFormRequest.kt

@@ -3,14 +3,14 @@ package com.wap.wapp.core.network.model.survey.form
 import com.wap.wapp.core.model.survey.SurveyQuestion
 
 data class SurveyFormRequest(
-    val eventId: Int,
+    val eventId: String,
     val title: String,
     val content: String,
     val surveyQuestionList: List<SurveyQuestion>,
     val deadline: String,
 ) {
     constructor() : this(
-        -1,
+        "",
         "",
         "",
         emptyList(),

core/network/src/main/java/com/wap/wapp/core/network/model/survey/form/SurveyFormResponse.kt

@@ -4,15 +4,15 @@ import com.wap.wapp.core.model.survey.SurveyForm
 import com.wap.wapp.core.network.utils.toISOLocalDateTime
 
 data class SurveyFormResponse(
-    val eventId: Int,
+    val eventId: String,
     val userId: String,
     val title: String,
     val content: String,
     val surveyQuestionList: List<SurveyQuestionResponse>,
     val deadline: String,
 ) {
     constructor() : this(
-        -1,
+        "",
         "",
         "",
         "",

core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSource.kt

@@ -1,10 +1,15 @@
 package com.wap.wapp.core.network.source.event
 
-import com.wap.wapp.core.network.model.event.EventRequest
 import com.wap.wapp.core.network.model.event.EventResponse
 import java.time.LocalDate
 
 interface EventDataSource {
     suspend fun getMonthEvents(date: LocalDate): Result<List<EventResponse>>
-    suspend fun postEvent(date: LocalDate, eventRequest: EventRequest): Result<Unit>
+    suspend fun postEvent(
+        title: String,
+        content: String,
+        location: String,
+        startDateTime: String,
+        endDateTime: String,
+    ): Result<Unit>
 }

core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt

@@ -3,9 +3,11 @@ package com.wap.wapp.core.network.source.event
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.toObject
 import com.wap.wapp.core.network.constant.EVENT_COLLECTION
+import com.wap.wapp.core.network.constant.SURVEY_COLLECTION
 import com.wap.wapp.core.network.model.event.EventRequest
 import com.wap.wapp.core.network.model.event.EventResponse
 import com.wap.wapp.core.network.utils.await
+import com.wap.wapp.core.network.utils.toISOLocalDateTime
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import javax.inject.Inject
@@ -32,12 +34,29 @@ class EventDataSourceImpl @Inject constructor(
             result
         }
 
-    override suspend fun postEvent(date: LocalDate, eventRequest: EventRequest): Result<Unit> =
+    override suspend fun postEvent(
+        title: String,
+        content: String,
+        location: String,
+        startDateTime: String,
+        endDateTime: String,
+    ): Result<Unit> =
         runCatching {
+            val documentId = firebaseFirestore.collection(SURVEY_COLLECTION).document().id
+
+            val eventRequest = EventRequest(
+                title = title,
+                content = content,
+                location = location,
+                startDateTime = startDateTime,
+                endDateTime = endDateTime,
+                eventId = documentId,
+            )
+
             firebaseFirestore.collection(EVENT_COLLECTION)
-                .document(getMonth(date))
+                .document(getMonth(startDateTime.toISOLocalDateTime().toLocalDate()))
                 .collection(EVENT_COLLECTION)
-                .document()
+                .document(documentId)
                 .set(eventRequest)
                 .await()
         }

core/network/src/main/java/com/wap/wapp/core/network/source/survey/SurveyDataSource.kt

@@ -4,14 +4,17 @@ import com.wap.wapp.core.model.survey.SurveyAnswer
 import com.wap.wapp.core.network.model.survey.SurveyResponse
 
 interface SurveyDataSource {
-    suspend fun isSubmittedSurvey(eventId: Int, userId: String): Result<Boolean>
+    suspend fun isSubmittedSurvey(
+        eventId: String,
+        userId: String,
+    ): Result<Boolean>
 
     suspend fun getSurveyList(): Result<List<SurveyResponse>>
 
     suspend fun getSurvey(surveyId: String): Result<SurveyResponse>
 
     suspend fun postSurvey(
-        eventId: Int,
+        eventId: String,
         userId: String,
         title: String,
         content: String,