Merge branch 'main' into eric/rooms-list-sort-by-button

Author: eric-kitagawa

backend/.env.sample

@@ -1,7 +1,22 @@
-DB_HOST=localhost
-DB_PORT=54322
-DB_USER=postgres
-DB_PASSWORD=postgres
-DB_NAME=postgres
-DB_MAX_CONNS=8
-DB_MAX_CONN_LIFETIME=30s
+DB_USER="" 
+DB_PASSWORD="" 
+DB_HOST=""
+DB_PORT=""
+DB_NAME=""
+PORT="8080"
+APP_LOG_LEVEL="info"
+
+DEV_CLERK_SECRET_KEY="secret"
+DEV_CLERK_WEBHOOK_SIGNATURE="secret"
+ENV="dev/prod"
+
+NGROK_DOMAIN="your own stable domain"
+LLM_SERVER_ADDRESS="http://127.0.0.1:11434"
+LLM_MODEL="qwen2.5:7b-instruct"
+LLM_TIMEOUT="60"
+LLM_MAX_OUTPUT_TOKENS="1024"
+LLM_TEMPERATURE="0.2"
+
+# Redis Configuration
+REDIS_ADDR=localhost:6379
+REDIS_PASSWORD=

backend/Makefile

@@ -45,8 +45,8 @@ genkit-run: llm-start db-start
 sync-users:
 	@$(LOAD_ENV) go run ./cmd/clerk/sync.go
 
-rooms-list-seed:
-	@$(LOAD_ENV) bash scripts/rooms-list-seed.sh
+seed:
+	@$(LOAD_ENV) bash scripts/seed.sh
 
 test:
 	@$(LOAD_ENV) \

backend/docs/swagger.yaml

@@ -2,24 +2,12 @@ basePath: /api/v1
 definitions:
   CreateGuest:
     properties:
-      email:
-        example: jane.doe@example.com
-        type: string
       first_name:
         example: Jane
         type: string
       last_name:
         example: Doe
         type: string
-      notes:
-        example: VIP
-        type: string
-      phone:
-        example: +1 (617) 012-3456
-        type: string
-      preferences:
-        example: extra pillows
-        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -83,9 +71,6 @@ definitions:
       created_at:
         example: "2024-01-02T00:00:00Z"
         type: string
-      email:
-        example: jane.doe@example.com
-        type: string
       first_name:
         example: Jane
         type: string
@@ -95,15 +80,6 @@ definitions:
       last_name:
         example: Doe
         type: string
-      notes:
-        example: VIP
-        type: string
-      phone:
-        example: +1 (617) 012-3456
-        type: string
-      preferences:
-        example: extra pillows
-        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -114,6 +90,51 @@ definitions:
         example: "2024-01-02T00:00:00Z"
         type: string
     type: object
+  GuestBooking:
+    properties:
+      arrival_date:
+        type: string
+      departure_date:
+        type: string
+      guest:
+        $ref: '#/definitions/Guest'
+      hotel_id:
+        example: 521e8400-e458-41d4-a716-446655440000
+        type: string
+      id:
+        example: f353ca91-4fc5-49f2-9b9e-304f83d11914
+        type: string
+      room:
+        $ref: '#/definitions/Room'
+      status:
+        $ref: '#/definitions/github_com_generate_selfserve_internal_models.BookingStatus'
+    type: object
+  GuestFilters:
+    properties:
+      cursor:
+        type: string
+      floors:
+        items:
+          type: integer
+        type: array
+      hotel_id:
+        type: string
+      limit:
+        maximum: 100
+        minimum: 1
+        type: integer
+    required:
+    - hotel_id
+    type: object
+  GuestPage:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/GuestWithBooking'
+        type: array
+      next_cursor:
+        type: string
+    type: object
   GuestWithBooking:
     properties:
       first_name:
@@ -126,6 +147,12 @@ definitions:
         type: string
       room_number:
         type: integer
+    required:
+    - first_name
+    - floor
+    - id
+    - last_name
+    - room_number
     type: object
   GuestWithStays:
     properties:
@@ -159,9 +186,11 @@ definitions:
         example: extra pillows
         type: string
     required:
+    - current_stays
     - first_name
     - id
     - last_name
