final changes

Author: TudorEsan

admin/src/service/general.ts

@@ -1,5 +1,5 @@
 export const serverUrl = () => {
   return process.env.NODE_ENV === "development"
-    ? "http://localhost:8080"
+    ? "https://financeapp.tudoresan.ro"
     : "https://financeapp.tudoresan.ro";
 };

server/controllers/reservationController.go

@@ -137,7 +137,7 @@ func (controller *ReservationController) FilterReservations() gin.HandlerFunc {
 	}
 }
 
-func (controller *ReservationController) GetUserReservations() gin.HandlerFunc {
+func (controller *ReservationController) GetAllReservations() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 		defer cancel()
@@ -185,3 +185,35 @@ func (controller *ReservationController) DeleteReservation() gin.HandlerFunc {
 		c.JSON(200, gin.H{"message": "Reservation deleted"})
 	}
 }
+
+func (controller *ReservationController) GetUserReservations() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
+		defer cancel()
+
+		claims := c.MustGet("claims").(*models.SignedDetails)
+		idS := claims.Id
+
+		userId, err := primitive.ObjectIDFromHex(idS)
+		if err != nil {
+			controller.l.Error("Could not get user id", err)
+			c.JSON(400, gin.H{"message": err.Error()})
+			return
+		}
+
+		var reservations []models.Reservation
+		cursor, err := controller.reservationCollection.Find(ctx, bson.M{"userId": userId})
+		if err != nil {
+			controller.l.Error("Could not get reservation", err)
+			c.JSON(400, gin.H{"message": err.Error()})
+			return
+		}
+		for cursor.Next(ctx) {
+			var reservation models.Reservation
+			cursor.Decode(&reservation)
+			reservations = append(reservations, reservation)
+		}
+
+		c.JSON(200, reservations)
+	}
+}

server/main.go

@@ -16,12 +16,11 @@ func main() {
 	l := hclog.Default()
 	router := gin.Default()
 
-
 	// disable cors
 	config := cors.DefaultConfig()
 	config.AllowCredentials = true
 	config.AllowHeaders = []string{"Content-Type", "Authorization", "Origin", "Accept", "Access-Control-Allow-Origin", "token"}
-	config.AllowOrigins = []string{"http://localhost:3000"}
+	config.AllowOrigins = []string{"http://localhost:3000", "http://financeapp.tudoresan.ro:3000/"}
 	config.AllowMethods = []string{"GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"}
 	// config.AllowOrigins = []string{"*"}
 
@@ -35,7 +34,6 @@ func main() {
 		})
 	})
 
-
 	userController := controllers.NewUserController(l, mongoClient)
 	roomsController := controllers.NewRoomController(l, mongoClient)
 	userGroup := router.Group("")

server/routes/reservationRoutes.go

@@ -9,7 +9,7 @@ import (
 func InitReservationRoutes(r *gin.RouterGroup, c *controllers.ReservationController) {
 	r.Use(middlewares.VerifyAuth())
 	r.GET("/allReservations", c.GetReservations())
-	r.GET("/reservation", c.GetUserReservations())
+	r.GET("/reservations", c.GetUserReservations())
 	r.GET("reservationFilter", c.FilterReservations())
 	r.POST("/reservation/:from", c.AddReservation())
 	r.DELETE("/reservation/:id", c.DeleteReservation())