fixed relationship issues

internal/db/auditlog.go

@@ -28,7 +28,11 @@ type AuditLog struct {
 	User *User `bun:"rel:belongs-to,join:user_id=id"`
 }
 
-// TODO: add AuditLogs to match list style with PageOpts
+type AuditLogs struct {
+	AuditLogs []*AuditLog
+	Total     int
+	PageOpts  PageOpts
+}
 
 // CreateAuditLog creates a new audit log entry
 func CreateAuditLog(ctx context.Context, tx bun.Tx, log *AuditLog) error {
@@ -54,12 +58,12 @@ type AuditLogFilters struct {
 }
 
 // GetAuditLogs retrieves audit logs with optional filters and pagination
-// TODO: change this to use db.PageOpts
-func GetAuditLogs(ctx context.Context, tx bun.Tx, limit, offset int, filters *AuditLogFilters) ([]*AuditLog, int, error) {
+func GetAuditLogs(ctx context.Context, tx bun.Tx, pageOpts *PageOpts, filters *AuditLogFilters) (*AuditLogs, error) {
+	pageOpts = setDefaultPageOpts(pageOpts, 1, 50, bun.OrderDesc, "created_at")
 	query := tx.NewSelect().
 		Model((*AuditLog)(nil)).
 		Relation("User").
-		Order("created_at DESC")
+		OrderBy(pageOpts.OrderBy, pageOpts.Order)
 
 	// Apply filters if provided
 	if filters != nil {
@@ -80,48 +84,52 @@ func GetAuditLogs(ctx context.Context, tx bun.Tx, limit, offset int, filters *Au
 	// Get total count
 	total, err := query.Count(ctx)
 	if err != nil {
-		return nil, 0, errors.Wrap(err, "query.Count")
+		return nil, errors.Wrap(err, "query.Count")
 	}
 
 	// Get paginated results
-	var logs []*AuditLog
+	logs := new([]*AuditLog)
 	err = query.
-		Limit(limit).
-		Offset(offset).
+		Offset(pageOpts.PerPage*(pageOpts.Page-1)).
+		Limit(pageOpts.PerPage).
 		Scan(ctx, &logs)
 	if err != nil && err != sql.ErrNoRows {
-		return nil, 0, errors.Wrap(err, "query.Scan")
+		return nil, errors.Wrap(err, "query.Scan")
 	}
 
-	return logs, total, nil
+	list := &AuditLogs{
+		AuditLogs: *logs,
+		Total:     total,
+		PageOpts:  *pageOpts,
+	}
+
+	return list, nil
 }
 
 // GetAuditLogsByUser retrieves audit logs for a specific user
-// TODO: change this to use db.PageOpts
-func GetAuditLogsByUser(ctx context.Context, tx bun.Tx, userID int, limit, offset int) ([]*AuditLog, int, error) {
+func GetAuditLogsByUser(ctx context.Context, tx bun.Tx, userID int, pageOpts *PageOpts) (*AuditLogs, error) {
 	if userID <= 0 {
-		return nil, 0, errors.New("userID must be positive")
+		return nil, errors.New("userID must be positive")
 	}
 
 	filters := &AuditLogFilters{
 		UserID: &userID,
 	}
 
-	return GetAuditLogs(ctx, tx, limit, offset, filters)
+	return GetAuditLogs(ctx, tx, pageOpts, filters)
 }
 
 // GetAuditLogsByAction retrieves audit logs for a specific action
-// TODO: change this to use db.PageOpts
-func GetAuditLogsByAction(ctx context.Context, tx bun.Tx, action string, limit, offset int) ([]*AuditLog, int, error) {
+func GetAuditLogsByAction(ctx context.Context, tx bun.Tx, action string, pageOpts *PageOpts) (*AuditLogs, error) {
 	if action == "" {
-		return nil, 0, errors.New("action cannot be empty")
+		return nil, errors.New("action cannot be empty")
 	}
 
 	filters := &AuditLogFilters{
 		Action: &action,
 	}
 
-	return GetAuditLogs(ctx, tx, limit, offset, filters)
+	return GetAuditLogs(ctx, tx, pageOpts, filters)
 }
 
 // CleanupOldAuditLogs deletes audit logs older than the specified timestamp