From 5c01ae6ae619cdd1d3bcf318d0cb3a21af389310 Mon Sep 17 00:00:00 2001
From: nourbalaha <nourbalaha0@gmail.com>
Date: Wed, 6 Nov 2024 19:39:30 +0900
Subject: [PATCH] fix

---
 server/internal/adapter/publicapi/api.go | 28 +++++++-----------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/server/internal/adapter/publicapi/api.go b/server/internal/adapter/publicapi/api.go
index 031dbe2d5..c8f3693fb 100644
--- a/server/internal/adapter/publicapi/api.go
+++ b/server/internal/adapter/publicapi/api.go
@@ -35,7 +35,6 @@ func Echo(e *echo.Group) {
 	e.Use(middleware.CORS())
 	e.GET("/:project/:model", publicApiItemOrAssetList())
 	e.GET("/:project/:model/:item", publicApiItemOrAsset())
-	e.GET("/:project/:model/:schema", publicApiSchema())
 }
 
 func publicApiItemOrAsset() echo.HandlerFunc {
@@ -44,6 +43,14 @@ func publicApiItemOrAsset() echo.HandlerFunc {
 		ctrl := GetController(c.Request().Context())
 
 		p, m, i := c.Param("project"), c.Param("model"), c.Param("item")
+		if i == "schema.json" {
+			res, err := ctrl.getSchema(ctx, p, m)
+			if err != nil {
+				return err
+			}
+			return c.JSON(http.StatusOK, res)
+		}
+
 		var res any
 		var err error
 		if m == "assets" {
@@ -60,25 +67,6 @@ func publicApiItemOrAsset() echo.HandlerFunc {
 	}
 }
 
-func publicApiSchema() echo.HandlerFunc {
-	return func(c echo.Context) error {
-		ctx := c.Request().Context()
-		ctrl := GetController(c.Request().Context())
-
-		p, m, s := c.Param("project"), c.Param("model"), c.Param("schema")
-		var res any
-		var err error
-		if s == "schema.json" {
-			res, err = ctrl.getSchema(ctx, p, m)
-		}
-		if err != nil {
-			return err
-		}
-
-		return c.JSON(http.StatusOK, res)
-	}
-}
-
 func publicApiItemOrAssetList() echo.HandlerFunc {
 	return func(c echo.Context) error {
 		ctx := c.Request().Context()