Skip to content

Commit dc7e1c8

Browse files
fixed get all owners to response OwnerResponse
1 parent 584aa59 commit dc7e1c8

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

backend/cms-sys/internal/service/owner_service.go

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
type OwnerService interface {
1616
Create(req types.OwnerCreateRequest) (*types.OwnerResponse, error)
1717
Update(id string, req types.OwnerUpdateRequest) (*types.OwnerResponse, error)
18-
GetAllOwners() ([]types.CMSUser, error)
18+
GetAllOwners() ([]types.OwnerResponse, error)
1919
GetOwnerByID(id string) (*types.OwnerResponse, error)
2020
BulkDeleteOwners(ids []string, force bool) error
2121
}
@@ -103,8 +103,32 @@ func (os *OwnerServiceImpl) Update(id string, req types.OwnerUpdateRequest) (*ty
103103
}, nil
104104
}
105105

106-
func (os *OwnerServiceImpl) GetAllOwners() ([]types.CMSUser, error) {
107-
return os.repo.GetAllOwners()
106+
func (os *OwnerServiceImpl) GetAllOwners() ([]types.OwnerResponse, error) {
107+
owners, err := os.repo.GetAllOwners()
108+
if err != nil {
109+
os.log.WithError(err).Error("Failed to get all owners")
110+
return nil, errors.New("failed to retrieve owners")
111+
}
112+
113+
responses := make([]types.OwnerResponse, len(owners))
114+
115+
for i, owner := range owners {
116+
var nameSpace string
117+
if owner.CMSNameSpace != nil {
118+
nameSpace = *owner.CMSNameSpace
119+
}
120+
121+
responses[i] = types.OwnerResponse{
122+
ID: owner.CMSUserID,
123+
Name: owner.CMSUserName,
124+
Email: owner.CMSUserEmail,
125+
Role: owner.CMSUserRole,
126+
NameSpace: nameSpace,
127+
Verified: owner.Verified,
128+
}
129+
}
130+
131+
return responses, nil
108132
}
109133

110134
func (os *OwnerServiceImpl) GetOwnerByID(id string) (*types.OwnerResponse, error) {

0 commit comments

Comments
 (0)