fix: changed migration number to 00063 and merged with main

Author: corypride

backend/migrations/00062_add_audit_columns_to_all_tables.sql

@@ -24,6 +24,8 @@ import (
 const (
 	DaysInPast     = 90
 	MonthsInFuture = 6
+	SystemBatchID  = 99999
+	SystemBatchUID = "system_batch"
 )
 
 var (
@@ -50,6 +52,13 @@ func main() {
 func seedTestData(db *gorm.DB) {
 	// isTesting is false because this needs to seed real users w/ kratos
 	testServer := handlers.NewServer(false, context.Background())
+	var systemUser models.User
+	systemUserID := uint(SystemBatchID)
+	if err := db.Where("username = ?", SystemBatchUID).First(&systemUser).Error; err == nil {
+		systemUserID = systemUser.ID
+	}
+	db = db.WithContext(context.WithValue(context.Background(), models.UserIDKey, systemUserID))
+
 	facilities := []models.Facility{
 		{
 			Name:     "BCF",
@@ -157,13 +166,8 @@ func seedTestData(db *gorm.DB) {
 	outcomes := []string{"college_credit", "grade", "certificate", "pathway_completion"}
 	milestoneTypes := []models.MilestoneType{models.DiscussionPost, models.AssignmentSubmission, models.QuizSubmission, models.GradeReceived}
 
-	var adminUser models.User
-	if db.Where("role = ?", models.SystemAdmin).Limit(1).Find(&adminUser).Error != nil {
-		log.Fatalf("Failed to get users from db")
-		return
-	}
 	classes := []models.ProgramClass{}
-	classes, err = createFacilityPrograms(db, adminUser.ID)
+	classes, err = createFacilityPrograms(db)
 	if err != nil {
 		log.Printf("Failed to create facility programs: %v", err)
 	}
@@ -536,7 +540,7 @@ func generateFakeVideos(providerID uint, count int) []models.Video {
 	}
 	return videos
 }
-func createFacilityPrograms(db *gorm.DB, adminID uint) ([]models.ProgramClass, error) {
+func createFacilityPrograms(db *gorm.DB) ([]models.ProgramClass, error) {
 	facilities := []models.Facility{}
 	fundingTypes := [6]models.FundingType{models.EduGrants, models.FederalGrants, models.InmateWelfare, models.NonProfitOrgs, models.Other, models.StateGrants}
 	creditTypes := [4]models.CreditType{models.Completion, models.EarnedTime, models.Education, models.Participation}
@@ -579,9 +583,8 @@ func createFacilityPrograms(db *gorm.DB, adminID uint) ([]models.ProgramClass, e
 	programs := make([]models.Program, 0, 7)
 	for range 7 {
 		programs = append(programs, models.Program{
-			Name:         getRandomProgram(programMap),
-			FundingType:  fundingTypes[rand.Intn(len(fundingTypes))],
-			CreateUserID: adminID,
+			Name:        getRandomProgram(programMap),
+			FundingType: fundingTypes[rand.Intn(len(fundingTypes))],
 		})
 	}
 	for i := range programs {
@@ -626,7 +629,6 @@ func createFacilityPrograms(db *gorm.DB, adminID uint) ([]models.ProgramClass, e
 					EndDt:          &endDates[rand.Intn(len(endDates))],
 					FacilityID:     facilities[idx].ID,
 					ProgramID:      programs[i].ID,
-					CreateUserID:   adminID,
 				}
 				if err := db.Create(&class).Error; err != nil {
 					log.Printf("Failed to create program class: %v", err)

…d/migrations/00062_add_instructor_fk.sql …d/migrations/00063_add_instructor_fk.sqlbackend/migrations/00062_add_instructor_fk.sql renamed to backend/migrations/00063_add_instructor_fk.sql backend/migrations/00062_add_instructor_fk.sql renamed to backend/migrations/00063_add_instructor_fk.sql

@@ -2,11 +2,13 @@ package database
 
 import (
 	"UnlockEdv2/src/models"
+	"context"
 	"database/sql"
 	"encoding/json"
 	"fmt"
 	"os"
 	"sync"
+	"time"
 	"unicode"
 
 	"github.com/glebarez/sqlite"
@@ -51,7 +53,8 @@ func InitDB(isTesting bool) *DB {
 	var gormDb *gorm.DB
 	var err error
 	if isTesting {
-		gormDb, err = gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{
+		dbName := fmt.Sprintf("file:memdb_%d?mode=memory&cache=shared", time.Now().UnixNano())
+		gormDb, err = gorm.Open(sqlite.Open(dbName), &gorm.Config{
 			DisableForeignKeyConstraintWhenMigrating: true,
 		})
 		if err != nil {
@@ -163,43 +166,77 @@ func (db *DB) SeedDefaultData(isTesting bool) {
 				}
 			}
 		}
-		defaultFacility := models.Facility{
-			Name:     "Default",
-			Timezone: "America/Chicago",
-		}
-		logrus.Printf("Creating facility: %v", defaultFacility)
-		if err := db.Create(&defaultFacility).Error; err != nil {
-			logrus.Fatalf("Failed to create user: %v", err)
+
+		// Get system_batch user for audit field references
+		var systemBatchUser models.User
+		systemBatchUserID := uint(99999)
+		if err := db.Where("username = ?", "system_batch").First(&systemBatchUser).Error; err != nil {
+			logrus.Printf("Warning: system_batch user not found, this might indicate migration hasn't run yet: %v", err)
+		} else {
+			systemBatchUserID = systemBatchUser.ID
 		}
+		dbWithCtx := db.WithContext(context.WithValue(context.Background(), models.UserIDKey, systemBatchUserID))
+
 		user := models.User{
 			Username:   "SuperAdmin",
 			NameFirst:  "Super",
 			NameLast:   "Admin",
 			Email:      "[email protected]",
 			Role:       models.SystemAdmin,
-			FacilityID: 1,
+			FacilityID: 0, // will update after facility creation
+			DatabaseFields: models.DatabaseFields{
+				CreateUserID: &systemBatchUserID, // using system_batch user ID
+			},
 		}
 		logrus.Printf("Creating user: %v", user)
 		logrus.Println("Make sure to sync the Kratos instance if you are freshly migrating")
-		if err := db.Create(&user).Error; err != nil {
+		if err := dbWithCtx.Create(&user).Error; err != nil {
 			logrus.Fatalf("Failed to create user: %v", err)
 		}
 
+		// Step 2: Create facility referencing the user we just created
+		defaultFacility := models.Facility{
+			Name:     "Default",
+			Timezone: "America/Chicago",
+			DatabaseFields: models.DatabaseFields{
+				CreateUserID: &user.ID,
+			},
+		}
+		logrus.Printf("Creating facility: %v", defaultFacility)
+		if err := dbWithCtx.Create(&defaultFacility).Error; err != nil {
+			logrus.Fatalf("Failed to create facility: %v", err)
+
+		}
+
+		if err := db.Model(&user).Update("facility_id", defaultFacility.ID).Error; err != nil {
+			logrus.Fatalf("Failed to update user facility_id: %v", err)
+		}
+
 		links := []models.HelpfulLink{}
 		if err := json.Unmarshal([]byte(defaultLeftMenuLinks), &links); err != nil {
 			logrus.Fatalf("Failed to unmarshal default left menu links: %v", err)
 		}
-		if err := db.Create(&links).Error; err != nil {
+		if err := dbWithCtx.Create(&links).Error; err != nil {
 			logrus.Fatalf("Failed to create left menu links: %v", err)
 		}
 		for idx := range defaultOpenContentProviders {
-			if err := db.Create(&defaultOpenContentProviders[idx]).Error; err != nil {
+			if err := dbWithCtx.Create(&defaultOpenContentProviders[idx]).Error; err != nil {
 				logrus.Fatalf("Failed to create default open content providers: %v", err)
 			}
 		}
 	}
 }
 
+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/seeder/main.go

@@ -2,7 +2,6 @@ package database
 
 import (
 	"UnlockEdv2/src/models"
-	"context"
 	"fmt"
 	"time"
 )
@@ -110,10 +109,10 @@ func (db *DB) DeleteProgramClassEnrollments(id int) error {
 	return nil
 }
 
-func (db *DB) GraduateEnrollments(ctx context.Context, adminEmail string, userIds []int, classId int) error {
+func (db *DB) GraduateEnrollments(adminEmail string, userIds []int, classId int) error {
 	enrollment := models.ProgramClassEnrollment{}
 	// begin transaction
-	tx := db.WithContext(ctx).Begin()
+	tx := db.Begin()
 
 	// preload necessary relationships
 	err := tx.Model(&models.ProgramClassEnrollment{}).
@@ -176,6 +175,11 @@ func (db *DB) UpdateProgramClassEnrollments(classId int, userIds []int, status m
 	if changeReason != nil {
 		updates["change_reason"] = *changeReason
 	}
+	if ctx := db.Statement.Context; ctx != nil {
+		if userID, ok := ctx.Value(models.UserIDKey).(uint); ok {
+			updates["update_user_id"] = userID
+		}
+	}
 	if err := db.Model(&models.ProgramClassEnrollment{}).
 		Where("class_id = ? AND user_id IN (?)", classId, userIds).
 		Set("class_id", classId).
@@ -185,17 +189,23 @@ func (db *DB) UpdateProgramClassEnrollments(classId int, userIds []int, status m
 	return nil
 }
 
-func (db *DB) UpdateProgramClassEnrollmentDate(ctx context.Context, enrollmentId int, enrolledDate time.Time) error {
-	if err := db.WithContext(ctx).Model(&models.ProgramClassEnrollment{}).
+func (db *DB) UpdateProgramClassEnrollmentDate(enrollmentId int, enrolledDate time.Time) error {
+	update := map[string]any{"enrolled_at": enrolledDate}
+	if ctx := db.Statement.Context; ctx != nil {
+		if userID, ok := ctx.Value(models.UserIDKey).(uint); ok {
+			update["update_user_id"] = userID
+		}
+	}
+	if err := db.Model(&models.ProgramClassEnrollment{}).
 		Where("id = ?", enrollmentId).
-		Update("enrolled_at", enrolledDate).Error; err != nil {
+		Updates(update).Error; err != nil {
 		return newUpdateDBError(err, "enrollment date")
 	}
 	return nil
 }
 
-func (db *DB) UpdateProgramClasses(ctx context.Context, classIDs []int, classMap map[string]any) error {
-	tx := db.WithContext(ctx).Begin()
+func (db *DB) UpdateProgramClasses(classIDs []int, classMap map[string]any) error {
+	tx := db.Begin()
 	if tx.Error != nil {
 		return newUpdateDBError(tx.Error, "begin transaction")
 	}

backend/src/database/DB.go

@@ -37,16 +37,27 @@ func (db *DB) GetAttendees(queryParams *models.QueryContext, params url.Values,
 }
 
 func (db *DB) LogUserAttendance(attendanceParams []models.ProgramClassEventAttendance, ctx context.Context, adminID *uint, className string) error {
-	tx := db.Begin().WithContext(ctx)
+	var updateUserID uint
+	if ctx := db.Statement.Context; ctx != nil {
+		if userID, ok := ctx.Value(models.UserIDKey).(uint); ok {
+			updateUserID = userID
+		}
+	}
+	tx := db.Begin()
 	if tx.Error != nil {
 		return NewDBError(tx.Error, "unable to start DB transaction")
 	}
 
 	for _, att := range attendanceParams {
+		existingRow := updateUserID != 0 && att.ID != 0
+		if existingRow {
+			att.UpdateUserID = &updateUserID
+		}
+
 		if err := tx.
 			Clauses(clause.OnConflict{
 				Columns:   []clause.Column{{Name: "event_id"}, {Name: "user_id"}, {Name: "date"}},
-				DoUpdates: clause.AssignmentColumns([]string{"attendance_status", "note", "reason_category", "check_in_at", "check_out_at", "minutes_attended", "scheduled_minutes"}),
+				DoUpdates: clause.AssignmentColumns([]string{"attendance_status", "note", "reason_category", "check_in_at", "check_out_at", "minutes_attended", "scheduled_minutes", "update_user_id"}),
 			}).
 			Create(&att).Error; err != nil {
 			tx.Rollback()
@@ -219,8 +230,8 @@ func (db *DB) GetAttendanceRateForEvent(ctx context.Context, eventID int, classI
 			end
 		) * 100.0 /
 		nullif(
-			(select count(*) from program_class_enrollments e 
-			 where e.class_id = ? 
+			(select count(*) from program_class_enrollments e
+			 where e.class_id = ?
 			   and e.enrolled_at <= ?
 			   and (e.enrollment_ended_at IS NULL OR e.enrollment_ended_at >= ?)),
 			0
@@ -279,10 +290,10 @@ func (db *DB) GetAttendanceFlagsForClass(classID int, args *models.QueryContext)
 	}
 
 	attendanceQuery := fmt.Sprintf(`select name_first, name_last, doc_id, flag_type from (
-			select u.name_first, u.name_last, 
+			select u.name_first, u.name_last,
 			u.doc_id, 'no_attendance' as flag_type %s %s
 			union all
-			select u.name_first, u.name_last, 
+			select u.name_first, u.name_last,
 			u.doc_id, 'multiple_absences' as flag_type %s %s
 		) AS attendance_flags
 		ORDER BY name_last, name_first

backend/src/database/class_enrollments.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 func (db *DB) GetAllFacilities(page, itemsPerPage int) (int64, []models.Facility, error) {
@@ -43,16 +44,24 @@ func (db *DB) CreateFacility(facility *models.Facility) error {
 }
 
 func (db *DB) UpdateFacility(facility *models.Facility, id uint) error {
-	if err := db.Model(models.Facility{}).Where("id = ?", id).Updates(&facility).Error; err != nil {
+	facility.ID = id
+	if err := db.Save(&facility).Error; err != nil {
 		log.WithField("facility_id", facility.ID).Error("error updating facility name database/UpdateFacility")
 		return newUpdateDBError(err, "facilities")
 	}
 	return nil
 }
 
 func (db *DB) DeleteFacility(id int) error {
-	if err := db.Delete(&models.Facility{}, "id = ?", fmt.Sprintf("%d", id)).Error; err != nil {
-		return newDeleteDBError(err, "facilities")
+	updates := db.softDeleteMap()
+	result := db.Model(&models.Facility{}).
+		Where("id = ? AND deleted_at IS NULL", fmt.Sprintf("%d", id)).
+		Updates(updates)
+	if result.Error != nil {
+		return newDeleteDBError(result.Error, "facilities")
+	}
+	if result.RowsAffected == 0 {
+		return newDeleteDBError(gorm.ErrRecordNotFound, "facilities")
 	}
 	return nil
 }

backend/src/database/events_attendance.go

@@ -34,7 +34,13 @@ func (db *DB) ToggleFeatureAccess(name string) error {
 		return newCreateDBError(err, "unable to save feature")
 	}
 	if len(featureFlag.PageFeatures) > 0 {
-		if err := db.Model(&models.PageFeatureFlags{}).Where("feature_flag_id = ?", featureFlag.ID).Update("enabled", featureFlag.Enabled).Error; err != nil {
+		update := map[string]any{"enabled": featureFlag.Enabled}
+		if ctx := db.Statement.Context; ctx != nil {
+			if userID, ok := ctx.Value(models.UserIDKey).(uint); ok {
+				update["update_user_id"] = userID
+			}
+		}
+		if err := db.Model(&models.PageFeatureFlags{}).Where("feature_flag_id = ?", featureFlag.ID).Updates(update).Error; err != nil {
 			return newCreateDBError(err, "unable to update page features")
 		}
 	}