fix: Don't 500 when there's a preexisting project

internal/dev_server/api/api.yaml

@@ -74,7 +74,7 @@ paths:
         204:
           description: OK. Project & overrides were removed
         404:
-          $ref: "#/components/responses/NotFoundErrorResp"
+          $ref: "#/components/responses/ErrorResponse"
     post:
       summary: Add the project to the dev server
       parameters:
@@ -97,7 +97,9 @@ paths:
         201:
           $ref: "#/components/responses/Project"
         400:
-          $ref: "#/components/responses/InvalidRequestResponse"
+          $ref: "#/components/responses/ErrorResponse"
+        409:
+          $ref: "#/components/responses/ErrorResponse"
   /dev/projects/{projectKey}/overrides/{flagKey}:
     put:
       summary: override flag value with value provided in the body
@@ -115,7 +117,7 @@ paths:
         200:
           $ref: "#/components/responses/FlagOverride"
         400:
-          $ref: "#/components/responses/InvalidRequestResponse"
+          $ref: "#/components/responses/ErrorResponse"
 
     delete:
       summary: remove override for flag
@@ -222,8 +224,8 @@ components:
         application/json:
           schema:
             $ref: "#/components/schemas/Project"
-    InvalidRequestResponse:
-      description: Invalid request response
+    ErrorResponse:
+      description: Error response object
       content:
         application/json:
           schema:
@@ -237,18 +239,4 @@ components:
                 description: specific error code encountered
               message:
                 type: string
-                description: description of the error
-    NotFoundErrorResp:
-      description: not found
-      content:
-        application/json:
-          schema:
-            type: object
-            required:
-              - code
-              - message
-            properties:
-              code:
-                type: string
-              message:
-                type: string
+                description: description of the error

internal/dev_server/api/server.go

