feat: added background job

Author: fullstacksherpa

cmd/api/api.go

@@ -10,7 +10,6 @@ import (
 	"khel/internal/mailer"
 	"khel/internal/ratelimiter"
 	"khel/internal/store"
-	"log"
 
 	"net/http"
 	"os"
@@ -82,14 +81,6 @@ type dbConfig struct {
 func (app *application) mount() http.Handler {
 	r := chi.NewRouter()
 
-	//TODO:remove later
-	r.Use(func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			log.Printf("Incoming request: %s %s\n", r.Method, r.URL.Path)
-			next.ServeHTTP(w, r)
-		})
-	})
-
 	r.Use(middleware.RequestID)
 	r.Use(middleware.StripSlashes)
 	r.Use(middleware.RealIP)
@@ -99,7 +90,7 @@ func (app *application) mount() http.Handler {
 
 	r.Use(cors.Handler(cors.Options{
 		AllowedOrigins:   []string{"https://*", "http://*"},
-		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
 		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
 		ExposedHeaders:   []string{"Link"},
 		AllowCredentials: false,
@@ -112,8 +103,8 @@ func (app *application) mount() http.Handler {
 	r.Route("/v1", func(r chi.Router) {
 		r.Get("/venue/{id}", app.getVenueDetailHandler)
 		r.Get("/health", app.healthCheckHandler)
-		docsURL := fmt.Sprintf("%s/swagger/doc.json", app.config.addr)
-		r.Get("/swagger/*", httpSwagger.Handler(httpSwagger.URL(docsURL)))
+		docsURL := fmt.Sprintf("%s/v1/swagger/doc.json", app.config.addr)
+		r.With(app.BasicAuthMiddleware()).Get("/swagger/*", httpSwagger.Handler(httpSwagger.URL(docsURL)))
 
 		r.With(app.BasicAuthMiddleware()).Get("/debug/vars", expvar.Handler().ServeHTTP)
 

cmd/api/auth.go

@@ -15,6 +15,26 @@ import (
 	"github.com/google/uuid"
 )
 
+// ErrorBadRequestResponse represents the standard error format for bad request API responses.
+//
+//	@name			ErrorBadRequestResponse
+//	@description	Standard error response format returned by all bad request API endpoints
+type ErrorBadRequestResponse struct {
+	Success bool   `json:"success" example:"false"`
+	Message string `json:"message" example:"It show error from err.Error()"`
+	Status  int    `json:"status" example:"400"`
+}
+
+// ErrorInternalServerResponse represents the standard error format for internal server API responses.
+//
+//	@name			ErrorInternalServerResponse
+//	@description	Standard error response format returned by all internal server error API endpoints
+type ErrorInternalServerResponse struct {
+	Success bool   `json:"success" example:"false"`
+	Message string `json:"message" example:"the server encountered a problem"`
+	Status  int    `json:"status" example:"500"`
+}
+
 type RegisterUserPayload struct {
 	FirstName string `json:"first_name" validate:"required,max=50"`
 	LastName  string `json:"last_name" validate:"required,max=50"`
@@ -32,14 +52,16 @@ type UserWithToken struct {
 // registerUserHandler godoc
 //
 //	@Summary		Registers a user
-//	@Description	Registers a user
+//	@Description	Registers a user via Mobile App, Server will send activation url on email and need to click there to verify its your email
 //	@Tags			authentication
 //	@Accept			json
 //	@Produce		json
-//	@Param			payload	body		RegisterUserPayload	true	"User credentials"
-//	@Success		201		{object}	UserWithToken		"User registered"
-//	@Failure		400		{object}	error
-//	@Failure		500		{object}	error
+//	@Param			payload	body		RegisterUserPayload			true	"User credentials"
+//	@Success		201		{object}	UserWithToken				"User registered"
+//
+//	@Failure		400		{object}	ErrorBadRequestResponse		"Bad request"
+//	@Failure		500		{object}	ErrorInternalServerResponse	"Internal Server Error"
+//
 //	@Router			/authentication/user [post]
 func (app *application) registerUserHandler(w http.ResponseWriter, r *http.Request) {
 	var payload RegisterUserPayload
@@ -89,7 +111,7 @@ func (app *application) registerUserHandler(w http.ResponseWriter, r *http.Reque
 		Token: plainToken,
 	}
 
-	activationURL := fmt.Sprintf("%s/confirm/%s", app.config.frontendURL, plainToken)
+	activationURL := fmt.Sprintf("%s/confirm?token=%s", app.config.frontendURL, plainToken)
 
 	isProdEnv := app.config.env == "production"
 	vars := struct {
@@ -396,7 +418,7 @@ func (app *application) requestResetPasswordHandler(w http.ResponseWriter, r *ht
 	}
 
 	// Send reset email
-	resetURL := fmt.Sprintf("%s/reset-password/%s", app.config.frontendURL, resetToken)
+	resetURL := fmt.Sprintf("%s/reset-password/?token=%s", app.config.frontendURL, resetToken)
 
 	vars := struct {
 		Username string
@@ -416,7 +438,10 @@ func (app *application) requestResetPasswordHandler(w http.ResponseWriter, r *ht
 
 	app.logger.Infow("Reset password email sent", "status code", status)
 
-	if err := app.jsonResponse(w, http.StatusOK, map[string]string{"message": "Reset token sent"}); err != nil {
+	if err := app.jsonResponse(w, http.StatusOK, map[string]string{
+		"message":    "Reset token sent",
+		"resetToken": resetToken, // unhashed token
+	}); err != nil {
 		app.internalServerError(w, r, err)
 	}
 }
@@ -455,6 +480,7 @@ func (app *application) resetPasswordHandler(w http.ResponseWriter, r *http.Requ
 	// Hash the token to compare with the stored hash
 	hash := sha256.Sum256([]byte(payload.Token))
 	hashToken := hex.EncodeToString(hash[:])
+	fmt.Printf("this is hashToken: %s", hashToken)
 
 	// Get user by reset token
 	user, err := app.store.Users.GetByResetToken(ctx, hashToken)
@@ -464,6 +490,7 @@ func (app *application) resetPasswordHandler(w http.ResponseWriter, r *http.Requ
 			return
 		}
 		app.internalServerError(w, r, err)
+		fmt.Println(err)
 		return
 	}
 
@@ -490,6 +517,7 @@ func (app *application) resetPasswordHandler(w http.ResponseWriter, r *http.Requ
 	// Save the updated user
 	if err := app.store.Users.Update(ctx, user); err != nil {
 		app.internalServerError(w, r, err)
+		fmt.Println(err)
 		return
 	}
 

cmd/api/background.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"time"
+)
+
+func (app *application) markCompletedGamesEvery30Mins() {
+	go func() {
+		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))
+		}
+
+		// 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))
+			}
+		}
+	}()
+}

cmd/api/errors.go

@@ -33,6 +33,11 @@ func (app *application) unauthorizedErrorResponse(w http.ResponseWriter, r *http
 	writeJSONError(w, http.StatusUnauthorized, err.Error())
 }
 
+func (app *application) forbiddenErrorResponse(w http.ResponseWriter, r *http.Request, err error) {
+	app.logger.Warnf("forbidden error", "method", r.Method, "path", r.URL.Path, "error", err.Error())
+	writeJSONError(w, http.StatusForbidden, err.Error())
+}
+
 func (app *application) unauthorizedBasicErrorResponse(w http.ResponseWriter, r *http.Request, err error) {
 	app.logger.Warnf("unauthorized basic error", "method", r.Method, "path", r.URL.Path, "error", err.Error())
 

cmd/api/games.go

@@ -435,10 +435,11 @@ func (app *application) AssignAssistantHandler(w http.ResponseWriter, r *http.Re
 func (app *application) getGamesHandler(w http.ResponseWriter, r *http.Request) {
 	// Set default filter values.
 	fq := store.GameFilterQuery{
-		Limit:  10,
-		Offset: 0,
-		Sort:   "asc",
-		Radius: 0, // 0 means no location-based filtering.
+		Limit:      10,
+		Offset:     0,
+		Sort:       "asc",
+		Radius:     0, // 0 means no location-based filtering.
+		StartAfter: time.Now(),
 	}
 
 	// Parse query parameters from the request (overriding defaults if provided).
@@ -456,7 +457,6 @@ func (app *application) getGamesHandler(w http.ResponseWriter, r *http.Request)
 
 	// Get the currently logged in user.
 	user := getUserFromContext(r)
-	fmt.Printf("the getGame userID is %d", user.ID)
 
 	// Query the database for matching games.
 	games, err := app.store.Games.GetGames(r.Context(), fq)

cmd/api/main.go

@@ -82,9 +82,9 @@ var version = "1.2.0"
 //	@title			Khel API
 //	@description	API for Khel, a complete sport application.
 
-//	@contact.name	API Support
-//	@contact.url	http://www.swagger.io/support
-//	@contact.email	support@swagger.io
+//	@contact.name	fullstacksherpa
+//	@contact.url	https://www.fullstacksherpa.tech/
+//	@contact.email	Ongchen10sherpa@gmail.com
 
 //	@license.name	Apache 2.0
 //	@license.url	http://www.apache.org/licenses/LICENSE-2.0.html
@@ -213,6 +213,8 @@ func main() {
 		return runtime.NumGoroutine()
 	}))
 
+	app.markCompletedGamesEvery30Mins()
+
 	mux := app.mount()
 
 	logger.Fatal(app.run(mux))

docker-compose.yml

@@ -15,13 +15,14 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "8080:8080"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.rule=Host(`traefik.gocloudnepal.com`)"
       - "traefik.http.routers.traefik.entrypoints=websecure"
       - "traefik.http.routers.traefik.tls.certresolver=myresolver"
-      - "traefik.http.services.traefik.loadbalancer.server.port=8080"
+      - "traefik.http.routers.traefik.service=api@internal"
+      - "traefik.http.routers.traefik.middlewares=dashboard-auth"
+      - "traefik.http.middlewares.dashboard-auth.basicauth.users=admin:$2y$05$2hQXRr9Rpo8aJs0ERvDMauAwYEHPh7eSvTY.CTzLyBYKr.mkGInKO"
     volumes:
       - letsencrypt:/letsencrypt
       - /var/run/docker.sock:/var/run/docker.sock
@@ -31,8 +32,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    ports:
-      - "8080:8080"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.khel.rule=Host(`api.gocloudnepal.com`)"
@@ -57,6 +56,5 @@ services:
       - "--rolling-restart"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-
 volumes:
   letsencrypt:

dockerfile

@@ -28,6 +28,10 @@ FROM debian:bookworm-slim
 
 WORKDIR /app
 
+# Install CA certificates (💥 this fixes TLS errors like x509 unknown authority)
+RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
+
+
 # Create a non-root user and group
 RUN groupadd -r appuser && useradd -r -g appuser appuser
 

docs/docs.go

@@ -10,9 +10,9 @@ const docTemplate = `{
         "description": "{{escape .Description}}",
         "title": "{{.Title}}",
         "contact": {
-            "name": "API Support",
-            "url": "http://www.swagger.io/support",
-            "email": "support@swagger.io"
+            "name": "fullstacksherpa",
+            "url": "https://www.fullstacksherpa.tech/",
+            "email": "Ongchen10sherpa@gmail.com"
         },
         "license": {
             "name": "Apache 2.0",
@@ -289,7 +289,7 @@ const docTemplate = `{
         },
         "/authentication/user": {
             "post": {
-                "description": "Registers a user",
+                "description": "Registers a user via Mobile App, Server will send activation url on email and need to click there to verify its your email",
                 "consumes": [
                     "application/json"
                 ],
@@ -319,12 +319,16 @@ const docTemplate = `{
                         }
                     },
                     "400": {
-                        "description": "Bad Request",
-                        "schema": {}
+                        "description": "Bad request",
+                        "schema": {
+                            "$ref": "#/definitions/main.ErrorBadRequestResponse"
+                        }
                     },
                     "500": {
                         "description": "Internal Server Error",
-                        "schema": {}
+                        "schema": {
+                            "$ref": "#/definitions/main.ErrorInternalServerResponse"
+                        }
                     }
                 }
             }
@@ -3483,6 +3487,42 @@ const docTemplate = `{
                 }
             }
         },
+        "main.ErrorBadRequestResponse": {
+            "description": "Standard error response format returned by all bad request API endpoints",
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string",
+                    "example": "It show error from err.Error()"
+                },
+                "status": {
+                    "type": "integer",
+                    "example": 400
+                },
+                "success": {
+                    "type": "boolean",
+                    "example": false
+                }
+            }
+        },
+        "main.ErrorInternalServerResponse": {
+            "description": "Standard error response format returned by all internal server error API endpoints",
+            "type": "object",
+            "properties": {
+                "message": {
+                    "type": "string",
+                    "example": "the server encountered a problem"
+                },
+                "status": {
+                    "type": "integer",
+                    "example": 500
+                },
+                "success": {
+                    "type": "boolean",
+                    "example": false
+                }
+            }
+        },
         "main.HourlySlot": {
             "type": "object",
             "properties": {