From 1bc96e2d47319b78b76db12cbe659682510dd388 Mon Sep 17 00:00:00 2001
From: l1ghtman2k <aibek.zhil@gmail.com>
Date: Sun, 26 Jul 2020 22:47:41 -0400
Subject: [PATCH] Fix routes issues related to
 https://github.com/gin-gonic/gin/issues/1681

---
 cmd/web/server/gin/gin.go | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/cmd/web/server/gin/gin.go b/cmd/web/server/gin/gin.go
index b6a1dd5..4dd5d53 100644
--- a/cmd/web/server/gin/gin.go
+++ b/cmd/web/server/gin/gin.go
@@ -32,6 +32,7 @@ func (ds *dserver) MapRoutesAndStart() error {
 		ds.logger.Error(err)
 		return err
 	}
+
 	ds.router.Use(static.Serve("/", static.LocalFile("./views", true)))
 	ds.router.NoRoute(authMiddleware.MiddlewareFunc(), func(c *gin.Context) {
 		claims := jwt.ExtractClaims(c)
@@ -99,14 +100,20 @@ func (ds *dserver) MapRoutesAndStart() error {
 			serviceRoute.PATCH("/:id", sctrl.Update)
 			serviceRoute.DELETE("/:id", sctrl.Delete)
 		}
-
-		roundRote := api.Group("/round")
+		
+		
 		{
+
+			roundRoute := api.Group("/round")
 			rcli := client.NewRoundClient(c)
 			rctrl := handler.NewRoundController(ds.logger, rcli)
-			roundRote.GET("/", rctrl.GetAll)
-			roundRote.GET("/:id", rctrl.GetByID)
-			roundRote.GET("/last_non_elapsing", rctrl.GetLastNonElapsingRound)
+			roundRoute.GET("/", rctrl.GetAll)
+			roundRoute.GET("/:id", rctrl.GetByID)
+			
+			//https://github.com/gin-gonic/gin/issues/1681
+			lastRoundRoute := api.Group("/last_non_elapsing")
+			lastRoundRoute.GET("/", rctrl.GetLastNonElapsingRound)
+			
 		}
 
 		serviceGroupRoute := api.Group("/service_group")
@@ -142,12 +149,16 @@ func (ds *dserver) MapRoutesAndStart() error {
 			hostRoute.DELETE("/:id", hctrl.Delete)
 		}
 
-		checkRoute := api.Group("/check")
+
 		{
 			hcli := client.NewCheckClient(c)
 			hctrl := handler.NewCheckController(ds.logger, hcli)
-			checkRoute.GET("/:RoundID/:ServiceID", hctrl.GetByRoundServiceID)
-			checkRoute.GET("/:id", hctrl.GetAllByRoundID)
+
+			//https://github.com/gin-gonic/gin/issues/1681
+			checkSpecificRoute := api.Group("/check")
+			checkSpecificRoute.GET("/:RoundID/:ServiceID", hctrl.GetByRoundServiceID)
+			checkAllRoute := api.Group("/check_all")
+			checkAllRoute.GET("/:id", hctrl.GetAllByRoundID)
 		}
 
 		configRoute := api.Group("/config")