feat: add notification screen route

Author: fullstacksherpa

cmd/api/api.go

@@ -125,7 +125,7 @@ func (app *application) mount() http.Handler {
 	r.Use(app.RateLimiterMiddleware)
 
 	r.Use(cors.Handler(cors.Options{
-		AllowedOrigins:   []string{"https://khel.gocloudnepal.com", "http://localhost:3000"},
+		AllowedOrigins:   []string{"https://khel.gocloudnepal.com"},
 		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
 		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
 		ExposedHeaders:   []string{"Link"},
@@ -134,7 +134,7 @@ func (app *application) mount() http.Handler {
 	}))
 
 	//Set a timeout value on the request context (ctx), that will signal through ctx.Done() that the request has timed out and further processing should be stopped
-	r.Use(middleware.Timeout(60 * time.Second))
+	r.Use(middleware.Timeout(120 * time.Second))
 
 	r.Route("/v1", func(r chi.Router) {
 		r.Get("/venue/{id}", app.getVenueDetailHandler)
@@ -451,11 +451,12 @@ func (app *application) run(mux http.Handler, cancel context.CancelFunc) error {
 	}
 
 	srv := &http.Server{
-		Addr:         "0.0.0.0:" + port,
-		Handler:      mux,
-		WriteTimeout: time.Second * 30,
-		ReadTimeout:  time.Second * 10,
-		IdleTimeout:  time.Minute,
+		Addr:              "0.0.0.0:" + port,
+		Handler:           mux,
+		ReadHeaderTimeout: 5 * time.Second,
+		ReadTimeout:       45 * time.Second,
+		WriteTimeout:      120 * time.Second,
+		IdleTimeout:       60 * time.Second,
 	}
 
 	// Implementing graceful shutdown

cmd/api/main.go

@@ -84,13 +84,13 @@ func NewLogger() (*zap.SugaredLogger, error) {
 	return logger.Sugar(), nil
 }
 
-var version = "1.7.0"
+var version = "2.0.0"
 
 //	@title			Khel API
 //	@description	API for Khel, a complete sport application.
 
 //	@contact.name	fullstacksherpa
-//	@contact.url	https://www.fullstacksherpa.tech/
+//	@contact.url	https://khel.gocloudnepal.com/
 //	@contact.email	Ongchen10sherpa@gmail.com
 
 //	@license.name	Apache 2.0
@@ -121,10 +121,13 @@ func main() {
 	}
 
 	// Retrieve and convert maxOpenConns
-	maxOpenConnsStr := os.Getenv("DB_MAX_OPEN_CONNS")
-	maxOpenConns, err := strconv.Atoi(maxOpenConnsStr)
-	if err != nil {
-		log.Fatalf("Invalid value for DB_MAX_OPEN_CONNS: %v", err)
+	maxOpenConns := 10
+	if v := os.Getenv("DB_MAX_OPEN_CONNS"); v != "" {
+		if n, err := strconv.Atoi(v); err == nil {
+			maxOpenConns = n
+		} else {
+			log.Fatalf("Invalid DB_MAX_OPEN_CONNS: %v", err)
+		}
 	}
 
 	cfg := config{
@@ -312,5 +315,7 @@ func main() {
 
 	mux := app.mount()
 
-	logger.Fatal(app.run(mux, cancel))
+	if err := app.run(mux, cancel); err != nil {
+		logger.Fatal(err)
+	}
 }

internal/notifications/booking_notifications.go

@@ -63,7 +63,8 @@ func SendBookingNotification(ctx context.Context, push PushSender, store *storag
 				"type":      "booking",
 				"event":     string(event),
 				"bookingId": bookingID,
-				"screen":    "user-bookings-screen", // / is already at client router.push(`/${data.screen}`);
+				"screen":    "settings", // / is already at client router.push(`/${data.screen}`);
+
 			},
 		}
 		msgs = append(msgs, msg)