[WIP] feat: Call should end explicitly instead of endCall date

db_patches/0124_AddIsActiveCallFlag.sql

@@ -0,0 +1,12 @@
+DO
+$$
+BEGIN
+    IF register_patch('AddIsActiveCallFlag.sql', 'Martin Trajanovski', 'Add is_active flag to the calls table', '2022-06-21') THEN
+
+        ALTER TABLE "call"
+        ADD COLUMN is_active boolean DEFAULT true;
+
+    END IF;
+END;
+$$
+LANGUAGE plpgsql;

package.json

@@ -44,9 +44,9 @@
     "@user-office-software/duo-logger": "^2.0.2",
     "@user-office-software/duo-message-broker": "^1.3.0",
     "@user-office-software/duo-validation": "^3.2.0",
-    "apollo-graphql": "^0.9.5",
+    "apollo-graphql": "^0.9.7",
     "apollo-server-core": "^3.9.0",
-    "apollo-server-express": "^3.6.3",
+    "apollo-server-express": "^3.9.0",
     "await-to-js": "^2.1.1",
     "axios": "^0.26.0",
     "bcryptjs": "^2.4.3",

src/auth/ProposalAuthorization.ts

@@ -196,7 +196,7 @@ export class ProposalAuthorization {
 
   private async isProposalEditable(proposal: Proposal): Promise<boolean> {
     const callId = proposal.callId;
-    const isCallActive = await this.callDataSource.checkActiveCall(callId);
+    const isCallEnded = await this.callDataSource.isCallEnded(callId);
     const proposalStatus = (
       await this.proposalSettingsDataSource.getProposalStatus(proposal.statusId)
     )?.shortCode;
@@ -205,10 +205,10 @@ export class ProposalAuthorization {
       return true;
     }
 
-    if (isCallActive) {
-      return proposalStatus === ProposalStatusDefaultShortCodes.DRAFT;
-    } else {
+    if (isCallEnded) {
       return false;
+    } else {
+      return proposalStatus === ProposalStatusDefaultShortCodes.DRAFT;
     }
   }
 

src/datasources/CallDataSource.ts

@@ -18,5 +18,5 @@ export interface CallDataSource {
     args: RemoveAssignedInstrumentFromCallInput
   ): Promise<Call>;
   getCallsByInstrumentScientist(scientistId: number): Promise<Call[]>;
-  checkActiveCall(callId: number): Promise<boolean>;
+  isCallEnded(callId: number): Promise<boolean>;
 }

src/datasources/mockups/CallDataSource.ts

@@ -35,7 +35,8 @@ export const dummyCallFactory = (values?: Partial<Call>) => {
     values?.esiTemplateId || 2,
     values?.allocationTimeUnit || AllocationTimeUnits.Day,
     values?.title || 'Title',
-    values?.description || 'Description'
+    values?.description || 'Description',
+    values?.isActive || true
   );
 };
 
@@ -65,7 +66,8 @@ export const dummyCall = new Call(
   2,
   AllocationTimeUnits.Day,
   '',
-  ''
+  '',
+  true
 );
 
 export const anotherDummyCall = new Call(
@@ -94,7 +96,8 @@ export const anotherDummyCall = new Call(
   2,
   AllocationTimeUnits.Day,
   '',
-  ''
+  '',
+  true
 );
 
 export const dummyCalls = [dummyCall, anotherDummyCall];
@@ -153,7 +156,7 @@ export class CallDataSourceMock implements CallDataSource {
     return dummyCalls;
   }
 
-  async checkActiveCall(callId: number): Promise<boolean> {
-    return callId === 1;
+  async isCallEnded(callId: number): Promise<boolean> {
+    return callId !== 1;
   }
 }

src/datasources/postgres/CallDataSource.ts

@@ -42,21 +42,25 @@ export default class PostgresCallDataSource implements CallDataSource {
 
     // if filter is explicitly set to true or false
     if (filter?.isActive === true) {
-      const currentDate = new Date().toISOString();
-      query
-        .where('start_call', '<=', currentDate)
-        .andWhere('end_call', '>=', currentDate);
+      query.where('is_active', true);
     } else if (filter?.isActive === false) {
-      const currentDate = new Date().toISOString();
-      query
-        .where('start_call', '>=', currentDate)
-        .orWhere('end_call', '<=', currentDate);
+      query.where('is_active', false);
     }
 
+    /**
+     * NOTE: We are comparing dates instead of using the call_ended flag,
+     * because the flag is set once per hour and we could have a gap.
+     * TODO: Maybe there is a need to use the timezone setting here but not quite sure about it. Discussion is needed here!
+     */
+    const currentDate = new Date().toISOString();
     if (filter?.isEnded === true) {
-      query.where('call_ended', true);
+      query
+        .where('start_call', '>=', currentDate)
+        .andWhere('end_call', '<=', currentDate);
     } else if (filter?.isEnded === false) {
-      query.where('call_ended', false);
+      query
+        .where('start_call', '<=', currentDate)
+        .andWhere('end_call', '>=', currentDate);
     }
 
     if (filter?.isReviewEnded === true) {
@@ -233,6 +237,7 @@ export default class PostgresCallDataSource implements CallDataSource {
               allocation_time_unit: args.allocationTimeUnit,
               title: args.title,
               description: args.description,
+              is_active: args.isActive,
             },
             ['*']
           )
@@ -315,7 +320,7 @@ export default class PostgresCallDataSource implements CallDataSource {
     return records.map(createCallObject);
   }
 
-  public async checkActiveCall(callId: number): Promise<boolean> {
+  public async isCallEnded(callId: number): Promise<boolean> {
     const currentDate = new Date().toISOString();
 
     return database
@@ -325,6 +330,6 @@ export default class PostgresCallDataSource implements CallDataSource {
       .andWhere('end_call', '>=', currentDate)
       .andWhere('call_id', '=', callId)
       .first()
-      .then((call: CallRecord) => (call ? true : false));
+      .then((call: CallRecord) => (call ? false : true));
   }
 }