diff --git a/backend/app/controllers/meet_ups_controller.rb b/backend/app/controllers/meet_ups_controller.rb index 271b583..db40ffc 100644 --- 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 index 9aae2c9..8e49af9 100644 --- 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 { src, _, _ -> - val zonedDateTime = src.atOffset(ZoneOffset.UTC) + val zonedDateTime = src.atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC) JsonPrimitive(zonedDateTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)) }