Merge branch 'demo' of https://github.com/aelassas/bookcars into demo

aelassas · Jan 30, 2025 · 6efe958 · 6efe958
2 parents c2f768a + 4b87821
commit 6efe958
Show file tree

Hide file tree

Showing 138 changed files with 8,093 additions and 1,590 deletions.
diff --git a/.github/workflows/loc.yml b/.github/workflows/loc.yml
diff --git a/api/.env.docker.example b/api/.env.docker.example
@@ -38,3 +38,4 @@ BC_STRIPE_SESSION_EXPIRE_AT=82800
 BC_ADMIN_EMAIL=admin@bookcars.ma
 BC_RECAPTCHA_SECRET=RECAPTCHA_SECRET
 BC_WEBSITE_NAME=BookCars
+BC_TIMEZONE=UTC
diff --git a/api/.env.example b/api/.env.example
@@ -38,3 +38,4 @@ BC_STRIPE_SESSION_EXPIRE_AT=82800
 BC_ADMIN_EMAIL=admin@bookcars.ma
 BC_RECAPTCHA_SECRET=RECAPTCHA_SECRET
 BC_WEBSITE_NAME=BookCars
+BC_TIMEZONE=UTC
diff --git a/api/__tests__/car.test.ts b/api/__tests__/car.test.ts
@@ -111,6 +111,8 @@ describe('POST /api/create-car', () => {
       range: bookcarsTypes.CarRange.Mini,
       multimedia: [bookcarsTypes.CarMultimedia.Bluetooth],
       rating: 3,
+      comingSoon: true,
+      fullyBooked: true,
     }
     let res = await request(app)
       .post('/api/create-car')
@@ -207,6 +209,8 @@ describe('PUT /api/update-car', () => {
       range: bookcarsTypes.CarRange.Midi,
       multimedia: [bookcarsTypes.CarMultimedia.AndroidAuto],
       rating: 4,
+      comingSoon: false,
+      fullyBooked: false,
     }
     let res = await request(app)
       .put('/api/update-car')
@@ -244,6 +248,8 @@ describe('PUT /api/update-car', () => {
     expect(car.range).toBe(payload.range)
     expect(car.multimedia).toStrictEqual(payload.multimedia)
     expect(car.rating).toBe(payload.rating)
+    expect(car.comingSoon).toBe(payload.comingSoon)
+    expect(car.fullyBooked).toBe(payload.fullyBooked)
 
     // test success (booking not found)
     payload._id = testHelper.GetRandromObjectIdAsString()
@@ -676,6 +682,16 @@ describe('POST /api/frontend-cars/:page/:size', () => {
     expect(res.statusCode).toBe(200)
     expect(res.body[0].resultData.length).toBeGreaterThan(0)
 
+    payload.includeAlreadyBookedCars = true
+    payload.includeComingSoonCars = true
+    res = await request(app)
+      .post(`/api/frontend-cars/${testHelper.PAGE}/${testHelper.SIZE}`)
+      .send(payload)
+    expect(res.statusCode).toBe(200)
+    expect(res.body[0].resultData.length).toBeGreaterThan(0)
+    payload.includeAlreadyBookedCars = false
+    payload.includeComingSoonCars = false
+
     payload.days = undefined
     res = await request(app)
       .post(`/api/frontend-cars/${testHelper.PAGE}/${testHelper.SIZE}`)