opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

dispatchers: 使用httperrors.NewResourceNotFoundError2()

Browse Source
This commit is contained in:
Yousong Zhou
2018-11-28 07:26:15 +00:00
parent 191dd8259a
commit 151da754d3
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+5 -10
View File
@@ -636,8 +636,7 @@ func (dispatcher *DBModelDispatcher) Get(ctx context.Context, idStr string, quer
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.modelManager.Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
return nil, err
}
@@ -658,8 +657,7 @@ func (dispatcher *DBModelDispatcher) GetSpecific(ctx context.Context, idStr stri
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.modelManager.Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
return nil, err
}
@@ -1015,8 +1013,7 @@ func (dispatcher *DBModelDispatcher) PerformAction(ctx context.Context, idStr st
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, nil)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.modelManager.Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}
@@ -1184,8 +1181,7 @@ func (dispatcher *DBModelDispatcher) Update(ctx context.Context, idStr string, q
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idStr, nil)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.modelManager.Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idStr)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}
@@ -1275,8 +1271,7 @@ func (dispatcher *DBModelDispatcher) Delete(ctx context.Context, idstr string, q
userCred := fetchUserCredential(ctx)
model, err := fetchItem(dispatcher.modelManager, ctx, userCred, idstr, nil)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.modelManager.Keyword(), idstr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), idstr)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}
pkg/cloudcommon/db/db_joint_dispatcher.go
+7 -12
View File
@@ -59,8 +59,7 @@ func (dispatcher *DBJointModelDispatcher) ListMasterDescendent(ctx context.Conte
model, err := fetchItem(dispatcher.JointModelManager().GetMasterManager(), ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.JointModelManager().GetMasterManager().Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.JointModelManager().GetMasterManager().Keyword(), idStr)
} else if err != nil {
return nil, err
}
@@ -86,8 +85,7 @@ func (dispatcher *DBJointModelDispatcher) ListSlaveDescendent(ctx context.Contex
model, err := fetchItem(dispatcher.JointModelManager().GetSlaveManager(), ctx, userCred, idStr, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s not found",
dispatcher.JointModelManager().GetSlaveManager().Keyword(), idStr))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.JointModelManager().GetSlaveManager().Keyword(), idStr)
} else if err != nil {
return nil, err
}
@@ -139,8 +137,7 @@ func (dispatcher *DBJointModelDispatcher) Get(ctx context.Context, id1 string, i
userCred := fetchUserCredential(ctx)
_, _, item, err := fetchJointItem(dispatcher, ctx, userCred, id1, id2, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s-%s not found",
dispatcher.modelManager.Keyword(), id1, id2))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), id1+"-"+id2)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}
@@ -187,7 +184,7 @@ func (dispatcher *DBJointModelDispatcher) Attach(ctx context.Context, id1 string
master, err := fetchItem(dispatcher.JointModelManager().GetMasterManager(), ctx, userCred, id1, query)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError("%s %d not found", dispatcher.JointModelManager().GetMasterManager().KeywordPlural(), id1)
return nil, httperrors.NewResourceNotFoundError2(dispatcher.JointModelManager().GetMasterManager().Keyword(), id1)
} else {
return nil, httperrors.NewGeneralError(err)
}
@@ -195,7 +192,7 @@ func (dispatcher *DBJointModelDispatcher) Attach(ctx context.Context, id1 string
slave, err := fetchItem(dispatcher.JointModelManager().GetSlaveManager(), ctx, userCred, id2, query)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError("%s %d not found", dispatcher.JointModelManager().GetSlaveManager().KeywordPlural(), id2)
return nil, httperrors.NewResourceNotFoundError2(dispatcher.JointModelManager().GetSlaveManager().Keyword(), id2)
} else {
return nil, httperrors.NewGeneralError(err)
}
@@ -209,8 +206,7 @@ func (dispatcher *DBJointModelDispatcher) Update(ctx context.Context, id1 string
userCred := fetchUserCredential(ctx)
master, slave, item, err := fetchJointItem(dispatcher, ctx, userCred, id1, id2, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s-%s not found",
dispatcher.modelManager.Keyword(), id1, id2))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), id1+"-"+id2)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}
@@ -234,8 +230,7 @@ func (dispatcher *DBJointModelDispatcher) Detach(ctx context.Context, id1 string
userCred := fetchUserCredential(ctx)
master, slave, item, err := fetchJointItem(dispatcher, ctx, userCred, id1, id2, query)
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError(fmt.Sprintf("%s %s-%s not found",
dispatcher.modelManager.Keyword(), id1, id2))
return nil, httperrors.NewResourceNotFoundError2(dispatcher.modelManager.Keyword(), id1+"-"+id2)
} else if err != nil {
return nil, httperrors.NewGeneralError(err)
}