feat: added cancel enums to booking

Author: fullstacksherpa

cmd/api/api.go

@@ -123,6 +123,7 @@ func (app *application) mount() http.Handler {
 			r.Get("/is-venue-owner", app.isVenueOwnerHandler)
 			r.Post("/", app.createVenueHandler)
 			r.Post("/{venueID}/reviews", app.createVenueReviewHandler)
+			r.Post("/{venueID}/cancel-bookings/{bookingID}", app.cancelBookingHandler)
 			r.Post("/{venueID}/bookings", app.bookVenueHandler)
 			r.Get("/{venueID}/reviews", app.getVenueReviewsHandler)
 			r.Post("/{venueID}/favorite", app.addFavoriteHandler)      // Add favorite
@@ -135,6 +136,7 @@ func (app *application) mount() http.Handler {
 				r.Get("/pricing", app.getVenuePricing)
 				r.Delete("/", app.deleteVenueHandler)
 				r.Get("/pending-bookings", app.getPendingBookingsHandler)
+				r.Get("/canceled-bookings", app.getCanceledBookingsHandler)
 				r.Get("/venue-info", app.getVenueInfoHandler)
 				r.Get("/scheduled-bookings", app.getScheduledBookingsHandler)
 				r.Post("/pending-bookings/{bookingID}/accept", app.acceptBookingHandler)
@@ -219,7 +221,7 @@ func (app *application) mount() http.Handler {
 	return r
 }
 
-func (app *application) run(mux http.Handler) error {
+func (app *application) run(mux http.Handler, cancel context.CancelFunc) error {
 	// Docs
 	docs.SwaggerInfo.Version = version
 	docs.SwaggerInfo.Host = app.config.apiURL
@@ -243,21 +245,21 @@ func (app *application) run(mux http.Handler) error {
 
 	go func() {
 		quit := make(chan os.Signal, 1)
-
 		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+
 		s := <-quit
+		app.logger.Infow("signal caught", "signal", s.String())
 
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		defer cancel()
+		cancel()
 
-		app.logger.Infow("signal caught", "signal", s.String())
+		ctx, cancelTimeout := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancelTimeout()
 
 		if err := srv.Shutdown(ctx); err != nil {
 			shutdown <- err
 		}
 
 		close(shutdown)
-
 	}()
 
 	app.logger.Infow("server has started", "addr", app.config.addr, "env", app.config.env)

cmd/api/background.go

@@ -1,29 +1,39 @@
 package main
 
 import (
+	"context"
 	"time"
 )
 
-func (app *application) markCompletedGamesEvery30Mins() {
+func (app *application) runMarkCompletedGames() {
+	if err := app.store.Games.MarkCompletedGames(); err != nil {
+		app.logger.Errorf("Error marking games as completed: %v", err)
+	} else {
+		app.logger.Infof("Successfully marked games as completed at %s", time.Now().UTC().Format(time.RFC3339))
+	}
+}
+
+func (app *application) markCompletedGamesEvery30Mins(ctx context.Context) {
 	go func() {
+
+		defer func() {
+			if r := recover(); r != nil {
+				app.logger.Errorf("Recovered from panic in markCompletedGamesEvery30Mins: %v", r)
+			}
+		}()
 		ticker := time.NewTicker(30 * time.Minute)
 		defer ticker.Stop()
 
 		// Run once immediately
-		err := app.store.Games.MarkCompletedGames()
-		if err != nil {
-			app.logger.Errorf("Error marking games as completed: %v", err)
-		} else {
-			app.logger.Infof("Successfully marked games as completed at %s", time.Now().Format(time.RFC1123))
-		}
+		app.runMarkCompletedGames()
 
-		// Then run every 30 minutes
-		for range ticker.C {
-			err := app.store.Games.MarkCompletedGames()
-			if err != nil {
-				app.logger.Errorf("Error marking games as completed: %v", err)
-			} else {
-				app.logger.Infof("Successfully marked games as completed at %s", time.Now().Format(time.RFC1123))
+		for {
+			select {
+			case <-ctx.Done():
+				app.logger.Info("Stopped markCompletedGamesEvery30Mins due to context cancellation")
+				return
+			case <-ticker.C:
+				app.runMarkCompletedGames()
 			}
 		}
 	}()

cmd/api/booking.go

@@ -712,6 +712,57 @@ func (app *application) getScheduledBookingsHandler(w http.ResponseWriter, r *ht
 	app.jsonResponse(w, http.StatusOK, bookings)
 }
 
+// getCanceledBookingsHandler godoc
+//
+//	@Summary		List Canceled booking requests for a venue
+//	@Description	Returns all bookings with status="canceled" for a given venue and date.
+//	@Tags			Venue-Owner
+//	@Accept			json
+//	@Produce		json
+//	@Param			venueID	path		int						true	"Venue ID"
+//	@Param			date	query		string					true	"Date in YYYY-MM-DD format"
+//	@Success		200		{array}		store.ScheduledBooking	"Scheduled bookings"
+//	@Failure		400		{object}	error					"Bad Request"
+//	@Failure		500		{object}	error					"Internal Server Error"
+//	@Security		ApiKeyAuth
+//	@Router			/venues/{venueID}/canceled-bookings [get]
+func (app *application) getCanceledBookingsHandler(w http.ResponseWriter, r *http.Request) {
+	// 1) parse venueID
+	vid, err := strconv.ParseInt(chi.URLParam(r, "venueID"), 10, 64)
+	if err != nil {
+		app.badRequestResponse(w, r, fmt.Errorf("invalid venueID: %w", err))
+		return
+	}
+
+	// 2) parse date query
+	dateStr := r.URL.Query().Get("date")
+	if dateStr == "" {
+		app.badRequestResponse(w, r, errors.New("missing date"))
+		return
+	}
+
+	loc, _ := time.LoadLocation("Asia/Kathmandu")
+
+	// Parse date string in Kathmandu local time
+	date, err := time.ParseInLocation("2006-01-02", dateStr, loc)
+	if err != nil {
+		app.badRequestResponse(w, r, fmt.Errorf("invalid date format: %w", err))
+		return
+	}
+
+	//date will be Parsed time is: 2025-06-29 00:00:00 +0545 +0545
+
+	// 3) fetch from store
+	bookings, err := app.store.Bookings.GetCanceledBookingsForVenueDate(r.Context(), vid, date)
+	if err != nil {
+		app.internalServerError(w, r, err)
+		return
+	}
+
+	// 4) respond JSON
+	app.jsonResponse(w, http.StatusOK, bookings)
+}
+
 // acceptBookingHandler godoc
 //
 //	@Summary		Accept a pending booking request
@@ -797,6 +848,65 @@ func (app *application) rejectBookingHandler(w http.ResponseWriter, r *http.Requ
 	w.WriteHeader(http.StatusNoContent)
 }
 
+// cancelBookingHandler godoc
+//
+//	@Summary		Cancel a pending booking request or confirmed booking
+//	@Description	Marks the booking with status="pending or confirmed" as "canceled".
+//	@Tags			Venue
+//	@Accept			json
+//	@Produce		json
+//	@Param			venueID		path	int	true	"Venue ID"
+//	@Param			bookingID	path	int	true	"Booking ID"
+//	@Success		204
+//	@Failure		400	{object}	error	"Bad Request"
+//	@Failure		404	{object}	error	"Not Found"
+//	@Failure		500	{object}	error	"Internal Server Error"
+//	@Security		ApiKeyAuth
+//	@Router			/venues/{venueID}/cancel-bookings/{bookingID} [post]
+func (app *application) cancelBookingHandler(w http.ResponseWriter, r *http.Request) {
+	vid, err := strconv.ParseInt(chi.URLParam(r, "venueID"), 10, 64)
+	if err != nil {
+		app.badRequestResponse(w, r, fmt.Errorf("invalid venueID: %w", err))
+		return
+	}
+	bid, err := strconv.ParseInt(chi.URLParam(r, "bookingID"), 10, 64)
+	if err != nil {
+		app.badRequestResponse(w, r, fmt.Errorf("invalid bookingID: %w", err))
+		return
+	}
+
+	// 🔐 Step 1: Extract userID from context (set by your auth middleware)
+	authUser := getUserFromContext(r) // assuming this returns a struct with ID
+	if authUser == nil {
+		app.unauthorizedErrorResponse(w, r, errors.New("check Bearer token"))
+		return
+	}
+
+	// 🔍 Step 2: Check ownership
+	ownerID, err := app.store.Bookings.GetBookingOwner(r.Context(), vid, bid)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			app.notFoundResponse(w, r, errors.New("booking not found"))
+		} else {
+			app.internalServerError(w, r, err)
+		}
+		return
+	}
+
+	if ownerID != authUser.ID {
+		app.forbiddenResponse(w, r)
+		return
+	}
+
+	// ✅ Step 3: Cancel booking
+	if err := app.store.Bookings.CancelBooking(r.Context(), vid, bid); err != nil {
+		app.internalServerError(w, r, err)
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}
+
 // getBookingsByUserHandler godoc
 //
 //	@Summary		List all bookings for a user

cmd/api/games.go

@@ -54,13 +54,9 @@ func (app *application) createGameHandler(w http.ResponseWriter, r *http.Request
 		app.badRequestResponse(w, r, err)
 		return
 	}
-	//TODO: delete later
-	fmt.Printf("validated payload is %v:", payload)
 
 	// 2. Get the authenticated user
 	user := getUserFromContext(r)
-	//TODO: delete later
-	fmt.Printf("the user to create game is %v", user.FirstName)
 
 	// 4. Create the game
 	game := &store.Game{

cmd/api/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"expvar"
 	"fmt"
 	"khel/internal/auth"
@@ -97,7 +98,7 @@ var version = "1.2.0"
 func main() {
 	err := godotenv.Load()
 	if err != nil {
-		log.Fatalf("Error loading .env file: %v", err)
+		log.Fatalf("Error loading .env file via godotenv.load: %v", err)
 	}
 	// Retrieve and convert maxOpenConns
 	maxOpenConnsStr := os.Getenv("DB_MAX_OPEN_CONNS")
@@ -213,9 +214,12 @@ func main() {
 		return runtime.NumGoroutine()
 	}))
 
-	app.markCompletedGamesEvery30Mins()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	app.markCompletedGamesEvery30Mins(ctx)
 
 	mux := app.mount()
 
-	logger.Fatal(app.run(mux))
+	logger.Fatal(app.run(mux, cancel))
 }

cmd/migrate/migrations/000029_add_canceled_to_booking_status.down.sql

@@ -0,0 +1,16 @@
+-- 1. Delete rows that use 'canceled' (or handle them another way)
+DELETE FROM bookings WHERE status = 'canceled';
+
+-- 2. Rename current enum
+ALTER TYPE booking_status RENAME TO booking_status_old;
+
+-- 3. Recreate enum without 'canceled'
+CREATE TYPE booking_status AS ENUM ('confirmed', 'pending', 'rejected', 'done');
+
+-- 4. Alter column to use new enum
+ALTER TABLE bookings
+ALTER COLUMN status TYPE booking_status
+USING status::text::booking_status;
+
+-- 5. Drop old enum type
+DROP TYPE booking_status_old;

cmd/migrate/migrations/000029_add_canceled_to_booking_status.up.sql

@@ -0,0 +1,2 @@
+-- Add new value to the existing enum
+ALTER TYPE booking_status ADD VALUE IF NOT EXISTS 'canceled';