优化结构

internal/data/repository/media_upload.go

@@ -3,10 +3,9 @@ package system
 import (
 	"context"
 	"errors"
+	"kra/internal/biz/system"
 	"time"
 
-	"kra/internal/biz"
-
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
@@ -42,30 +41,30 @@ type uploadChunkPO struct {
 
 func (uploadChunkPO) TableName() string { return "media_upload_chunks" }
 
-func uploadFromPO(v uploadSessionPO) *biz.UploadSession {
-	return &biz.UploadSession{ID: v.ID, UserID: v.UserID, FileName: v.FileName, FileHash: v.FileHash, FileSize: v.FileSize, ChunkSize: v.ChunkSize, ChunkTotal: v.ChunkTotal, Status: v.Status, StorageKey: v.StorageKey, MediaID: v.MediaID}
+func uploadFromPO(v uploadSessionPO) *system.UploadSession {
+	return &system.UploadSession{ID: v.ID, UserID: v.UserID, FileName: v.FileName, FileHash: v.FileHash, FileSize: v.FileSize, ChunkSize: v.ChunkSize, ChunkTotal: v.ChunkTotal, Status: v.Status, StorageKey: v.StorageKey, MediaID: v.MediaID}
 }
-func (r *mediaRepo) FindCompletedSession(ctx context.Context, userID uint, hash string) (*biz.UploadSession, error) {
+func (r *mediaRepo) FindCompletedSession(ctx context.Context, userID uint, hash string) (*system.UploadSession, error) {
 	var po uploadSessionPO
 	if err := r.data.DB().WithContext(ctx).Where("user_id = ? AND file_hash = ? AND status = ?", userID, hash, "completed").First(&po).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, biz.ErrUploadSessionNotFound
+			return nil, system.ErrUploadSessionNotFound
 		}
 		return nil, err
 	}
 	return uploadFromPO(po), nil
 }
-func (r *mediaRepo) FindUploadingSession(ctx context.Context, userID uint, hash string) (*biz.UploadSession, error) {
+func (r *mediaRepo) FindUploadingSession(ctx context.Context, userID uint, hash string) (*system.UploadSession, error) {
 	var po uploadSessionPO
 	if err := r.data.DB().WithContext(ctx).Where("user_id = ? AND file_hash = ? AND status = ?", userID, hash, "uploading").First(&po).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, biz.ErrUploadSessionNotFound
+			return nil, system.ErrUploadSessionNotFound
 		}
 		return nil, err
 	}
 	return uploadFromPO(po), nil
 }
-func (r *mediaRepo) CreateUploadSession(ctx context.Context, v *biz.UploadSession) error {
+func (r *mediaRepo) CreateUploadSession(ctx context.Context, v *system.UploadSession) error {
 	po := uploadSessionPO{UserID: v.UserID, FileName: v.FileName, FileHash: v.FileHash, FileSize: v.FileSize, ChunkSize: v.ChunkSize, ChunkTotal: v.ChunkTotal, Status: v.Status}
 	if err := r.data.DB().WithContext(ctx).Create(&po).Error; err != nil {
 		return err
@@ -73,7 +72,7 @@ func (r *mediaRepo) CreateUploadSession(ctx context.Context, v *biz.UploadSessio
 	v.ID = po.ID
 	return nil
 }
-func (r *mediaRepo) FindUploadSession(ctx context.Context, id uint) (*biz.UploadSession, error) {
+func (r *mediaRepo) FindUploadSession(ctx context.Context, id uint) (*system.UploadSession, error) {
 	var po uploadSessionPO
 	if err := r.data.DB().WithContext(ctx).First(&po, id).Error; err != nil {
 		return nil, err
@@ -95,21 +94,21 @@ func (r *mediaRepo) DeleteUploadSession(ctx context.Context, id uint) error {
 	// for audit/recovery rather than physically removing it.
 	return r.data.DB().WithContext(ctx).Delete(&uploadSessionPO{}, id).Error
 }
-func (r *mediaRepo) UpsertChunk(ctx context.Context, uploadID uint, v *biz.UploadChunk) error {
+func (r *mediaRepo) UpsertChunk(ctx context.Context, uploadID uint, v *system.UploadChunk) error {
 	po := uploadChunkPO{UploadID: uploadID, ChunkIndex: v.Index, ChunkHash: v.Hash, Size: v.Size}
 	return r.data.DB().WithContext(ctx).Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "upload_id"}, {Name: "chunk_index"}},
 		DoUpdates: clause.AssignmentColumns([]string{"chunk_hash", "size", "updated_at", "deleted_at"}),
 	}).Create(&po).Error
 }
-func (r *mediaRepo) ListChunks(ctx context.Context, uploadID uint) ([]*biz.UploadChunk, error) {
+func (r *mediaRepo) ListChunks(ctx context.Context, uploadID uint) ([]*system.UploadChunk, error) {
 	var pos []uploadChunkPO
 	if err := r.data.DB().WithContext(ctx).Where("upload_id = ?", uploadID).Order("chunk_index").Find(&pos).Error; err != nil {
 		return nil, err
 	}
-	out := make([]*biz.UploadChunk, 0, len(pos))
+	out := make([]*system.UploadChunk, 0, len(pos))
 	for _, po := range pos {
-		out = append(out, &biz.UploadChunk{Index: po.ChunkIndex, Hash: po.ChunkHash, Size: po.Size})
+		out = append(out, &system.UploadChunk{Index: po.ChunkIndex, Hash: po.ChunkHash, Size: po.Size})
 	}
 	return out, nil
 }