优化

internal/service/media.go

@@ -19,36 +19,36 @@ func NewMediaService(uc *biz.MediaUsecase, settings biz.RuntimeSettings) *MediaS
 func (s *MediaService) MediaConfig() biz.MediaSettings {
 	return s.settings.MediaSettings()
 }
-func mediaDTO(v *biz.MediaFile) map[string]any {
-	return map[string]any{"ID": v.ID, "CreatedAt": v.CreatedAt, "UpdatedAt": v.UpdatedAt, "DeletedAt": nil, "name": v.Name, "classId": v.CategoryID, "url": v.URL, "tag": v.Tag, "key": v.Key, "size": v.Size, "mime": v.Mime, "md5": v.MD5, "userId": v.UserID}
+func mediaDTO(v *biz.MediaFile) *dto.MediaResponse {
+	return &dto.MediaResponse{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, DeletedAt: nil, Name: v.Name, ClassID: v.CategoryID, URL: v.URL, Tag: v.Tag, Key: v.Key, Size: v.Size, Mime: v.Mime, MD5: v.MD5, UserID: v.UserID}
 }
-func categoryDTO(v *biz.AttachmentCategory) map[string]any {
-	children := make([]map[string]any, 0, len(v.Children))
+func categoryDTO(v *biz.AttachmentCategory) *dto.MediaCategoryResponse {
+	children := make([]*dto.MediaCategoryResponse, 0, len(v.Children))
 	for _, x := range v.Children {
 		children = append(children, categoryDTO(x))
 	}
-	return map[string]any{"ID": v.ID, "CreatedAt": v.CreatedAt, "UpdatedAt": v.UpdatedAt, "DeletedAt": nil, "name": v.Name, "pid": v.ParentID, "children": children}
+	return &dto.MediaCategoryResponse{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, DeletedAt: nil, Name: v.Name, PID: v.ParentID, Children: children}
 }
-func (s *MediaService) Upload(ctx context.Context, userID uint, name, mime string, categoryID int, reader io.Reader, save bool) (map[string]any, error) {
+func (s *MediaService) Upload(ctx context.Context, userID uint, name, mime string, categoryID int, reader io.Reader, save bool) (*dto.MediaResponse, error) {
 	v, err := s.uc.Upload(ctx, userID, name, mime, categoryID, reader, save)
 	if err != nil {
 		return nil, err
 	}
 	return mediaDTO(v), nil
 }
-func (s *MediaService) Media(ctx context.Context, id uint) (map[string]any, error) {
+func (s *MediaService) Media(ctx context.Context, id uint) (*dto.MediaResponse, error) {
 	v, err := s.uc.FindMedia(ctx, id)
 	if err != nil {
 		return nil, err
 	}
 	return mediaDTO(v), nil
 }
-func (s *MediaService) MediaList(ctx context.Context, filter biz.MediaFilter) ([]map[string]any, int64, error) {
+func (s *MediaService) MediaList(ctx context.Context, filter biz.MediaFilter) ([]*dto.MediaResponse, int64, error) {
 	items, total, err := s.uc.ListMedia(ctx, filter)
 	if err != nil {
 		return nil, 0, err
 	}
-	out := make([]map[string]any, 0, len(items))
+	out := make([]*dto.MediaResponse, 0, len(items))
 	for _, v := range items {
 		out = append(out, mediaDTO(v))
 	}
@@ -68,23 +68,23 @@ func (s *MediaService) ImportURLRequests(ctx context.Context, values []dto.Impor
 	}
 	return s.ImportURLs(ctx, items)
 }
-func (s *MediaService) Storage(ctx context.Context, prefix, cursor string, limit int) ([]map[string]any, string, bool, error) {
+func (s *MediaService) Storage(ctx context.Context, prefix, cursor string, limit int) ([]*dto.StorageObjectResponse, string, bool, error) {
 	items, next, more, err := s.uc.ListStorage(ctx, prefix, cursor, limit)
 	if err != nil {
 		return nil, "", false, err
 	}
-	out := make([]map[string]any, 0, len(items))
+	out := make([]*dto.StorageObjectResponse, 0, len(items))
 	for _, v := range items {
-		out = append(out, map[string]any{"name": v.Name, "key": v.Path, "url": v.URL, "size": v.Size})
+		out = append(out, &dto.StorageObjectResponse{Name: v.Name, Key: v.Path, URL: v.URL, Size: v.Size})
 	}
 	return out, next, more, nil
 }
-func (s *MediaService) Categories(ctx context.Context) ([]map[string]any, error) {
+func (s *MediaService) Categories(ctx context.Context) ([]*dto.MediaCategoryResponse, error) {
 	items, err := s.uc.ListCategories(ctx)
 	if err != nil {
 		return nil, err
 	}
-	out := make([]map[string]any, 0, len(items))
+	out := make([]*dto.MediaCategoryResponse, 0, len(items))
 	for _, v := range items {
 		out = append(out, categoryDTO(v))
 	}