fix: part time care taker availability bids constraint (#35)

- fixed the part timer care taker avail check constraint for bids, made sure that it checks the rows involving the care taker.
- fixed fetch expected salary api by adjusting month values

setup/CreateDB.sql

@@ -424,6 +424,7 @@ $$
         SELECT 1
         FROM care_taker_full_timers_unavailable_dates
         WHERE date BETWEEN start_date::date AND end_date::date
+        AND email = new_care_taker_email
       )
       THEN
         RETURN false;
@@ -441,6 +442,7 @@ $$
         SELECT count(*)
         FROM care_taker_part_timers_available_dates
         WHERE date BETWEEN start_date::date AND end_date::date -- dates inclusive of start_date and end_date
+        AND email = new_care_taker_email
       ) = (calculate_duration(start_date, end_date)) -- offset of +1 to include start_date
       THEN
         RETURN true;

setup/SeedData.js

@@ -266,8 +266,8 @@ const main = async () => {
       }),
     );
     await Promise.all(
-      _.map(careTakers, async ({email}) => {
-        await careTakerEmploymentTypePayload(client, email);
+      _.map(careTakers, async ({email}, i) => {
+        await careTakerEmploymentTypePayload(client, email, i);
       }),
     );
     await client3.query('COMMIT');

src/Pet/PetService.js

@@ -137,7 +137,7 @@ const FetchExpectedSalary = async ({email}) => {
     0,
   ).getDate();
 
-  const paddedMonth = `000${now.getMonth().toString()}`;
+  const paddedMonth = `000${(now.getMonth() + 1).toString()}`;
   const newMonth = paddedMonth.substr(paddedMonth.length - 2);
   const dateFormat = `${now.getFullYear().toString()}-${newMonth}-%`;
   const caretakerType = await pool.query(SQLQueries.FETCH_CARE_TAKER_ROLE, [

tests/Bid/BidCreateService.test.js

@@ -22,7 +22,7 @@ describe('Test BidCreate Service', () => {
     await pool.query('DELETE FROM pets');
     await pool.query('DELETE FROM pet_categories');
     await UserFixtures.SeedPetOwners(1);
-    await UserFixtures.SeedCareTakers(2);
+    await UserFixtures.SeedCareTakers(3);
     await UserFixtures.SeedCareTakerRole({
       email: 'test0@example.com',
       role: RoleUtils.CARE_TAKER_FULL_TIMER,
@@ -31,6 +31,10 @@ describe('Test BidCreate Service', () => {
       email: 'test1@example.com',
       role: RoleUtils.CARE_TAKER_PART_TIMER,
     });
+    await UserFixtures.SeedCareTakerRole({
+      email: 'test2@example.com',
+      role: RoleUtils.CARE_TAKER_PART_TIMER,
+    });
     await PetFixtures.SeedPetCategories(2);
     const email = 'test0@example.com';
     const category = 'category0';
@@ -86,7 +90,7 @@ describe('Test BidCreate Service', () => {
     const petOwnerEmail = 'test0@example.com';
     const petName = 'pet0';
     const {startDate, endDate} = BidFixtures.CreateBidDates();
-    await DateFixtures.SeedAvaliableDates(8);
+    await DateFixtures.SeedAvaliableDates(8, careTakerEmail);
     await BidService.BidCreate({
       petName,
       petOwnerEmail,
@@ -351,7 +355,7 @@ describe('Test BidCreate Service', () => {
 
   it('Service should not automatically accept bid for part timers', async () => {
     const careTakerEmail = 'test1@example.com';
-    await DateFixtures.SeedAvaliableDates(8);
+    await DateFixtures.SeedAvaliableDates(8, careTakerEmail);
     await pool.query(`
         INSERT INTO care_taker_skills(email, category, price)
         VALUES('test0@example.com', 'category0', 10);
@@ -382,7 +386,7 @@ describe('Test BidCreate Service', () => {
   it('Service should not accept bid if part timer has more than 5 pets and is above 4 stars', async () => {
     await pool.query('DELETE FROM pets');
     const careTakerEmail = 'test1@example.com';
-    await DateFixtures.SeedAvaliableDates(8);
+    await DateFixtures.SeedAvaliableDates(8, careTakerEmail);
     const petOwnerEmail = 'test0@example.com';
     const petNames = ['pet0', 'pet1', 'pet2', 'pet3', 'pet4'];
     const category = 'category0';
@@ -429,7 +433,7 @@ describe('Test BidCreate Service', () => {
   it('Service should accept bid if part timer has 5 pets or less, more than 2 pets and is above 4 stars', async () => {
     await pool.query('DELETE FROM pets');
     const careTakerEmail = 'test1@example.com';
-    await DateFixtures.SeedAvaliableDates(8);
+    await DateFixtures.SeedAvaliableDates(8, careTakerEmail);
     const petOwnerEmail = 'test0@example.com';
     const petNames = ['pet0', 'pet1', 'pet2'];
     const category = 'category0';
@@ -495,7 +499,7 @@ describe('Test BidCreate Service', () => {
   it('Service should not accept bid if part timer has 5 pets or less, more than 2 pets and is below 4 stars', async () => {
     await pool.query('DELETE FROM pets');
     const careTakerEmail = 'test1@example.com';
-    await DateFixtures.SeedAvaliableDates(8);
+    await DateFixtures.SeedAvaliableDates(8, careTakerEmail);
     const petOwnerEmail = 'test0@example.com';
     const petNames = ['pet0', 'pet1'];
     const category = 'category0';
@@ -693,7 +697,29 @@ describe('Test BidCreate Service', () => {
     const petName = 'pet0';
     // start date is today and end date is 7 days from now
     const {startDate, endDate} = BidFixtures.CreateBidDates();
-    await DateFixtures.SeedAvaliableDates(7); // one day missing
+    await DateFixtures.SeedAvaliableDates(7, parTimeCareTakerEmail); // one day missing
+
+    await Assert.rejects(
+      () =>
+        BidService.BidCreate({
+          petName,
+          petOwnerEmail,
+          careTakerEmail: parTimeCareTakerEmail,
+          startDate,
+          endDate,
+        }),
+      Error,
+    );
+  });
+
+  it('Service should reject a bid if target part time care taker is not available for the bid dates, but another one is', async () => {
+    const parTimeCareTakerEmail = 'test1@example.com';
+    const petOwnerEmail = 'test0@example.com';
+    const petName = 'pet0';
+    // start date is today and end date is 7 days from now
+    const {startDate, endDate} = BidFixtures.CreateBidDates();
+    await DateFixtures.SeedAvaliableDates(7, parTimeCareTakerEmail); // target is unavail
+    await DateFixtures.SeedAvaliableDates(8, 'test2@example.com'); // another pt is
 
     await Assert.rejects(
       () =>

tests/Fixtures/DateFixtures.js

@@ -17,8 +17,7 @@ const SeedAvailableDate = async ({email, date}) => {
 };
 
 /** Seeds available dates for a part time care taker that match those created in @see BidFixtures.CreateBidDates */
-const SeedAvaliableDates = async (i) => {
-  const email = 'test1@example.com';
+const SeedAvaliableDates = async (i, email) => {
   await Promise.all(
     _.times(i, (idx) => {
       const date = moment().add(idx, 'days').toISOString(true);