fix: clean up code with helper function

Author: carddev81

backend/src/database/DB.go

@@ -227,6 +227,16 @@ func (db *DB) SeedDefaultData(isTesting bool) {
 	}
 }
 
+func (db *DB) softDeleteMap() map[string]any {
+	updates := map[string]any{
+		"deleted_at": time.Now(),
+	}
+	if userID, ok := db.Statement.Context.Value(models.UserIDKey).(uint); ok {
+		updates["update_user_id"] = userID
+	}
+	return updates
+}
+
 const (
 	defaultLeftMenuLinks = `[{
 			"title": "Unlocked Labs",

backend/src/database/facilities.go

@@ -3,7 +3,6 @@ package database
 import (
 	"UnlockEdv2/src/models"
 	"fmt"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
@@ -54,12 +53,7 @@ func (db *DB) UpdateFacility(facility *models.Facility, id uint) error {
 }
 
 func (db *DB) DeleteFacility(id int) error {
-	updates := map[string]any{
-		"deleted_at": time.Now(),
-	}
-	if userID, ok := db.Statement.Context.Value(models.UserIDKey).(uint); ok {
-		updates["update_user_id"] = userID
-	}
+	updates := db.softDeleteMap()
 	result := db.Model(&models.Facility{}).
 		Where("id = ? AND deleted_at IS NULL", fmt.Sprintf("%d", id)).
 		Updates(updates)

backend/src/database/users.go

@@ -211,12 +211,7 @@ func (db *DB) CreateUser(user *models.User) error {
 }
 
 func (db *DB) DeleteUser(id int) error {
-	updates := map[string]any{
-		"deleted_at": time.Now(),
-	}
-	if userID, ok := db.Statement.Context.Value(models.UserIDKey).(uint); ok {
-		updates["update_user_id"] = userID
-	}
+	updates := db.softDeleteMap()
 	result := db.Model(&models.User{}).
 		Where("id = ? AND deleted_at IS NULL", id).
 		Updates(updates)

backend/src/models/program.go

@@ -90,12 +90,12 @@ var AllCreditTypes = []CreditType{
 
 type Program struct {
 	DatabaseFields
-	Name         string      `json:"name" gorm:"not null;unique" validate:"required,max=255"`
-	Description  string      `json:"description" gorm:"not null" validate:"required,max=255"`
-	FundingType  FundingType `json:"funding_type" gorm:"type:funding_type" validate:"required"`
-	IsActive     bool        `json:"is_active" gorm:"not null"`
-	IsFavorited  bool        `json:"is_favorited" gorm:"-"`
-	ArchivedAt   *time.Time  `json:"archived_at"`
+	Name        string      `json:"name" gorm:"not null;unique" validate:"required,max=255"`
+	Description string      `json:"description" gorm:"not null" validate:"required,max=255"`
+	FundingType FundingType `json:"funding_type" gorm:"type:funding_type" validate:"required"`
+	IsActive    bool        `json:"is_active" gorm:"not null"`
+	IsFavorited bool        `json:"is_favorited" gorm:"-"`
+	ArchivedAt  *time.Time  `json:"archived_at"`
 
 	ProgramTypes       []ProgramType        `json:"program_types" gorm:"foreignKey:ProgramID;references:ID;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`
 	ProgramCreditTypes []ProgramCreditType  `json:"credit_types" gorm:"foreignKey:ProgramID;references:ID;constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"`