@@ -34,7 +34,7 @@ func (s Server) DeleteDevProjectsProjectKey(ctx context.Context, request DeleteD
 		return nil, err
 	}
 	if !deleted {
-		return DeleteDevProjectsProjectKey404JSONResponse{NotFoundErrorRespJSONResponse{
+		return DeleteDevProjectsProjectKey404JSONResponse{ErrorResponseJSONResponse{
 			Code:    "not_found",
 			Message: "project not found",
 		}}, nil
@@ -90,7 +90,7 @@ func (s Server) GetDevProjectsProjectKey(ctx context.Context, request GetDevProj
 func (s Server) PostDevProjectsProjectKey(ctx context.Context, request PostDevProjectsProjectKeyRequestObject) (PostDevProjectsProjectKeyResponseObject, error) {
 	if request.Body.SourceEnvironmentKey == "" {
 		return PostDevProjectsProjectKey400JSONResponse{
-			InvalidRequestResponseJSONResponse{
+			ErrorResponseJSONResponse{
 				Code:    "invalid_request",
 				Message: "sourceEnvironmentKey is required",
 			},
@@ -99,7 +99,13 @@ func (s Server) PostDevProjectsProjectKey(ctx context.Context, request PostDevPr
 
 	store := model.StoreFromContext(ctx)
 	project, err := model.CreateProject(ctx, request.ProjectKey, request.Body.SourceEnvironmentKey, request.Body.Context)
-	if err != nil {
+	switch {
+	case errors.Is(err, model.ErrAlreadyExists):
+		return PostDevProjectsProjectKey409JSONResponse{
+			Code:    "conflict",
+			Message: "project already exists",
+		}, nil
+	case err != nil:
 		return nil, err
 	}
 
@@ -248,7 +254,7 @@ func (s Server) PutDevProjectsProjectKeyOverridesFlagKey(ctx context.Context, re
 	if err != nil {
 		if errors.As(err, &model.Error{}) {
 			return PutDevProjectsProjectKeyOverridesFlagKey400JSONResponse{
-				InvalidRequestResponseJSONResponse{
+				ErrorResponseJSONResponse{
 					Code:    "invalid_request",
 					Message: err.Error(),
 				},

internal/dev_server/db/sqlite.go

@@ -106,12 +106,36 @@ func (s Sqlite) DeleteDevProject(ctx context.Context, key string) (bool, error)
 	return true, nil
 }
 
-func (s Sqlite) InsertProject(ctx context.Context, project model.Project) error {
+func (s Sqlite) InsertProject(ctx context.Context, project model.Project) (err error) {
 	flagsStateJson, err := json.Marshal(project.AllFlagsState)
 	if err != nil {
 		return errors.Wrap(err, "unable to marshal flags state when writing project")
 	}
-	_, err = s.database.Exec(`
+	tx, err := s.database.BeginTx(ctx, nil)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback()
+		}
+	}()
+
+	projects, err := tx.QueryContext(ctx, `
+SELECT 1 FROM projects WHERE key = ?
+`, project.Key)
+	if err != nil {
+		return
+	}
+	if projects.Next() {
+		err = model.ErrAlreadyExists
+		return
+	}
+	err = projects.Close()
+	if err != nil {
+		return
+	}
+	_, err = tx.Exec(`
 INSERT INTO projects (key, source_environment_key, context, last_sync_time, flag_state)
 VALUES (?, ?, ?, ?, ?)
 `,
@@ -121,7 +145,11 @@ VALUES (?, ?, ?, ?, ?)
 		project.LastSyncTime,
 		string(flagsStateJson),
 	)
-	return err
+	if err != nil {
+		return
+	}
+	err = tx.Commit()
+	return
 }
 
 func (s Sqlite) GetOverridesForProject(ctx context.Context, projectKey string) (model.Overrides, error) {

internal/dev_server/db/sqlite_test.go

@@ -58,6 +58,11 @@ func TestDBFunctions(t *testing.T) {
 		actualProjectKeys[proj.Key] = true
 	}
 
+	t.Run("InsertProject returns ErrAlreadyExists if the project already exists", func(t *testing.T) {
+		err := store.InsertProject(ctx, projects[0])
+		assert.Equal(t, model.ErrAlreadyExists, err)
+	})
+
 	t.Run("GetDevProjectKeys returns keys in projects", func(t *testing.T) {
 		keys, err := store.GetDevProjectKeys(ctx)
 		assert.NoError(t, err)

internal/dev_server/model/error.go

@@ -0,0 +1,23 @@
+package model
+
+import "github.com/pkg/errors"
+
+type Error struct {
+	err     error
+	message string
+}
+
+func (e Error) Error() string {
+	return e.message
+}
+
+func (e Error) Unwrap() error {
+	return e.err
+}
+
+func NewError(message string) error {
+	return errors.WithStack(Error{
+		err:     errors.New(message),
+		message: message,
+	})
+}

internal/dev_server/model/store.go

@@ -21,6 +21,7 @@ type Store interface {
 	GetDevProject(ctx context.Context, projectKey string) (*Project, error)
 	UpdateProject(ctx context.Context, project Project) (bool, error)
 	DeleteDevProject(ctx context.Context, projectKey string) (bool, error)
+	// InsertProject inserts the project. If it already exists, ErrAlreadyExists is returned
 	InsertProject(ctx context.Context, project Project) error
 	UpsertOverride(ctx context.Context, override Override) (Override, error)
 	GetOverridesForProject(ctx context.Context, projectKey string) (Overrides, error)
@@ -46,23 +47,4 @@ func StoreMiddleware(store Store) mux.MiddlewareFunc {
 }
 
 var ErrNotFound = errors.New("not found")
-
-type Error struct {
-	err     error
-	message string
-}
-
-func (e Error) Error() string {
-	return e.message
-}
-
-func (e Error) Unwrap() error {
-	return e.err
-}
-
-func NewError(message string) error {
-	return errors.WithStack(Error{
-		err:     errors.New(message),
-		message: message,
-	})
-}
+var ErrAlreadyExists = errors.New("already exists")