update: delete subject template group when delete subject

TencentBlueKing · Dec 26, 2023 · be4bc4a · be4bc4a
1 parent cceddf1
commit be4bc4a
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 5 deletions.
diff --git a/pkg/database/dao/mock/subject_template_group.go b/pkg/database/dao/mock/subject_template_group.go
diff --git a/pkg/database/dao/subject_template_group.go b/pkg/database/dao/subject_template_group.go
@@ -34,6 +34,7 @@ type SubjectTemplateGroup struct {
 
 type SubjectTemplateGroupManager interface {
 	GetTemplateGroupMemberCount(groupPK, templateID int64) (int64, error)
+	GetMaxExpiredAtBySubjectGroup(subjectPK, groupPK int64, excludeTemplateID int64) (int64, error)
 	ListPagingTemplateGroupMember(
 		groupPK, templateID int64,
 		limit, offset int64,
@@ -46,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
-	GetMaxExpiredAtBySubjectGroup(subjectPK, groupPK int64, excludeTemplateID int64) (int64, error)
+	BulkDeleteBySubjectPKs(tx *sqlx.Tx, subjectPKs []int64) error
 }
 
 type subjectTemplateGroupManager struct {
@@ -235,3 +236,9 @@ func (m *subjectTemplateGroupManager) ListThinRelationWithMaxExpiredAtByGroupPK(
 
 	return relations, err
 }
+
+func (m *subjectTemplateGroupManager) BulkDeleteBySubjectPKs(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
@@ -899,6 +899,16 @@ func (l *groupService) BulkDeleteBySubjectPKsWithTx(tx *sqlx.Tx, subjectPKs []in
 			err, "manager.BulkDeleteBySubjectPKs subject_pks=`%+v` fail", subjectPKs)
 	}
 
+	// 批量删除subject template group
+	err = l.subjectTemplateGroupManager.BulkDeleteBySubjectPKs(tx, subjectPKs)
+	if err != nil {
+		return errorWrapf(
+			err,
+			"subjectTemplateGroupManager.BulkDeleteBySubjectPKsWithTx subjectPKs=`%+v` fail",
+			subjectPKs,
+		)
+	}
+
 	// 批量删除用户的subject system group
 	err = l.subjectSystemGroupManager.DeleteBySubjectPKsWithTx(tx, subjectPKs)
 	if err != nil {

diff --git a/pkg/service/group_test.go b/pkg/service/group_test.go
@@ -94,21 +94,49 @@ var _ = Describe("GroupService", func() {
 			assert.Contains(GinkgoT(), err.Error(), "BulkDeleteBySubjectPKs")
 		})
 
+		It("manager.BulkDeleteBySubjectPKs fail", func() {
+			mockSubjectService := mock.NewMockSubjectGroupManager(ctl)
+
+			mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return(
+				nil,
+			).AnyTimes()
+
+			mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl)
+			mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return(
+				errors.New("error"),
+			).AnyTimes()
+
+			manager := &groupService{
+				manager:                     mockSubjectService,
+				subjectTemplateGroupManager: mockSubjectTemplateGroupService,
+			}
+
+			err := manager.BulkDeleteBySubjectPKsWithTx(nil, []int64{1, 2})
+			assert.Error(GinkgoT(), err)
+			assert.Contains(GinkgoT(), err.Error(), "subjectTemplateGroupManager.BulkDeleteBySubjectPKsWithTx")
+		})
+
 		It("subjectSystemGroupManager.DeleteBySubjectPKsWithTx fail", func() {
 			mockSubjectService := mock.NewMockSubjectGroupManager(ctl)
 
 			mockSubjectService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return(
 				nil,
 			).AnyTimes()
 
+			mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl)
+			mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return(
+				nil,
+			).AnyTimes()
+
 			mockSubjectSystemGroupService := mock.NewMockSubjectSystemGroupManager(ctl)
 			mockSubjectSystemGroupService.EXPECT().DeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return(
 				errors.New("error"),
 			).AnyTimes()
 
 			manager := &groupService{
-				manager:                   mockSubjectService,
-				subjectSystemGroupManager: mockSubjectSystemGroupService,
+				manager:                     mockSubjectService,
+				subjectSystemGroupManager:   mockSubjectSystemGroupService,
+				subjectTemplateGroupManager: mockSubjectTemplateGroupService,
 			}
 
 			err := manager.BulkDeleteBySubjectPKsWithTx(nil, []int64{1, 2})
@@ -123,14 +151,20 @@ var _ = Describe("GroupService", func() {
 				nil,
 			).AnyTimes()
 
+			mockSubjectTemplateGroupService := mock.NewMockSubjectTemplateGroupManager(ctl)
+			mockSubjectTemplateGroupService.EXPECT().BulkDeleteBySubjectPKs(gomock.Any(), []int64{1, 2}).Return(
+				nil,
+			).AnyTimes()
+
 			mockSubjectSystemGroupService := mock.NewMockSubjectSystemGroupManager(ctl)
 			mockSubjectSystemGroupService.EXPECT().DeleteBySubjectPKsWithTx(gomock.Any(), []int64{1, 2}).Return(
 				nil,
 			).AnyTimes()
 
 			manager := &groupService{
-				manager:                   mockSubjectService,
-				subjectSystemGroupManager: mockSubjectSystemGroupService,
+				manager:                     mockSubjectService,
+				subjectSystemGroupManager:   mockSubjectSystemGroupService,
+				subjectTemplateGroupManager: mockSubjectTemplateGroupService,
 			}
 
 			err := manager.BulkDeleteBySubjectPKsWithTx(nil, []int64{1, 2})