@go-avro/avro-js 0.0.11 → 0.0.13-beta.0

package/dist/types/api/Job.d.ts

@@ -2,6 +2,7 @@ import { Task } from "../../types/api/Task";
 import { _Event } from "../../types/api/_Event";
 import { RouteJob } from "../../types/api/RouteJob";
 import { Subscription } from "../../types/api/Subscription";
+import { Route } from "../../types/api/Route";
 declare module '../../types/api/Job' {
     interface Job {
         address: string;
@@ -34,6 +35,6 @@ export declare class Job {
     getOverdueLabel: () => string;
     getStatus(): "PENDING_CUSTOMER" | "PENDING_COMPANY" | "ACTIVE" | "ARCHIVED" | "DRAFT" | "PENDING_PAYMENT" | "PENDING_ACTIVATION";
     getStatusLabel(): "Active" | "Draft" | "Archived" | "Pending Activation" | "Customer Approval" | "Company Approval" | "Awaiting Payment";
-    portionDone: (fallback?: Date | null, routeJob?: RouteJob) => number;
-    isDone: (fallback?: Date | null, routeJob?: RouteJob) => boolean;
+    portionDone: (route: Route) => number;
+    isDone: (route: Route) => boolean;
 }

package/dist/types/api/Job.js

@@ -21,15 +21,22 @@ export class Job {
                 return `${Math.floor(maxOverdueTime / 86400)}d overdue`;
             }
         };
-        this.portionDone = (fallback, routeJob) => {
+        this.portionDone = (route) => {
             if (!this.tasks || this.tasks.length === 0) {
                 return 0;
             }
-            const contextTasks = routeJob ? this.tasks.filter(t => !t.id || routeJob.tasks.includes(t.id)) : this.tasks;
-            return contextTasks.filter(t => t.isDone?.(fallback)).length / contextTasks.length;
+            const routeJob = this.routes.find(r => r.job_id === this.id);
+            if (!routeJob) {
+                return 0;
+            }
+            const contextTasks = this.tasks.filter(t => !t.id || routeJob.tasks.includes(t.id));
+            if (contextTasks.length === 0) {
+                return 0;
+            }
+            return contextTasks.filter(t => t.isDone?.(route)).length / contextTasks.length;
         };
-        this.isDone = (fallback, routeJob) => {
-            return this.portionDone(fallback, routeJob) === 1;
+        this.isDone = (route) => {
+            return this.portionDone(route) === 1;
         };
         Object.assign(this, init);
         if (init?.tasks) {

package/dist/types/api/Route.d.ts

@@ -33,5 +33,4 @@ export declare class Route {
     constructor(init?: Partial<Route>);
     getNextOccurrences: (count?: number) => (Date | null)[];
     getNextOccurrence: (after?: Date) => Date | null;
-    getIndicatorExpiration: () => Date;
 }

package/dist/types/api/Route.js

@@ -41,39 +41,6 @@ export class Route {
             }
             return next_occurrence;
         };
-        this.getIndicatorExpiration = () => {
-            const start_time = new Date(this.start_time * 1000);
-            if (this.frequency === FrequencyType.ONCE) {
-                return start_time;
-            }
-            // if the route is currently active, return the start time as the indicator expiration
-            if (Date.now() > start_time.getTime()) {
-                return start_time;
-            }
-            // else compute the previous occurrence and return that as the indicator expiration
-            const prev = new Date(start_time);
-            switch (this.frequency) {
-                case FrequencyType.DAILY:
-                    prev.setHours(prev.getHours() - 4);
-                    prev.setDate(prev.getDate() - 1);
-                    break;
-                case FrequencyType.WEEKLY:
-                    prev.setDate(prev.getDate() - 8);
-                    break;
-                case FrequencyType.BIWEEKLY:
-                    prev.setDate(prev.getDate() - 15);
-                    break;
-                case FrequencyType.MONTHLY:
-                    prev.setDate(prev.getDate() - 1);
-                    prev.setMonth(prev.getMonth() - 1);
-                    break;
-                case FrequencyType.YEARLY:
-                    prev.setDate(prev.getDate() - 1);
-                    prev.setFullYear(prev.getFullYear() - 1);
-                    break;
-            }
-            return prev;
-        };
         Object.assign(this, init);
         if (init?.jobs) {
             this.jobs = init.jobs.map(j => new RouteJob(j));

package/dist/types/api/Task.d.ts

@@ -2,6 +2,7 @@ import { UserCompanyAssociation } from "../../types/api/UserCompanyAssociation";
 import { Prepayment } from "../../types/api/Prepayment";
 import { PaymentOption } from "../../types/api/PaymentOption";
 import { _Event } from "../../types/api/_Event";
+import { Route } from "../../types/api/Route";
 export declare const TaskStatus: {
     readonly PENDING_CUSTOMER: "PENDING_CUSTOMER";
     readonly PENDING_COMPANY: "PENDING_COMPANY";
@@ -58,5 +59,5 @@ export declare class Task {
     computeNextTaskState: (isCustomer: boolean, action: "accept" | "modify" | "reject") => TaskStatus;
     getPrepaidEventsRemaining: () => number;
     getPrepaidMonthsRemaining: () => number;
-    isDone: (fallback?: Date | null) => boolean | 1;
+    isDone: (route: Route) => boolean;
 }

package/dist/types/api/Task.js

@@ -95,16 +95,12 @@ export class Task {
                 return acc;
             }, 0);
         };
-        this.isDone = (fallback) => {
+        this.isDone = (route) => {
             if (!this.status || this.status !== TaskStatus.ACTIVE) {
-                return 1;
+                return true;
             }
             if (this.frequency > 0) {
-                return this.overdue_time <= 0;
-            }
-            else if (fallback) {
-                // If frequency is 0, use fallback
-                return new Date((this.last_completed_event?.time_ended ?? 0) * 1000) > (fallback);
+                return (this.last_completed_event?.time_ended ?? 0) > route.start_time;
             }
             else {
                 return this.last_completed_event?.time_ended ? true : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.11",
+  "version": "0.0.13-beta.0",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",