From 6e4da90715379dbb99a293f868841f45b3796eb3 Mon Sep 17 00:00:00 2001 From: zhu327 Date: Thu, 28 Dec 2023 18:07:25 +0800 Subject: [PATCH] fix: update by cr --- pkg/database/dao/mock/subject_group.go | 24 +++++++++---------- .../dao/mock/subject_template_group.go | 12 +++++----- pkg/database/dao/subject_group.go | 12 +++++----- pkg/database/dao/subject_template_group.go | 4 ++-- pkg/service/group.go | 6 ++--- pkg/service/group_test.go | 14 +++++------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkg/database/dao/mock/subject_group.go b/pkg/database/dao/mock/subject_group.go index 25405af0..154d6eac 100644 --- a/pkg/database/dao/mock/subject_group.go +++ b/pkg/database/dao/mock/subject_group.go @@ -64,32 +64,32 @@ func (mr *MockSubjectGroupManagerMockRecorder) BulkDeleteByGroupMembersWithTx(tx return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteByGroupMembersWithTx", reflect.TypeOf((*MockSubjectGroupManager)(nil).BulkDeleteByGroupMembersWithTx), tx, groupPK, subjectPKs) } -// BulkDeleteByGroupPKs mocks base method. -func (m *MockSubjectGroupManager) BulkDeleteByGroupPKs(tx *sqlx.Tx, groupPKs []int64) error { +// BulkDeleteByGroupPKsWithTx mocks base method. +func (m *MockSubjectGroupManager) BulkDeleteByGroupPKsWithTx(tx *sqlx.Tx, groupPKs []int64) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BulkDeleteByGroupPKs", tx, groupPKs) + ret := m.ctrl.Call(m, "BulkDeleteByGroupPKsWithTx", tx, groupPKs) ret0, _ := ret[0].(error) return ret0 } -// BulkDeleteByGroupPKs indicates an expected call of BulkDeleteByGroupPKs. -func (mr *MockSubjectGroupManagerMockRecorder) BulkDeleteByGroupPKs(tx, groupPKs interface{}) *gomock.Call { +// BulkDeleteByGroupPKsWithTx indicates an expected call of BulkDeleteByGroupPKsWithTx. +func (mr *MockSubjectGroupManagerMockRecorder) BulkDeleteByGroupPKsWithTx(tx, groupPKs interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteByGroupPKs", reflect.TypeOf((*MockSubjectGroupManager)(nil).BulkDeleteByGroupPKs), tx, groupPKs) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteByGroupPKsWithTx", reflect.TypeOf((*MockSubjectGroupManager)(nil).BulkDeleteByGroupPKsWithTx), tx, groupPKs) } -// BulkDeleteBySubjectPKs mocks base method. -func (m *MockSubjectGroupManager) BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error { +// BulkDeleteBySubjectPKsWithTx mocks base method. +func (m *MockSubjectGroupManager) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BulkDeleteBySubjectPKs", tx, subjectPKs) + ret := m.ctrl.Call(m, "BulkDeleteBySubjectPKsWithTx", tx, subjectPKs) ret0, _ := ret[0].(error) return ret0 } -// BulkDeleteBySubjectPKs indicates an expected call of BulkDeleteBySubjectPKs. -func (mr *MockSubjectGroupManagerMockRecorder) BulkDeleteBySubjectPKs(tx, subjectPKs interface{}) *gomock.Call { +// BulkDeleteBySubjectPKsWithTx indicates an expected call of BulkDeleteBySubjectPKsWithTx. +func (mr *MockSubjectGroupManagerMockRecorder) BulkDeleteBySubjectPKsWithTx(tx, subjectPKs interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteBySubjectPKs", reflect.TypeOf((*MockSubjectGroupManager)(nil).BulkDeleteBySubjectPKs), tx, subjectPKs) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteBySubjectPKsWithTx", reflect.TypeOf((*MockSubjectGroupManager)(nil).BulkDeleteBySubjectPKsWithTx), tx, subjectPKs) } // BulkUpdateExpiredAtWithTx mocks base method. diff --git a/pkg/database/dao/mock/subject_template_group.go b/pkg/database/dao/mock/subject_template_group.go index ace33a92..f9ca1159 100644 --- a/pkg/database/dao/mock/subject_template_group.go +++ b/pkg/database/dao/mock/subject_template_group.go @@ -49,18 +49,18 @@ func (mr *MockSubjectTemplateGroupManagerMockRecorder) BulkCreateWithTx(tx, rela return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkCreateWithTx", reflect.TypeOf((*MockSubjectTemplateGroupManager)(nil).BulkCreateWithTx), tx, relations) } -// BulkDeleteBySubjectPKs mocks base method. -func (m *MockSubjectTemplateGroupManager) BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error { +// BulkDeleteBySubjectPKsWithTx mocks base method. +func (m *MockSubjectTemplateGroupManager) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BulkDeleteBySubjectPKs", tx, subjectPKs) + ret := m.ctrl.Call(m, "BulkDeleteBySubjectPKsWithTx", tx, subjectPKs) ret0, _ := ret[0].(error) return ret0 } -// BulkDeleteBySubjectPKs indicates an expected call of BulkDeleteBySubjectPKs. -func (mr *MockSubjectTemplateGroupManagerMockRecorder) BulkDeleteBySubjectPKs(tx, subjectPKs interface{}) *gomock.Call { +// BulkDeleteBySubjectPKsWithTx indicates an expected call of BulkDeleteBySubjectPKsWithTx. +func (mr *MockSubjectTemplateGroupManagerMockRecorder) BulkDeleteBySubjectPKsWithTx(tx, subjectPKs interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteBySubjectPKs", reflect.TypeOf((*MockSubjectTemplateGroupManager)(nil).BulkDeleteBySubjectPKs), tx, subjectPKs) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BulkDeleteBySubjectPKsWithTx", reflect.TypeOf((*MockSubjectTemplateGroupManager)(nil).BulkDeleteBySubjectPKsWithTx), tx, subjectPKs) } // BulkDeleteWithTx mocks base method. diff --git a/pkg/database/dao/subject_group.go b/pkg/database/dao/subject_group.go index ea8524e1..5efbab4b 100644 --- a/pkg/database/dao/subject_group.go +++ b/pkg/database/dao/subject_group.go @@ -68,8 +68,8 @@ type SubjectGroupManager interface { FilterGroupPKsHasMemberBeforeExpiredAt(groupPKs []int64, expiredAt int64) ([]int64, error) BulkCreateWithTx(tx *sqlx.Tx, relations []SubjectRelation) error - BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error - BulkDeleteByGroupPKs(tx *sqlx.Tx, groupPKs []int64) error + BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error + BulkDeleteByGroupPKsWithTx(tx *sqlx.Tx, groupPKs []int64) error BulkUpdateExpiredAtWithTx(tx *sqlx.Tx, relations []SubjectRelation) error ListGroupMember(groupPK int64) ([]SubjectRelation, error) @@ -352,16 +352,16 @@ func (m *subjectGroupManager) BulkCreateWithTx(tx *sqlx.Tx, relations []SubjectR return m.bulkInsertWithTx(tx, relations) } -// BulkDeleteBySubjectPKs ... -func (m *subjectGroupManager) BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error { +// BulkDeleteBySubjectPKsWithTx ... +func (m *subjectGroupManager) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error { if len(subjectPKs) == 0 { return nil } return m.bulkDeleteBySubjectPKs(tx, subjectPKs) } -// BulkDeleteByGroupPKs ... -func (m *subjectGroupManager) BulkDeleteByGroupPKs(tx *sqlx.Tx, groupPKs []int64) error { +// BulkDeleteByGroupPKsWithTx ... +func (m *subjectGroupManager) BulkDeleteByGroupPKsWithTx(tx *sqlx.Tx, groupPKs []int64) error { if len(groupPKs) == 0 { return nil } diff --git a/pkg/database/dao/subject_template_group.go b/pkg/database/dao/subject_template_group.go index 66463edd..6ed3471a 100644 --- a/pkg/database/dao/subject_template_group.go +++ b/pkg/database/dao/subject_template_group.go @@ -47,7 +47,7 @@ type SubjectTemplateGroupManager interface { BulkUpdateExpiredAtWithTx(tx *sqlx.Tx, relations []SubjectTemplateGroup) error BulkUpdateExpiredAtByRelationWithTx(tx *sqlx.Tx, relations []SubjectRelation) error BulkDeleteWithTx(tx *sqlx.Tx, relations []SubjectTemplateGroup) error - BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error + BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error } type subjectTemplateGroupManager struct { @@ -237,7 +237,7 @@ func (m *subjectTemplateGroupManager) ListThinRelationWithMaxExpiredAtByGroupPK( return relations, err } -func (m *subjectTemplateGroupManager) BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error { +func (m *subjectTemplateGroupManager) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []int64) error { sql := `DELETE FROM subject_template_group WHERE subject_pk in (?)` return database.SqlxDeleteWithTx(tx, sql, subjectPKs) diff --git a/pkg/service/group.go b/pkg/service/group.go index f5d648ce..dfa3716f 100644 --- a/pkg/service/group.go +++ b/pkg/service/group.go @@ -879,7 +879,7 @@ func (l *groupService) BulkDeleteByGroupPKsWithTx(tx *sqlx.Tx, groupPKs []int64) errorWrapf := errorx.NewLayerFunctionErrorWrapf(GroupSVC, "BulkDeleteByGroupPKsWithTx") // 批量用户组删除成员关系 subjectRelation - err := l.manager.BulkDeleteByGroupPKs(tx, groupPKs) + err := l.manager.BulkDeleteByGroupPKsWithTx(tx, groupPKs) if err != nil { return errorWrapf( err, "manager.BulkDeleteByGroupPKs group_pks=`%+v` fail", groupPKs) @@ -893,14 +893,14 @@ func (l *groupService) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []in errorWrapf := errorx.NewLayerFunctionErrorWrapf(GroupSVC, "BulkDeleteBySubjectPKsWithTx") // 批量其加入的用户组关系 subjectRelation - err := l.manager.BulkDeleteBySubjectPKs(tx, subjectPKs) + err := l.manager.BulkDeleteBySubjectPKsWithTx(tx, subjectPKs) if err != nil { return errorWrapf( err, "manager.BulkDeleteBySubjectPKs subject_pks=`%+v` fail", subjectPKs) } // 批量删除subject template group - err = l.subjectTemplateGroupManager.BulkDeleteBySubjectPKs(tx, subjectPKs) + err = l.subjectTemplateGroupManager.BulkDeleteBySubjectPKsWithTx(tx, subjectPKs) if err != nil { return errorWrapf( err, diff --git a/pkg/service/group_test.go b/pkg/service/group_test.go index 59f2d8af..f05a28e7 100644 --- a/pkg/service/group_test.go +++ b/pkg/service/group_test.go @@ -81,7 +81,7 @@ var _ = Describe("GroupService", func() { It("manager.BulkDeleteBySubjectPKs fail", func() { mockSubjectService := mock.NewMockSubjectGroupManager(ctl) - mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( errors.New("error"), ).AnyTimes() @@ -97,12 +97,12 @@ var _ = Describe("GroupService", func() { It("manager.BulkDeleteBySubjectPKs fail", func() { mockSubjectService := mock.NewMockSubjectGroupManager(ctl) - mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( nil, ).AnyTimes() mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl) - mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( errors.New("error"), ).AnyTimes() @@ -119,12 +119,12 @@ var _ = Describe("GroupService", func() { It("subjectSystemGroupManager.DeleteBySubjectPKsWithTx fail", func() { mockSubjectService := mock.NewMockSubjectGroupManager(ctl) - mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( nil, ).AnyTimes() mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl) - mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( nil, ).AnyTimes() @@ -147,12 +147,12 @@ var _ = Describe("GroupService", func() { It("ok", func() { mockSubjectService := mock.NewMockSubjectGroupManager(ctl) - mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( nil, ).AnyTimes() mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl) - mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return( + mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return( nil, ).AnyTimes()