Add new file activity.

server/dao/activity.go

@@ -29,6 +29,15 @@ func AddNewCommentActivity(userID, commentID uint) error {
 	return db.Create(activity).Error
 }
 
+func AddNewFileActivity(userID, fileID uint) error {
+	activity := &model.Activity{
+		UserID: userID,
+		Type:   model.ActivityTypeNewFile,
+		RefID:  fileID,
+	}
+	return db.Create(activity).Error
+}
+
 func DeleteResourceActivity(resourceID uint) error {
 	return db.Where("ref_id = ? AND (type = ? OR type = ?)", resourceID, model.ActivityTypeNewResource, model.ActivityTypeUpdateResource).Delete(&model.Activity{}).Error
 }

server/dao/file.go

@@ -106,6 +106,8 @@ func CreateFile(filename string, description string, resourceID uint, storageID
 		return nil, err
 	}
 
+	_ = AddNewFileActivity(userID, f.ID)
+
 	return f, nil
 }
 
@@ -120,6 +122,17 @@ func GetFile(id string) (*model.File, error) {
 	return f, nil
 }
 
+func GetFileByID(id uint) (*model.File, error) {
+	f := &model.File{}
+	if err := db.Preload("Storage").Where("id = ?", id).First(f).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, model.NewNotFoundError("file not found")
+		}
+		return nil, err
+	}
+	return f, nil
+}
+
 func DeleteFile(id string) error {
 	f := &model.File{}
 	if err := db.Where("uuid = ?", id).First(f).Error; err != nil {
@@ -130,8 +143,21 @@ func DeleteFile(id string) error {
 		if err := tx.Delete(f).Error; err != nil {
 			return err
 		}
-		return tx.Model(&model.User{}).Where("id = ?", f.UserID).
-			UpdateColumn("files_count", gorm.Expr("files_count - ?", 1)).Error
+		if err := tx.
+			Model(&model.User{}).
+			Where("id = ?", f.UserID).
+			UpdateColumn("files_count", gorm.Expr("files_count - ?", 1)).
+			Error; err != nil {
+			return err
+		}
+		if err := tx.
+			Model(&model.Activity{}).
+			Where("type = ? AND ref_id = ?", model.ActivityTypeNewFile, f.ID).
+			Delete(&model.Activity{}).
+			Error; err != nil {
+			return err
+		}
+		return nil
 	}); err != nil {
 		return err
 	}

server/dao/resource.go

@@ -122,6 +122,9 @@ func DeleteResource(id uint) error {
 			}
 			return err
 		}
+		if err := tx.Unscoped().Model(&model.File{}).Where("resource_id = ?", id).Delete(&model.File{}).Error; err != nil {
+			return err
+		}
 		if err := tx.Model(&model.User{}).Where("id = ?", r.UserID).Update("resources_count", gorm.Expr("resources_count - ?", 1)).Error; err != nil {
 			return err
 		}
@@ -540,7 +543,10 @@ func RandomResource() (model.Resource, error) {
 		return model.Resource{}, err
 	}
 	for {
-		randomID := uint(1 + rand.Int63n(maxID-1))
+		randomID := uint(1)
+		if maxID > 1 {
+			randomID = uint(1 + rand.Int63n(maxID-1))
+		}
 		var resource model.Resource
 		if err := db.
 			Preload("User").