git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimized api response code

Browse Source
This commit is contained in:
Marvin Zhang
2024-11-13 17:31:05 +08:00
parent 86669be84b
commit c6ca5cb2a9
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/controllers/base.go
View File

@@ -153,7 +153,7 @@ func (ctr *BaseController[T]) DeleteById(c *gin.Context) {
func (ctr *BaseController[T]) DeleteList(c *gin.Context) {
type Payload struct {
Ids []primitive.ObjectID `json:"ids"`
Ids []string `json:"ids"`
}
var payload Payload
@@ -162,9 +162,19 @@ func (ctr *BaseController[T]) DeleteList(c *gin.Context) {
return
}
var ids []primitive.ObjectID
for _, id := range payload.Ids {
objectId, err := primitive.ObjectIDFromHex(id)
if err != nil {
HandleErrorBadRequest(c, err)
return
}
ids = append(ids, objectId)
}
if err := ctr.modelSvc.DeleteMany(bson.M{
"_id": bson.M{
"$in": payload.Ids,
"$in": ids,
},
}); err != nil {
HandleErrorInternalServerError(c, err)

4
core/controllers/user.go
View File

@@ -175,7 +175,7 @@ func DeleteUserById(c *gin.Context) {
return
}
if user.RootAdmin {
HandleErrorBadRequest(c, errors.New("root admin cannot be deleted"))
HandleErrorForbidden(c, errors.New("root admin cannot be deleted"))
return
}
@@ -217,7 +217,7 @@ func DeleteUserList(c *gin.Context) {
"root_admin": true,
}, nil)
if err == nil {
HandleErrorBadRequest(c, errors.New("root admin cannot be deleted"))
HandleErrorForbidden(c, errors.New("root admin cannot be deleted"))
return
}
if !errors.Is(err, mongo2.ErrNoDocuments) {

4
core/controllers/user_test.go
View File

@@ -423,7 +423,7 @@ func TestDeleteUserById_Success(t *testing.T) {
w = httptest.NewRecorder()
router.ServeHTTP(w, req)
assert.Equal(t, http.StatusBadRequest, w.Code)
assert.Equal(t, http.StatusForbidden, w.Code)
// Test deleting with invalid ID
req, err = http.NewRequest(http.MethodDelete, "/users/invalid-id", nil)
@@ -492,7 +492,7 @@ func TestDeleteUserList_Success(t *testing.T) {
w = httptest.NewRecorder()
router.ServeHTTP(w, req)
assert.Equal(t, http.StatusBadRequest, w.Code)
assert.Equal(t, http.StatusForbidden, w.Code)
// Test with mix of valid and invalid ids
reqBody = strings.NewReader(fmt.Sprintf(`{"ids":["%s","invalid-id"]}`, normalUserIds[0].Hex()))