[FEATURE] #106 : GetEventListFromDate에 당일 이전의 일정만 가져오도록 수정

pknu-wap · Jan 19, 2024 · 7ded4cb · 7ded4cb
1 parent 7a56ebc
commit 7ded4cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt b/core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt
@@ -2,6 +2,7 @@ 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.model.util.DateUtil.generateNowDateTime
 import com.wap.wapp.core.network.constant.EVENT_COLLECTION
 import com.wap.wapp.core.network.model.event.EventRequest
 import com.wap.wapp.core.network.model.event.EventResponse
@@ -37,9 +38,10 @@ class EventDataSourceImpl @Inject constructor(
 
             // 선택된 날짜 1일 00시 00분 00초
             val startDateTime = date.atStartOfDay().toISOLocalDateTimeString()
-
+            val currentDateTime = generateNowDateTime().toISOLocalDateTimeString()
             val task = firebaseFirestore.collection(EVENT_COLLECTION)
                 .whereGreaterThanOrEqualTo("startDateTime", startDateTime)
+                .whereLessThanOrEqualTo("startDateTime", currentDateTime)
                 .get()
                 .await()
 

diff --git a/feature/profile/src/main/java/com/wap/wapp/feature/profile/component/WappAttendanceRow.kt b/feature/profile/src/main/java/com/wap/wapp/feature/profile/component/WappAttendanceRow.kt
@@ -51,7 +51,7 @@ internal fun WappAttendacneRow(
 }
 
 @Composable
-private fun WappAttendanceBadge(isAttendance: Boolean = true) {
+private fun WappAttendanceBadge(isAttendance: Boolean) {
     val drawableId = if (isAttendance) R.drawable.ic_attendance else R.drawable.ic_absent
     Image(painter = painterResource(id = drawableId), contentDescription = "")
 }