Merge remote-tracking branch 'origin/dev/guerby' into dev/cedric

backend/cmd/migrate/migrations/20250210084555_add_events_columns.go

@@ -0,0 +1,61 @@
+package migrations
+
+import (
+	"context"
+	"fmt"
+
+	"fr.latosa-escrima/core/models"
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	Migrations.MustRegister(func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [up migration] ")
+		_, err := db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("full_day BOOLEAN NOT NULL DEFAULT FALSE").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Add "is_visible" column
+		_, err = db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("is_visible BOOLEAN NOT NULL DEFAULT TRUE").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		// Add "rrule" column
+		_, err = db.NewAddColumn().
+			Model((*models.Event)(nil)).
+			ColumnExpr("rrule TEXT").
+			Exec(ctx)
+		return err
+	}, func(ctx context.Context, db *bun.DB) error {
+		fmt.Print(" [down migration] ")
+		_, err := db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("full_day").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("is_visible").
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = db.NewDropColumn().
+			Model((*models.Event)(nil)).
+			Column("rrule").
+			Exec(ctx)
+		return err
+	})
+}

backend/core/models/events.go

@@ -7,13 +7,6 @@ import (
 	"github.com/uptrace/bun"
 )
 
-type Status string
-
-const (
-	Active   Status = "Active"
-	Inactive Status = "Inactive"
-)
-
 type Event struct {
 	bun.BaseModel `bun:"table:events"`
 
@@ -22,5 +15,7 @@ type Event struct {
 	CreationDate  time.Time `bun:"creation_date,notnull,default:current_timestamp" json:"creationDate"`
 	ScheduleStart time.Time `bun:"schedule_start,notnull" json:"start"`
 	ScheduleEnd   time.Time `bun:"schedule_end,notnull" json:"end"`
-	Status        Status    `bun:"status,notnull,default:'Inactive'" json:"status"`
+	FullDay       bool      `bun:"full_day,notnull,default:false" json:"fullDay"`
+	IsVisible     bool      `bun:"is_visible,notnull,default:true" json:"isVisible"`
+	Rrule         string    `bun:"rrule" json:"rrule"`
 }