fix: bugs

Signed-off-by: xu.zhu <[email protected]>
horizoncd · Oct 8, 2023 · 340d97b · 340d97b
1 parent f60a6be
commit 340d97b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/core/controller/application/controller.go b/core/controller/application/controller.go
@@ -874,7 +874,7 @@ func (c *controller) recordMemberCreatedEvent(ctx context.Context, applicationID
 		log.Warningf(ctx, "failed to list members of application, err: %s", err.Error())
 		return
 	}
-	events := make([]*eventmodels.Event, len(members))
+	events := make([]*eventmodels.Event, 0, len(members))
 	for _, m := range members {
 		events = append(events, &eventmodels.Event{
 			EventSummary: eventmodels.EventSummary{

diff --git a/core/controller/cluster/controller_basic_v2.go b/core/controller/cluster/controller_basic_v2.go
@@ -834,7 +834,7 @@ func (c *controller) recordMemberCreatedEvent(ctx context.Context, clusterID uin
 		log.Warningf(ctx, "failed to list members of application, err: %s", err.Error())
 		return
 	}
-	events := make([]*eventmodels.Event, len(members))
+	events := make([]*eventmodels.Event, 0, len(members))
 	for _, m := range members {
 		events = append(events, &eventmodels.Event{
 			EventSummary: eventmodels.EventSummary{

diff --git a/pkg/member/dao/dao.go b/pkg/member/dao/dao.go
@@ -95,7 +95,7 @@ func (d *dao) GetByID(ctx context.Context, memberID uint) (*models.Member, error
 
 func (d *dao) GetByIDIncludeSoftDelete(ctx context.Context, memberID uint) (*models.Member, error) {
 	var member models.Member
-	result := d.db.WithContext(ctx).Where("id = ?", memberID).First(&member)
+	result := d.db.WithContext(ctx).Unscoped().Where("id = ?", memberID).First(&member)
 	if result.Error != nil {
 		if result.Error == gorm.ErrRecordNotFound {
 			return nil, herrors.NewErrNotFound(herrors.MemberInfoInDB, result.Error.Error())

diff --git a/pkg/member/manager_test.go b/pkg/member/manager_test.go
@@ -99,6 +99,10 @@ func TestBasic(t *testing.T) {
 	retMember4, err := mgr.Get(ctx, member1.ResourceType, member1.ResourceID, models.MemberUser, member1.MemberNameID)
 	assert.Nil(t, err)
 	assert.Nil(t, retMember4)
+
+	retMember5, err := mgr.GetByIDIncludeSoftDelete(ctx, retMember3.ID)
+	assert.Nil(t, err)
+	assert.NotNil(t, retMember5)
 }
 
 func TestList(t *testing.T) {