fix: Show only upcoming or ongoing events (#1748)

Author: liveHarshit

app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt

@@ -52,7 +52,9 @@ class EventsViewModel(
                     mutableShowShimmerEvents.value = false
                     lastSearch = mutableSavedLocation.value ?: ""
                 }.subscribe({
-                    mutableEvents.value = it
+                    mutableEvents.value = it.filter {
+                        EventUtils.getTimeInMilliSeconds(it.endsAt, null) > System.currentTimeMillis()
+                    }
                 }, {
                     Timber.e(it, "Error fetching events")
                     mutableError.value = resource.getString(R.string.error_fetching_events_message)

app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt

@@ -14,6 +14,7 @@ import org.fossasia.openevent.general.data.Preference
 import org.fossasia.openevent.general.data.Resource
 import org.fossasia.openevent.general.event.Event
 import org.fossasia.openevent.general.event.EventService
+import org.fossasia.openevent.general.event.EventUtils
 import org.fossasia.openevent.general.event.types.EventType
 import org.fossasia.openevent.general.utils.DateTimeUtils.getNextDate
 import org.fossasia.openevent.general.utils.DateTimeUtils.getNextMonth
@@ -280,7 +281,9 @@ class SearchViewModel(
                 mutableShowShimmerResults.value = false
                 mutableChipClickable.value = true
             }.subscribe({
-                mutableEvents.value = it
+                mutableEvents.value = it.filter {
+                    EventUtils.getTimeInMilliSeconds(it.endsAt, null) > System.currentTimeMillis()
+                }
             }, {
                 Timber.e(it, "Error fetching events")
                 mutableError.value = resource.getString(R.string.error_fetching_events_message)