Merge pull request #83 from snuhcs-course/fix/meetup-order

약속 정렬
snuhcs-course · Dec 7, 2023 · db20a93 · db20a93
2 parents 7bd50ee + 5798641
commit db20a93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/backend/app/controllers/meet_ups_controller.rb b/backend/app/controllers/meet_ups_controller.rb
@@ -2,7 +2,8 @@ class MeetUpsController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   def index
-    @meet_ups = current_user.meet_ups
+    @meet_ups = current_user.meet_ups.where('meet_at > ?', Time.now)
+                            .order(meet_at: :asc)
     render json: @meet_ups
   end
 

diff --git a/frontend/app/src/main/java/com/example/frontend/utilities/GsonProvider.kt b/frontend/app/src/main/java/com/example/frontend/utilities/GsonProvider.kt
@@ -28,7 +28,7 @@ object GsonProvider {
 
     @RequiresApi(Build.VERSION_CODES.O)
     val localDateTimeSerializer = JsonSerializer<LocalDateTime> { src, _, _ ->
-        val zonedDateTime = src.atOffset(ZoneOffset.UTC)
+        val zonedDateTime = src.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC)
         JsonPrimitive(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME))
     }