UPDATE: Change type response
All checks were successful
Build and Release / release (push) Successful in 1m6s

This commit is contained in:
2026-04-16 12:48:57 +07:00
parent 5c363589d8
commit eac5cb528f
5 changed files with 58 additions and 15 deletions

View File

@@ -33,6 +33,9 @@ type MediaStorageEntity struct {
} }
func (e *MediaEntity) ToStorageEntity() *MediaStorageEntity { func (e *MediaEntity) ToStorageEntity() *MediaStorageEntity {
if e == nil {
return nil
}
return &MediaStorageEntity{ return &MediaStorageEntity{
ID: e.ID, ID: e.ID,
StorageKey: e.StorageKey, StorageKey: e.StorageKey,
@@ -40,6 +43,9 @@ func (e *MediaEntity) ToStorageEntity() *MediaStorageEntity {
} }
func (e *MediaEntity) ToResponse() *response.MediaResponse { func (e *MediaEntity) ToResponse() *response.MediaResponse {
if e == nil {
return nil
}
return &response.MediaResponse{ return &response.MediaResponse{
ID: e.ID, ID: e.ID,
UserID: e.UserID, UserID: e.UserID,
@@ -54,6 +60,9 @@ func (e *MediaEntity) ToResponse() *response.MediaResponse {
} }
func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity { func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity {
if e == nil {
return nil
}
return &MediaSimpleEntity{ return &MediaSimpleEntity{
ID: e.ID, ID: e.ID,
StorageKey: e.StorageKey, StorageKey: e.StorageKey,
@@ -67,16 +76,22 @@ func (e *MediaEntity) ToSimpleEntity() *MediaSimpleEntity {
func MediaEntitiesToResponse(entities []*MediaEntity) []*response.MediaResponse { func MediaEntitiesToResponse(entities []*MediaEntity) []*response.MediaResponse {
responses := make([]*response.MediaResponse, len(entities)) responses := make([]*response.MediaResponse, len(entities))
for i, entity := range entities { for _, entity := range entities {
responses[i] = entity.ToResponse() if entity == nil {
continue
}
responses = append(responses, entity.ToResponse())
} }
return responses return responses
} }
func MediaEntitiesToStorageEntity(entities []*MediaEntity) []*MediaStorageEntity { func MediaEntitiesToStorageEntity(entities []*MediaEntity) []*MediaStorageEntity {
responses := make([]*MediaStorageEntity, len(entities)) responses := make([]*MediaStorageEntity, len(entities))
for i, entity := range entities { for _, entity := range entities {
responses[i] = entity.ToStorageEntity() if entity == nil {
continue
}
responses = append(responses, entity.ToStorageEntity())
} }
return responses return responses
} }

View File

@@ -14,6 +14,9 @@ type UserProfileSimple struct {
} }
func (p *UserProfileSimple) ToResponse() *response.UserProfileSimpleResponse { func (p *UserProfileSimple) ToResponse() *response.UserProfileSimpleResponse {
if p == nil {
return nil
}
return &response.UserProfileSimpleResponse{ return &response.UserProfileSimpleResponse{
DisplayName: p.DisplayName, DisplayName: p.DisplayName,
FullName: p.FullName, FullName: p.FullName,

View File

@@ -12,6 +12,9 @@ type RoleSimple struct {
} }
func (r *RoleSimple) ToResponse() *response.RoleSimpleResponse { func (r *RoleSimple) ToResponse() *response.RoleSimpleResponse {
if r == nil {
return nil
}
return &response.RoleSimpleResponse{ return &response.RoleSimpleResponse{
ID: r.ID, ID: r.ID,
Name: r.Name, Name: r.Name,
@@ -35,6 +38,9 @@ type RoleEntity struct {
} }
func (r *RoleEntity) ToResponse() *response.RoleResponse { func (r *RoleEntity) ToResponse() *response.RoleResponse {
if r == nil {
return nil
}
return &response.RoleResponse{ return &response.RoleResponse{
ID: r.ID, ID: r.ID,
Name: r.Name, Name: r.Name,
@@ -45,6 +51,9 @@ func (r *RoleEntity) ToResponse() *response.RoleResponse {
} }
func (r *RoleEntity) ToRoleSimple() *RoleSimple { func (r *RoleEntity) ToRoleSimple() *RoleSimple {
if r == nil {
return nil
}
return &RoleSimple{ return &RoleSimple{
ID: r.ID, ID: r.ID,
Name: r.Name, Name: r.Name,
@@ -53,20 +62,23 @@ func (r *RoleEntity) ToRoleSimple() *RoleSimple {
func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse { func RolesEntityToResponse(rs []*RoleEntity) []*response.RoleResponse {
out := make([]*response.RoleResponse, len(rs)) out := make([]*response.RoleResponse, len(rs))
for i := range rs { for _, role := range rs {
out[i] = rs[i].ToResponse() if role == nil {
continue
}
out = append(out, role.ToResponse())
} }
return out return out
} }
func RolesEntityToRoleConstant(rs []*RoleSimple) []constants.Role { func RolesEntityToRoleConstant(rs []*RoleSimple) []constants.Role {
out := make([]constants.Role, len(rs)) out := make([]constants.Role, len(rs))
for i := range rs { for _, role := range rs {
data, ok := constants.ParseRole(rs[i].Name) data, ok := constants.ParseRole(role.Name)
if !ok { if !ok {
continue continue
} }
out[i] = data out= append(out, data)
} }
return out return out
} }

View File

@@ -29,6 +29,9 @@ type UserSimpleEntity struct {
} }
func (u *UserSimpleEntity) ToResponse() *response.UserSimpleResponse { func (u *UserSimpleEntity) ToResponse() *response.UserSimpleResponse {
if u == nil {
return nil
}
return &response.UserSimpleResponse{ return &response.UserSimpleResponse{
ID: u.ID, ID: u.ID,
Email: u.Email, Email: u.Email,
@@ -55,6 +58,9 @@ func (u *UserEntity) ParseProfile(data []byte) error {
} }
func (u *UserEntity) ToResponse() *response.UserResponse { func (u *UserEntity) ToResponse() *response.UserResponse {
if u == nil {
return nil
}
return &response.UserResponse{ return &response.UserResponse{
ID: u.ID, ID: u.ID,
Email: u.Email, Email: u.Email,
@@ -67,10 +73,13 @@ func (u *UserEntity) ToResponse() *response.UserResponse {
} }
} }
func UsersEntityToResponse(rs []*UserEntity) []*response.UserResponse { func UsersEntityToResponse(users []*UserEntity) []*response.UserResponse {
out := make([]*response.UserResponse, len(rs)) out := make([]*response.UserResponse, len(users))
for i := range rs { for _, user := range users {
out[i] = rs[i].ToResponse() if user == nil {
continue
}
out = append(out, user.ToResponse())
} }
return out return out
} }

View File

@@ -90,8 +90,12 @@ func (u *UserVerificationEntity) ToResponse() *response.UserVerificationResponse
func UserVerificationsEntitiesToResponse(entities []*UserVerificationEntity) []*response.UserVerificationResponse { func UserVerificationsEntitiesToResponse(entities []*UserVerificationEntity) []*response.UserVerificationResponse {
responses := make([]*response.UserVerificationResponse, len(entities)) responses := make([]*response.UserVerificationResponse, len(entities))
for i, entity := range entities { for _, entity := range entities {
responses[i] = entity.ToResponse() if entity == nil {
continue
}
responses = append(responses, entity.ToResponse())
} }
return responses return responses
} }