Merge branch 'v3-dev' into api-migration-chore

Author: dk-a-dev

vitty-backend-api/api/v3/circleHandler.go

@@ -17,7 +17,6 @@ func circleHandler(api fiber.Router) {
 	group.Use(middleware.JWTAuthMiddleware)
 	group.Get("/", getCircles)
 	group.Get("/:circleId", getUsersOfCircle)
-	group.Get("/:circleId/:username", getCircleMemberTimetable)
 	group.Get("/leisure/:circleId", getLeisureTime)
 	group.Get("/requests/received", getReceivedCircleRequests)
 	group.Get("/requests/sent", getSentCircleRequests)
@@ -28,6 +27,7 @@ func circleHandler(api fiber.Router) {
 	group.Post("/join", joinCircleByCode)
 	group.Post("/declineRequest/:circleId", declineCircleRequest)
 	group.Patch("/", updateCircleName)
+	group.Get("/:circleId/:username", getCircleMemberTimetable)
 	group.Delete("/:circleId", deleteCircle)
 	group.Delete("/remove/:circleId/:username", removeUserFromCircle)
 	group.Delete("/leave/:circleId", leaveCircle)