fix: subject template group

TencentBlueKing · Nov 9, 2023 · f2cf9db · f2cf9db
1 parent aa3eb6f
commit f2cf9db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 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
@@ -40,7 +40,7 @@ type SubjectTemplateGroupManager interface {
 	) (members []SubjectTemplateGroup, err error)
 	ListRelationBySubjectPKGroupPKs(subjectPK int64, groupPKs []int64) ([]SubjectTemplateGroup, error)
 	ListGroupDistinctSubjectPK(groupPK int64) (subjectPKs []int64, err error)
-	ListMaxExpiredAtRelation(groupPK int64) ([]SubjectTemplateGroup, error)
+	ListMaxExpiredAtRelation(groupPK int64) ([]ThinSubjectRelation, error)
 
 	BulkCreateWithTx(tx *sqlx.Tx, relations []SubjectTemplateGroup) error
 	BulkUpdateExpiredAtWithTx(tx *sqlx.Tx, relations []SubjectTemplateGroup) error
@@ -203,15 +203,11 @@ func (m *subjectTemplateGroupManager) ListGroupDistinctSubjectPK(groupPK int64)
 	return
 }
 
-func (m *subjectTemplateGroupManager) ListMaxExpiredAtRelation(groupPK int64) ([]SubjectTemplateGroup, error) {
-	relations := []SubjectTemplateGroup{}
+func (m *subjectTemplateGroupManager) ListMaxExpiredAtRelation(groupPK int64) ([]ThinSubjectRelation, error) {
+	relations := []ThinSubjectRelation{}
 	query := `SELECT
-		 pk,
 		 subject_pk,
-		 template_id,
-		 group_pk,
-		 MAX(expired_at) AS expired_at,
-		 created_at
+		 MAX(expired_at) AS policy_expired_at
 		 FROM subject_template_group
 		 WHERE group_pk = ?
 		 GROUP BY subject_pk`
@@ -221,5 +217,9 @@ func (m *subjectTemplateGroupManager) ListMaxExpiredAtRelation(groupPK int64) ([
 		return relations, nil
 	}
 
+	for i := range relations {
+		relations[i].GroupPK = groupPK
+	}
+
 	return relations, err
 }
diff --git a/pkg/database/dao/subject_template_group_test.go b/pkg/database/dao/subject_template_group_test.go
@@ -194,13 +194,12 @@ func Test_subjectTemplateGroupManager_BulkUpdateExpiredAtWithTx(t *testing.T) {
 func Test_subjectTemplateGroupManager_ListMaxExpiredAtRelation(t *testing.T) {
 	database.RunWithMock(t, func(db *sqlx.DB, mock sqlmock.Sqlmock, t *testing.T) {
 		mockQuery := `^SELECT
-		 pk, subject_pk, template_id, group_pk,
-		 (.*), created_at
+		 subject_pk, (.*)
 		 FROM subject_template_group
 		 WHERE group_pk = (.*) GROUP BY subject_pk`
 		mockRows := sqlmock.NewRows(
-			[]string{"pk", "subject_pk", "template_id", "group_pk", "expired_at"},
-		).AddRow(int64(1), int64(2), int64(3), int64(4), int64(0))
+			[]string{"subject_pk", "policy_expired_at"},
+		).AddRow(int64(1), int64(2))
 		mock.ExpectQuery(mockQuery).WithArgs(int64(1)).WillReturnRows(mockRows)
 
 		manager := &subjectTemplateGroupManager{DB: db}

diff --git a/pkg/service/group_system_auth_type.go b/pkg/service/group_system_auth_type.go
@@ -120,11 +120,9 @@ func (s *groupService) AlterGroupAuthType(
 				}
 
 				memberMap[r.SubjectPK] = dao.SubjectRelation{
-					PK:        r.PK,
 					SubjectPK: r.SubjectPK,
 					GroupPK:   r.GroupPK,
 					ExpiredAt: r.ExpiredAt,
-					CreatedAt: r.CreatedAt,
 				}
 			}