Merge branch 'feat/heroku-deploy'

* feat/heroku-deploy: make product 1 available on weekend Revert "allow freesale" Update .gitignore allow freesale add changes back Added gyg and expedia uuids fix port # Conflicts: # src/controllers/BookingController.ts
octotravel · Dec 4, 2023 · 02728ea · 02728ea
2 parents 4def6b2 + 515626b
commit 02728ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 coverage
 dist
 node_modules
-database.db
+database.db
+.DS_Store
diff --git a/package.json b/package.json
@@ -33,9 +33,7 @@
     "sqlite": "^4.1.2",
     "sqlite3": "^5.0.11",
     "yup": "^0.32.11",
-    "dotenv": "^16.0.3"
-  },
-  "devDependencies": {
+    "dotenv": "^16.0.3",
     "@octocloud/generators": "^1.0.1",
     "@octocloud/types": "^1.5.11",
     "@types/jest": "^28.1.6",

diff --git a/src/controllers/BookingController.ts b/src/controllers/BookingController.ts
@@ -58,7 +58,7 @@ export class BookingController implements IBookingController {
       {
         productWithAvailabilityModel: productWithAvailabilityModel,
         optionId: schema.optionId,
-        availabilityId: schema.availabilityId!,
+        availabilityId: schema.availabilityId ?? "",
       },
       capabilities,
     );
@@ -161,7 +161,7 @@ export class BookingController implements IBookingController {
         {
           productWithAvailabilityModel: productWithAvailabilityModel,
           optionId: createBookingSchema.optionId,
-          availabilityId: createBookingSchema.availabilityId!,
+          availabilityId: createBookingSchema.availabilityId ?? "",
         },
         capabilities,
       );

diff --git a/src/index.ts b/src/index.ts
@@ -46,6 +46,6 @@ app.use(async (ctx, next) => {
 app.use(parseCapabilities);
 app.use(router.routes());
 
-app.listen(process.env.APP_PORT ?? 3002, () => {
+app.listen(process.env.PORT ?? 3002, () => {
   console.log(`Running app on port ${process.env.APP_PORT}`);
 });