+    - past_stays
     type: object
   Hotel:
     properties:
@@ -293,6 +322,17 @@ definitions:
         example: 521ee400-e458-41d4-a716-446655440000
         type: string
     type: object
+  Room:
+    properties:
+      floor:
+        type: integer
+      room_number:
+        type: integer
+      room_status:
+        type: string
+      suite_type:
+        type: string
+    type: object
   RoomWithOptionalGuestBooking:
     properties:
       booking_status:
@@ -420,78 +460,44 @@ info:
   version: "1.0"
 paths:
   /api/v1/guests:
-    get:
-      description: Retrieves guests optionally filtered by floor in which they are
-        staying
+    post:
+      consumes:
+      - application/json
+      description: Retrieves guests optionally filtered by floor
       parameters:
       - description: Hotel ID (UUID)
         in: header
         name: X-Hotel-ID
         required: true
         type: string
-      - description: Floor
-        in: query
-        name: number
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            items:
-              $ref: '#/definitions/GuestWithBooking'
-            type: array
-        "400":
-          description: Bad Request
-          schema:
-            additionalProperties:
-              type: string
-            type: object
-        "500":
-          description: Internal Server Error
-          schema:
-            additionalProperties:
-              type: string
-            type: object
-      security:
-      - BearerAuth: []
-      summary: Get Guests
-      tags:
-      - guests
-    post:
-      consumes:
-      - application/json
-      description: Creates a guest with the given data
-      parameters:
-      - description: Guest data
+      - description: Guest filters
         in: body
-        name: request
+        name: body
         required: true
         schema:
-          $ref: '#/definitions/CreateGuest'
+          $ref: '#/definitions/GuestFilters'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/Guest'
+            $ref: '#/definitions/GuestPage'
         "400":
-          description: Invalid guest body format
+          description: Bad Request
           schema:
             additionalProperties:
               type: string
             type: object
         "500":
-          description: Internal server error
+          description: Internal Server Error
           schema:
             additionalProperties:
               type: string
             type: object
       security:
       - BearerAuth: []
-      summary: Creates a guest
+      summary: Get Guests
       tags:
       - guests
   /api/v1/guests/{id}:
@@ -720,6 +726,40 @@ paths:
       summary: Get developer member
       tags:
       - devs
+  /guest_bookings/floor:
+    get:
+      description: Retrieves multiple guest bookings whose booked rooms are in the
+        provided floors array
+      parameters:
+      - description: Comma-separated floor numbers
+        in: query
+        name: floors
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/GuestBooking'
+            type: array
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Get guest Bookings By Floor
+      tags:
+      - guest-bookings
   /hello:
     get:
       consumes:

backend/go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/firebase/genkit/go v1.4.0
 	github.com/go-playground/validator/v10 v10.30.1
 	github.com/gofiber/adaptor/v2 v2.2.1
+	github.com/redis/go-redis/v9 v9.17.3
 	github.com/sethvargo/go-envconfig v1.3.0
 	github.com/stretchr/testify v1.11.1
 	github.com/swaggo/http-swagger v1.3.4
@@ -36,9 +37,11 @@ require (
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect

backend/go.sum

@@ -42,8 +42,14 @@ github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
 github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/clerk/clerk-sdk-go/v2 v2.5.1 h1:RsakGNW6ie83b9KIRtKzqDXBJ//cURy9SJUbGhrsIKg=
 github.com/clerk/clerk-sdk-go/v2 v2.5.1/go.mod h1:ncFmsPwmD5WpGCNW5bJve862j/HQfpkzsshXYV/quJ8=
 github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
@@ -53,6 +59,8 @@ github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsV
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/firebase/genkit/go v1.4.0 h1:CP1hNWk7z0hosyY53zMH6MFKFO1fMLtj58jGPllQo6I=
 github.com/firebase/genkit/go v1.4.0/go.mod h1:HX6m7QOaGc3MDNr/DrpQZrzPLzxeuLxrkTvfFtCYlGw=
 github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
@@ -147,6 +155,8 @@ github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a/go.mod h1:Y6ghKH+Z
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4=
+github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sethvargo/go-envconfig v1.3.0 h1:gJs+Fuv8+f05omTpwWIu6KmuseFAXKrIaOZSh8RMt0U=