add 2 new apis for bot & app

pandodao · Mar 25, 2023 · 311dd6b · 311dd6b
1 parent c04b9aa
commit 311dd6b
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 2 deletions.
diff --git a/core/app.go b/core/app.go
@@ -98,6 +98,7 @@ type (
 		GetAppByAppID(ctx context.Context, appID string) (*App, error)
 		GetAppsByUser(ctx context.Context, userID uint64) ([]*App, error)
 		DeleteApp(ctx context.Context, id uint64) error
+		UpdateApp(ctx context.Context, id uint64, name string) error
 		ReplaceStore(AppStore) AppService
 	}
 )

diff --git a/core/bot.go b/core/bot.go
@@ -147,6 +147,7 @@ type (
 		GetBotsByUserID(ctx context.Context, userID uint64) ([]*Bot, error)
 		CreateBot(ctx context.Context, userID uint64, name, model, prompt string, temperature float32, maxTurnCount, contextTurnCount int, middlewares MiddlewareConfig, public bool) (*Bot, error)
 		UpdateBot(ctx context.Context, id uint64, name, model, prompt string, temperature float32, maxTurnCount, contextTurnCount int, middlewares MiddlewareConfig, public bool) error
+		DeleteBot(ctx context.Context, id uint64) error
 		ReplaceStore(store BotStore) BotService
 	}
 )

diff --git a/handler/app/app.go b/handler/app/app.go
@@ -13,7 +13,7 @@ import (
 	"github.com/go-chi/chi"
 )
 
-type CreateAppPayload struct {
+type CreateOrUpdateAppPayload struct {
 	Name string `json:"name"`
 }
 
@@ -59,7 +59,7 @@ func CreateApp(appz core.AppService) http.HandlerFunc {
 			return
 		}
 
-		body := &CreateAppPayload{}
+		body := &CreateOrUpdateAppPayload{}
 		if err := param.Binding(r, body); err != nil {
 			render.Error(w, http.StatusBadRequest, err)
 			return
@@ -88,6 +88,57 @@ func CreateApp(appz core.AppService) http.HandlerFunc {
 	}
 }
 
+func UpdateApp(appz core.AppService) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		user, found := session.UserFrom(ctx)
+		if !found {
+			render.Error(w, http.StatusUnauthorized, core.ErrUnauthorized)
+			return
+		}
+
+		body := &CreateOrUpdateAppPayload{}
+		if err := param.Binding(r, body); err != nil {
+			render.Error(w, http.StatusBadRequest, err)
+			return
+		}
+
+		body.Name = strings.TrimSpace(body.Name)
+
+		if len(body.Name) > 128 || len(body.Name) == 0 {
+			render.Error(w, http.StatusBadRequest, nil)
+			return
+		}
+
+		appID := chi.URLParam(r, "appID")
+
+		// validate uuid
+		if _, err := uuid.Parse(appID); err != nil {
+			render.Error(w, http.StatusBadRequest, core.ErrAppNotFound)
+			return
+		}
+
+		app, err := appz.GetAppByAppID(ctx, appID)
+		if err != nil {
+			render.Error(w, http.StatusInternalServerError, err)
+			return
+		}
+
+		if app.UserID != user.ID {
+			render.Error(w, http.StatusNotFound, core.ErrAppNotFound)
+			return
+		}
+
+		if err := appz.UpdateApp(ctx, user.ID, body.Name); err != nil {
+			render.Error(w, http.StatusInternalServerError, err)
+			return
+		}
+
+		render.JSON(w, app)
+	}
+}
+
 func GetMyApps(appz core.AppService) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()

diff --git a/handler/bot/bot.go b/handler/bot/bot.go
@@ -218,3 +218,39 @@ func CreateBot(botz core.BotService) http.HandlerFunc {
 		render.JSON(w, bot)
 	}
 }
+
+func DeleteBot(botz core.BotService) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		user, found := session.UserFrom(ctx)
+		if !found {
+			render.Error(w, http.StatusUnauthorized, core.ErrUnauthorized)
+		}
+
+		botIDStr := chi.URLParam(r, "botID")
+		botID, _ := strconv.ParseUint(botIDStr, 10, 64)
+
+		if botID <= 0 {
+			render.Error(w, http.StatusBadRequest, nil)
+			return
+		}
+
+		bot, err := botz.GetBot(ctx, botID)
+		if err != nil {
+			render.Error(w, http.StatusNotFound, err)
+			return
+		}
+
+		if bot.UserID != user.ID {
+			render.Error(w, http.StatusNotFound, core.ErrBotNotFound)
+			return
+		}
+
+		if err := botz.DeleteBot(ctx, bot.ID); err != nil {
+			render.Error(w, http.StatusInternalServerError, err)
+			return
+		}
+
+		render.JSON(w, bot)
+	}
+}
diff --git a/handler/serve.go b/handler/serve.go
@@ -105,6 +105,7 @@ func (s Server) HandleRest() http.Handler {
 		r.With(auth.LoginRequired()).Post("/", bot.CreateBot(s.botz))
 		r.With(auth.LoginRequired()).Put("/{botID}", bot.UpdateBot(s.botz))
 		r.With(auth.LoginRequired()).Get("/", bot.GetMyBots(s.botz))
+		r.With(auth.LoginRequired()).Delete("/{botID}", bot.DeleteBot(s.botz))
 	})
 
 	r.With(auth.LoginRequired()).Route("/users", func(r chi.Router) {
@@ -119,6 +120,7 @@ func (s Server) HandleRest() http.Handler {
 		r.Get("/{appID}", app.GetApp(s.appz))
 		r.Post("/", app.CreateApp(s.appz))
 		r.Get("/", app.GetMyApps(s.appz))
+		r.Put("/{appID}", app.UpdateApp(s.appz))
 		r.Delete("/{appID}", app.DeleteApp(s.appz))
 	})
 

diff --git a/service/app/app.go b/service/app/app.go
@@ -89,6 +89,13 @@ func (s *service) GetAppsByUser(ctx context.Context, userID uint64) ([]*core.App
 	return apps, nil
 }
 
+func (s *service) UpdateApp(ctx context.Context, id uint64, name string) error {
+	if err := s.apps.UpdateAppName(ctx, id, name); err != nil {
+		return err
+	}
+	return nil
+}
+
 func (s *service) DeleteApp(ctx context.Context, id uint64) error {
 	if err := s.apps.DeleteApp(ctx, id); err != nil {
 		return err

diff --git a/service/bot/bot.go b/service/bot/bot.go
@@ -227,3 +227,10 @@ func (s *service) UpdateBot(ctx context.Context, id uint64, name, model, prompt
 	s.botCache.Delete(fmt.Sprintf("user-bots-%d", bot.UserID))
 	return nil
 }
+
+func (s *service) DeleteBot(ctx context.Context, id uint64) error {
+	if err := s.bots.DeleteBot(ctx, id); err != nil {
+		return err
+	}
+	return nil
+}