@ironcode/vas-lib 1.1.0 → 1.3.0

package/cjs/lib/entity/index.d.ts

@@ -57,4 +57,6 @@ export * from './vas-user.dto';
 export * from './vas-user.model';
 export * from './vas-form-config.dto';
 export * from './vas-account-config.dto';
+export * from './vas-vehicle.dto';
+export * from './vas-vehicle.model';
 //# sourceMappingURL=index.d.ts.map

package/cjs/lib/entity/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}

package/cjs/lib/entity/index.js

@@ -60,4 +60,6 @@ tslib_1.__exportStar(require("./vas-user.dto"), exports);
 tslib_1.__exportStar(require("./vas-user.model"), exports);
 tslib_1.__exportStar(require("./vas-form-config.dto"), exports);
 tslib_1.__exportStar(require("./vas-account-config.dto"), exports);
+tslib_1.__exportStar(require("./vas-vehicle.dto"), exports);
+tslib_1.__exportStar(require("./vas-vehicle.model"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/lib/entity/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,gEAAsC;AACtC,iEAAuC;AACvC,4DAAkC;AAClC,mEAAyC;AACzC,qEAA2C;AAC3C,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,6DAAmC;AACnC,4DAAkC;AAClC,8DAAoC;AACpC,iEAAuC;AACvC,4DAAkC;AAClC,8DAAoC;AACpC,iEAAuC;AACvC,mEAAyC;AACzC,0DAAgC;AAChC,4DAAkC;AAClC,yDAA+B;AAC/B,2DAAiC;AACjC,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,0DAAgC;AAChC,4DAAkC;AAClC,gEAAsC;AACtC,kEAAwC;AACxC,oEAAyC;AACzC,sEAA4C;AAC5C,0EAAgD;AAChD,4EAAkD;AAClD,yEAA+C;AAC/C,2EAAiD;AACjD,6DAAmC;AACnC,+DAAqC;AACrC,wDAA8B;AAC9B,0DAAgC;AAChC,+DAAqC;AACrC,6DAAmC;AACnC,2DAAiC;AACjC,gEAAsC;AACtC,+DAAqC;AACrC,iEAAuC;AACvC,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,6DAAmC;AACnC,kEAAwC;AACxC,oEAA0C;AAC1C,mEAAyC;AACzC,qEAA2C;AAC3C,8EAAoD;AACpD,gFAAsD;AACtD,8DAAoC;AACpC,yDAA+B;AAC/B,2DAAiC;AACjC,gEAAsC;AACtC,mEAAyC","sourcesContent":["export * from './vas-fire-user.dto';\nexport * from './vas-fire-user.model';\nexport * from './vas-access-group.dto';\nexport * from './vas-account.dto';\nexport * from './vas-account-object.dto';\nexport * from './vas-account-object.model';\nexport * from './vas-base.dto';\nexport * from './vas-base.model';\nexport * from './vas-branch.dto';\nexport * from './vas-branch.model';\nexport * from './vas-contact.dto';\nexport * from './vas-contact.model';\nexport * from './vas-contact-type.dto';\nexport * from './vas-control.dto';\nexport * from './vas-control.model';\nexport * from './vas-control-type.dto';\nexport * from './vas-control-type.model';\nexport * from './vas-field.dto';\nexport * from './vas-field.model';\nexport * from './vas-file.dto';\nexport * from './vas-file.model';\nexport * from './vas-form.dto';\nexport * from './vas-form.model';\nexport * from './vas-invitation';\nexport * from './vas-group.dto';\nexport * from './vas-group.model';\nexport * from './vas-instruction.dto';\nexport * from './vas-instruction.model';\nexport * from './vas-instruction-job.dto'\nexport * from './vas-instruction-job.model';\nexport * from './vas-instruction-job-field.dto';\nexport * from './vas-instruction-job-field.model';\nexport * from './vas-instruction-provider.dto';\nexport * from './vas-instruction-provider.model';\nexport * from './vas-job-data.dto';\nexport * from './vas-job-data.model';\nexport * from './vas-job.dto';\nexport * from './vas-job.model';\nexport * from './vas-job-status.dto';\nexport * from './vas-job-type.dto';\nexport * from './vas-lookup.dto';\nexport * from './vas-lookup-type.dto';\nexport * from './vas-membership.dto';\nexport * from './vas-membership.model';\nexport * from './vas-note.dto';\nexport * from './vas-note.model';\nexport * from './vas-report.dto';\nexport * from './vas-report.model';\nexport * from './vas-report-layout.dto';\nexport * from './vas-report-layout.model';\nexport * from './vas-report-request.dto';\nexport * from './vas-report-request.model';\nexport * from './vas-restricted-account-object.dto';\nexport * from './vas-restricted-account-object.model';\nexport * from './vas-task-type.dto';\nexport * from './vas-user.dto';\nexport * from './vas-user.model';\nexport * from './vas-form-config.dto';\nexport * from './vas-account-config.dto';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,gEAAsC;AACtC,iEAAuC;AACvC,4DAAkC;AAClC,mEAAyC;AACzC,qEAA2C;AAC3C,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,6DAAmC;AACnC,4DAAkC;AAClC,8DAAoC;AACpC,iEAAuC;AACvC,4DAAkC;AAClC,8DAAoC;AACpC,iEAAuC;AACvC,mEAAyC;AACzC,0DAAgC;AAChC,4DAAkC;AAClC,yDAA+B;AAC/B,2DAAiC;AACjC,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,0DAAgC;AAChC,4DAAkC;AAClC,gEAAsC;AACtC,kEAAwC;AACxC,oEAAyC;AACzC,sEAA4C;AAC5C,0EAAgD;AAChD,4EAAkD;AAClD,yEAA+C;AAC/C,2EAAiD;AACjD,6DAAmC;AACnC,+DAAqC;AACrC,wDAA8B;AAC9B,0DAAgC;AAChC,+DAAqC;AACrC,6DAAmC;AACnC,2DAAiC;AACjC,gEAAsC;AACtC,+DAAqC;AACrC,iEAAuC;AACvC,yDAA+B;AAC/B,2DAAiC;AACjC,2DAAiC;AACjC,6DAAmC;AACnC,kEAAwC;AACxC,oEAA0C;AAC1C,mEAAyC;AACzC,qEAA2C;AAC3C,8EAAoD;AACpD,gFAAsD;AACtD,8DAAoC;AACpC,yDAA+B;AAC/B,2DAAiC;AACjC,gEAAsC;AACtC,mEAAyC;AACzC,4DAAkC;AAClC,8DAAoC","sourcesContent":["export * from './vas-fire-user.dto';\nexport * from './vas-fire-user.model';\nexport * from './vas-access-group.dto';\nexport * from './vas-account.dto';\nexport * from './vas-account-object.dto';\nexport * from './vas-account-object.model';\nexport * from './vas-base.dto';\nexport * from './vas-base.model';\nexport * from './vas-branch.dto';\nexport * from './vas-branch.model';\nexport * from './vas-contact.dto';\nexport * from './vas-contact.model';\nexport * from './vas-contact-type.dto';\nexport * from './vas-control.dto';\nexport * from './vas-control.model';\nexport * from './vas-control-type.dto';\nexport * from './vas-control-type.model';\nexport * from './vas-field.dto';\nexport * from './vas-field.model';\nexport * from './vas-file.dto';\nexport * from './vas-file.model';\nexport * from './vas-form.dto';\nexport * from './vas-form.model';\nexport * from './vas-invitation';\nexport * from './vas-group.dto';\nexport * from './vas-group.model';\nexport * from './vas-instruction.dto';\nexport * from './vas-instruction.model';\nexport * from './vas-instruction-job.dto'\nexport * from './vas-instruction-job.model';\nexport * from './vas-instruction-job-field.dto';\nexport * from './vas-instruction-job-field.model';\nexport * from './vas-instruction-provider.dto';\nexport * from './vas-instruction-provider.model';\nexport * from './vas-job-data.dto';\nexport * from './vas-job-data.model';\nexport * from './vas-job.dto';\nexport * from './vas-job.model';\nexport * from './vas-job-status.dto';\nexport * from './vas-job-type.dto';\nexport * from './vas-lookup.dto';\nexport * from './vas-lookup-type.dto';\nexport * from './vas-membership.dto';\nexport * from './vas-membership.model';\nexport * from './vas-note.dto';\nexport * from './vas-note.model';\nexport * from './vas-report.dto';\nexport * from './vas-report.model';\nexport * from './vas-report-layout.dto';\nexport * from './vas-report-layout.model';\nexport * from './vas-report-request.dto';\nexport * from './vas-report-request.model';\nexport * from './vas-restricted-account-object.dto';\nexport * from './vas-restricted-account-object.model';\nexport * from './vas-task-type.dto';\nexport * from './vas-user.dto';\nexport * from './vas-user.model';\nexport * from './vas-form-config.dto';\nexport * from './vas-account-config.dto';\nexport * from './vas-vehicle.dto';\nexport * from './vas-vehicle.model';\n"]}

package/cjs/lib/entity/vas-job.model.d.ts

@@ -5,6 +5,7 @@ import { VasFormModel } from './vas-form.model';
 import { VasJobDto } from './vas-job.dto';
 import { VasRestrictedAccountObjectModel } from './vas-restricted-account-object.model';
 import { GeoLocation } from '../model/geo-location';
+import { VasFormDto } from './vas-form.dto';
 export declare interface VasJobModelDynamicInterface {
     [s: string]: string | number | Record<string, VasFieldDtoValue>;
 }
@@ -54,8 +55,7 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      */
     get dynamicProperties(): Array<string>;
     /**
-     * Returns a list of Job static properties i.e. those that are declared by
-     * the type
+     * Returns the list of properties of the Job type
      */
     get staticProperties(): Array<string>;
     /**
@@ -63,6 +63,13 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      */
     static empty(): VasJobModel;
     static fromDto(dto: Partial<VasJobDto>): VasJobModel;
+    /**
+     * This method will instantiate a new JobModel. The difference with this
+     * method of instantiation is that we are coming from a relation frame i.e.
+     * the job has a list of {@link VasFieldDto} instead of a Job document.
+     *
+     */
+    static fromRelational(dto: Partial<VasJobDto>, form: VasFormDto): VasJobModel;
     /**
      * @param {VasFormModel} formModel
      * @return {Record<string, VasFieldDtoValue>}
@@ -75,7 +82,7 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      * return a property regardless (because it uses the form to drive the logic)
      * @return {Record<string, VasFieldDtoValue>}
      */
-    getFields2(): Record<string, VasFieldDtoValue>;
+    protected getFields2(): Record<string, VasFieldDtoValue>;
     /**
      * Returns an object describing how many attachments were added to this job
      * (camera controls and files), and how many have not been uploaded yet.
@@ -88,18 +95,41 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
         total: number;
     };
     /**
-     * This method will hydrate the `fields` property of the model. The reason for
-     * this is that we have different ways to store the field data. One way, is
-     * we store them as dynamic properties of the job. For example job.foo.bar,
-     * where `foo` is the name of a Group, and `bar` is the name of a control.
-     * Thus, when we create a job using a form in the client, the job object will
-     * have its static properties (id, account, reference etc), and also a number
-     * of dynamic properties determined by the Groups and Controls. This kind of
-     * object is nice to work with in certain circumstances. However, the api
-     * works differently. In the API a Job is a record, and references a number of
-     * Field records. Each Field stores the value. Comparing these two models we
-     * have:
-     * A) job with dynamic properties, e.g.
+     * This method will return the dynamic property from the JobModel that
+     * represent a group (from a form).
+     *
+     * @param name the name of the group
+     * @param init if true (default) and group is not found, initialise an empty
+     * group, otherwise throw an error
+     */
+    getGroup(name: string, init?: boolean): Record<string, VasFieldDtoValue>;
+    /**
+     * @param path path segments
+     */
+    getValueByPath<T extends VasFieldDtoValue>(path?: string[]): T | undefined;
+    /**
+     * In order to understand why we need this method it is important to
+     * understand that within the system, Jobs can be represented in one of two
+     * ways, document and relational.
+     *
+     * The important distinction is how values submitted by a form are stored.
+     *
+     * Jobs stored as documents (JSON objects) will store user values, as dynamic
+     * properties of the document.
+     *
+     * Whereas, Jobs stored as relational, will store user values in an array of
+     * {@link VasFieldDto} objects.
+     *
+     * Depending on where we are in the system, either one of these approaches can
+     * be more useful than the other.
+     *
+     * This method, assumes that the JobModel has been instantiated from a
+     * document representation, and serves to hydrate the fields array. In order
+     * to achieve this, knowledge of the {@link VasFormDto} that created the job
+     * is required.
+     *
+     *
+     * Job in document representation
      * {
      *   id: <guid>,
      *   reference: "something"
@@ -109,7 +139,7 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      *   }
      * }
      *
-     * B) job with fields
+     * Job in relational representation
      * {
      *   id: <guid>,
      *   reference: "something"
@@ -124,55 +154,15 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      *   ]
      * }
      *
-     * So, what this method does is given a JobModel in the form of A, read all
-     * of those dynamic properties and set them into `fields`. Doing this requires
-     * knowledge of the Form that was used to create the job. Moreover, since the
-     * dynamic properties do not contain the ids of the fields, we also allow to
-     * pass in a `controlFieldIdMap`. This map stores the mapping between Control
-     * and the Field that was created in the Job to store the value for that
-     * Control. This is useful, if for example you want to compare a Job in form A
-     * with a Job in form B, for example if you want to update the Job on the API
-     * with a Job that was saved by a client in form A.
-     *
-     * E.g.
-     * Client -> API: client requests form
-     * User -> Client: user fills in the form and submits
-     * Client -> Firestore: client saves the Job in form A i.e. dynamic props
-     * Firestore -> Function: A function is triggered to sync the job to the API
-     * Function -> API: Function checks if job already exists, it receives 404
-     * Function -> Function: The function calls `hydrateFields(...)`
-     * Function -> API: The function POST the Job to /jobs
-     * Function -> API: The function POST each field to /fields
-     *
-     * Similarly, if the user updates the job
-     * Client -> API: client requests form
-     * User -> Client: user fills in the form and submits an update
-     * Client -> Firestore: client saves the Job in form A i.e. dynamic props
-     * Firestore -> Function: A function is triggered to sync the job to the API
-     * Function -> API: Function checks if job already exists, it receives 200
-     * Function -> Function: The function calls `hydrateFields(...)` passing in
-     *                       the map is made by iterating over the fields it
-     *                       received from the API and storing the mappings
-     *                       between controlId and fieldId for each field
-     * Function -> API: The function PATCH the Job to /jobs
-     * Function -> API: The function POST/PATCH each field to /fields
-     * treated as new
-     *
-     * @param {VasFormModel} formModel the VasFormModel that was used to create
-     * the job
-     * @param {Map<string, string>} controlFieldIdMap a mapping of control to
-     * field ids. This is used to determine whether a new id for the field should
-     * be generated, or to reuse an existing one from the map.
-     * @param {Array<string>} controlNames if a value is provided, it will be used
+     *
+     * @param formModel the VasFormModel that was used to create the job
+     * @param controlFieldIdMap This is used to determine the id each field.
+     * Either one will be found in the map, or a new one is generated.
+     * @param controlNames if a value is provided, it will be used
      * to filter the fields that are returned.
      * @return {Array<VasFieldDto>}
      */
     hydrateFields(formModel: VasFormModel, controlFieldIdMap?: Map<string, string>, controlNames?: Array<string>): void;
-    /**
-     * @param {string[]} path path segments
-     * @return {void}
-     */
-    getValueByPath<T extends VasFieldDtoValue>(path?: string[]): T | undefined;
     /**
      * A very non sophisticated way to set values in the job via paths
      *
@@ -187,14 +177,13 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      *   }
      * }
      *
-     * @param {any} value the value to set
-     * @param {string[]} path path segments
+     * @param value the value to set
+     * @param path path segments
      */
     setValueByPath(value: VasFieldDtoValue, path?: string[]): void;
     /**
-     * @param {boolean} staticOnly if true, will only output values for the static
+     * @param staticOnly if true, will only output values for the static
      * properties in the dto
-     * @return {VasJobDto}
      */
     toDto(staticOnly?: boolean): VasJobDto;
     /**
@@ -221,7 +210,7 @@ export declare class VasJobModel extends VasRestrictedAccountObjectModel {
      *
      * @param {string} value a string with the syntax
      * @param {ParseSyntaxOptions} options
-     * @return {string} the results of parsing the syntax on this job
+     * @return the results of parsing the syntax on this job
      */
     parseSyntax(value: string, options?: ParseSyntaxOptions): string;
     /**

package/cjs/lib/entity/vas-job.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vas-job.model.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-job.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAIvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AACxF,OAAO,EAAE,WAAW,EAAuB,MAAM,uBAAuB,CAAC;AAIzE,MAAM,CAAC,OAAO,WAAW,2BAA2B;IAClD,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,kBAAkB;IAKjC,cAAc,EAAE,MAAM,CAAC;IAMvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAClF;AAED;;GAEG;AACH,qBAAa,WAAY,SAAQ,+BAA+B;IAG5C,EAAE,EAAE,MAAM;IACV,OAAO,EAAE,MAAM;IACf,aAAa,EAAE,MAAM;IACrB,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,MAAM;IAChB,cAAc,EAAE,MAAM;IACtB,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,MAAM;IACrB,cAAc,EAAE,MAAM;IACtB,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,MAAM;IAC5B,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,MAAM;IACd,cAAc,EAAE,MAAM;IACtB,aAAa,EAAE,MAAM;IACrB,aAAa,EAAE,MAAM;IACrB,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC;IACxB,oBAAoB,EAAE,MAAM;IAC5B,qBAAqB,EAAE,MAAM;IAC7B,WAAW,EAAE,WAAW;gBAzBf,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,EAC1B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,EACxB,oBAAoB,EAAE,MAAM,EAC5B,qBAAqB,EAAE,MAAM,EAC7B,WAAW,EAAE,WAAW;IAiBjC;;;OAGG;IACH,IAAI,KAAK,IAAI,2BAA2B,CAEvC;IAED;;;OAGG;IACH,IAAI,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAC,CAKrC;IAED;;;OAGG;IACH,IAAI,gBAAgB,IAAI,KAAK,CAAC,MAAM,CAAC,CAEpC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,IAAI,WAAW;WA+BX,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,WAAW;IAuC7D;;;OAGG;IACH,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAYpE;;;;;;OAMG;IACH,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAa9C;;;;;;OAMG;IACH,oBAAoB,CAClB,SAAS,EAAE,YAAY,GACtB;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IA6CrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+EG;IACH,aAAa,CACX,SAAS,EAAE,YAAY,EACvB,iBAAiB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAA6B,EAClE,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAC3B,IAAI;IAkCP;;;OAGG;IACH,cAAc,CAAC,CAAC,SAAS,gBAAgB,EACvC,IAAI,GAAE,MAAM,EAAO,GAClB,CAAC,GAAG,SAAS;IAIhB;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,GAAE,MAAM,EAAO,GAAG,IAAI;IAyBlE;;;;OAIG;IACH,KAAK,CAAC,UAAU,UAAQ,GAAG,SAAS;IAyCpC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,WAAW,CACT,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,kBAER,GACA,MAAM;IAuET;;OAEG;IACM,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CAc/D"}
+{"version":3,"file":"vas-job.model.d.ts","sourceRoot":"","sources":["../../../../../projects/vas-lib/src/lib/entity/vas-job.model.ts"],"names":[],"mappings":"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"}

package/cjs/lib/entity/vas-job.model.js

@@ -62,8 +62,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
             .filter(prop => !nativeProps.includes(prop));
     }
     /**
-     * Returns a list of Job static properties i.e. those that are declared by
-     * the type
+     * Returns the list of properties of the Job type
      */
     get staticProperties() {
         return Object.getOwnPropertyNames(VasJobModel.empty());
@@ -83,6 +82,28 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
             .forEach((key) => model.$this[key] = dto[key]);
         return model;
     }
+    /**
+     * This method will instantiate a new JobModel. The difference with this
+     * method of instantiation is that we are coming from a relation frame i.e.
+     * the job has a list of {@link VasFieldDto} instead of a Job document.
+     *
+     */
+    static fromRelational(dto, form) {
+        const model = new VasJobModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.createdByName || '', dto.modifiedByName || '', dto.account || '', dto.accessGroup || '', dto.reference || '', dto.jobDate || '', dto.jobStatus || '', dto.jobType || '', dto.assigneeId || '', dto.formId || '', dto.timeZoneOffset || (0, moment_1.default)().utcOffset(), dto.pendingFields || 0, dto.childModified || '', dto.version || 0, dto.fields || [], dto.files || [], dto.createdByDisplayName || '', dto.modifiedByDisplayName || '', dto.geoLocation || (0, geo_location_1.getEmptyGeoLocation)());
+        form.groups
+            .forEach(group => {
+            group.controls
+                .forEach(control => {
+                var _a;
+                const field = (_a = dto.fields) === null || _a === void 0 ? void 0 : _a.find(f => f.control === control.id);
+                if (!field) {
+                    return;
+                }
+                model.getGroup(group.name)[control.name] = field.value;
+            });
+        });
+        return model;
+    }
     /**
      * @param {VasFormModel} formModel
      * @return {Record<string, VasFieldDtoValue>}
@@ -155,7 +176,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
             .length;
         // add total from files that are pending
         pending += this.files
-            .filter(value => value.status !== 'COMPLETED')
+            .filter(value => value.status !== 'COMPLETE')
             .length;
         return {
             pending,
@@ -163,18 +184,63 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
         };
     }
     /**
-     * This method will hydrate the `fields` property of the model. The reason for
-     * this is that we have different ways to store the field data. One way, is
-     * we store them as dynamic properties of the job. For example job.foo.bar,
-     * where `foo` is the name of a Group, and `bar` is the name of a control.
-     * Thus, when we create a job using a form in the client, the job object will
-     * have its static properties (id, account, reference etc), and also a number
-     * of dynamic properties determined by the Groups and Controls. This kind of
-     * object is nice to work with in certain circumstances. However, the api
-     * works differently. In the API a Job is a record, and references a number of
-     * Field records. Each Field stores the value. Comparing these two models we
-     * have:
-     * A) job with dynamic properties, e.g.
+     * This method will return the dynamic property from the JobModel that
+     * represent a group (from a form).
+     *
+     * @param name the name of the group
+     * @param init if true (default) and group is not found, initialise an empty
+     * group, otherwise throw an error
+     */
+    getGroup(name, init = true) {
+        let prop;
+        if (this.staticProperties.includes(name)) {
+            throw Error(`invalid group name ${name}, not a dynamic property`);
+        }
+        else if (this.$this[name] === undefined) {
+            if (init) {
+                prop = this.$this[name] = {};
+            }
+            else {
+                throw Error(`invalid group name ${name}, not found`);
+            }
+        }
+        else {
+            prop = this.$this[name];
+            if (typeof prop !== 'object') {
+                throw Error(`invalid group name ${name}, not an object`);
+            }
+        }
+        return prop;
+    }
+    /**
+     * @param path path segments
+     */
+    getValueByPath(path = []) {
+        return (0, get_value_by_path_1.getValueByPath)(path, this.$this);
+    }
+    /**
+     * In order to understand why we need this method it is important to
+     * understand that within the system, Jobs can be represented in one of two
+     * ways, document and relational.
+     *
+     * The important distinction is how values submitted by a form are stored.
+     *
+     * Jobs stored as documents (JSON objects) will store user values, as dynamic
+     * properties of the document.
+     *
+     * Whereas, Jobs stored as relational, will store user values in an array of
+     * {@link VasFieldDto} objects.
+     *
+     * Depending on where we are in the system, either one of these approaches can
+     * be more useful than the other.
+     *
+     * This method, assumes that the JobModel has been instantiated from a
+     * document representation, and serves to hydrate the fields array. In order
+     * to achieve this, knowledge of the {@link VasFormDto} that created the job
+     * is required.
+     *
+     *
+     * Job in document representation
      * {
      *   id: <guid>,
      *   reference: "something"
@@ -184,7 +250,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
      *   }
      * }
      *
-     * B) job with fields
+     * Job in relational representation
      * {
      *   id: <guid>,
      *   reference: "something"
@@ -199,46 +265,11 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
      *   ]
      * }
      *
-     * So, what this method does is given a JobModel in the form of A, read all
-     * of those dynamic properties and set them into `fields`. Doing this requires
-     * knowledge of the Form that was used to create the job. Moreover, since the
-     * dynamic properties do not contain the ids of the fields, we also allow to
-     * pass in a `controlFieldIdMap`. This map stores the mapping between Control
-     * and the Field that was created in the Job to store the value for that
-     * Control. This is useful, if for example you want to compare a Job in form A
-     * with a Job in form B, for example if you want to update the Job on the API
-     * with a Job that was saved by a client in form A.
-     *
-     * E.g.
-     * Client -> API: client requests form
-     * User -> Client: user fills in the form and submits
-     * Client -> Firestore: client saves the Job in form A i.e. dynamic props
-     * Firestore -> Function: A function is triggered to sync the job to the API
-     * Function -> API: Function checks if job already exists, it receives 404
-     * Function -> Function: The function calls `hydrateFields(...)`
-     * Function -> API: The function POST the Job to /jobs
-     * Function -> API: The function POST each field to /fields
-     *
-     * Similarly, if the user updates the job
-     * Client -> API: client requests form
-     * User -> Client: user fills in the form and submits an update
-     * Client -> Firestore: client saves the Job in form A i.e. dynamic props
-     * Firestore -> Function: A function is triggered to sync the job to the API
-     * Function -> API: Function checks if job already exists, it receives 200
-     * Function -> Function: The function calls `hydrateFields(...)` passing in
-     *                       the map is made by iterating over the fields it
-     *                       received from the API and storing the mappings
-     *                       between controlId and fieldId for each field
-     * Function -> API: The function PATCH the Job to /jobs
-     * Function -> API: The function POST/PATCH each field to /fields
-     * treated as new
      *
-     * @param {VasFormModel} formModel the VasFormModel that was used to create
-     * the job
-     * @param {Map<string, string>} controlFieldIdMap a mapping of control to
-     * field ids. This is used to determine whether a new id for the field should
-     * be generated, or to reuse an existing one from the map.
-     * @param {Array<string>} controlNames if a value is provided, it will be used
+     * @param formModel the VasFormModel that was used to create the job
+     * @param controlFieldIdMap This is used to determine the id each field.
+     * Either one will be found in the map, or a new one is generated.
+     * @param controlNames if a value is provided, it will be used
      * to filter the fields that are returned.
      * @return {Array<VasFieldDto>}
      */
@@ -270,13 +301,6 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
         });
         this.fields = fields;
     }
-    /**
-     * @param {string[]} path path segments
-     * @return {void}
-     */
-    getValueByPath(path = []) {
-        return (0, get_value_by_path_1.getValueByPath)(path, this.$this);
-    }
     /**
      * A very non sophisticated way to set values in the job via paths
      *
@@ -291,8 +315,8 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
      *   }
      * }
      *
-     * @param {any} value the value to set
-     * @param {string[]} path path segments
+     * @param value the value to set
+     * @param path path segments
      */
     setValueByPath(value, path = []) {
         switch (path.length) {
@@ -319,9 +343,8 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
         }
     }
     /**
-     * @param {boolean} staticOnly if true, will only output values for the static
+     * @param staticOnly if true, will only output values for the static
      * properties in the dto
-     * @return {VasJobDto}
      */
     toDto(staticOnly = false) {
         if (staticOnly) {
@@ -356,7 +379,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
         }
         const dto = {};
         [...this.staticProperties, ...this.dynamicProperties]
-            .forEach(prop => (dto)[prop] = this.$this[prop]);
+            .forEach(prop => dto[prop] = this.$this[prop]);
         return dto;
     }
     /**
@@ -383,7 +406,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
      *
      * @param {string} value a string with the syntax
      * @param {ParseSyntaxOptions} options
-     * @return {string} the results of parsing the syntax on this job
+     * @return the results of parsing the syntax on this job
      */
     parseSyntax(value, options = {
         timeZoneOffset: 0
@@ -417,7 +440,7 @@ class VasJobModel extends vas_restricted_account_object_model_1.VasRestrictedAcc
                 result = (this.getValueByPath(path) || '').toString();
             }
             else if (objectKey === 'fields') {
-                result = ((0, get_value_by_path_1.getValueByPath)(path, this.getFields2()) || '').toString();
+                result = ((0, get_value_by_path_1.getValueByPath)(['fields.' + path.shift(), ...path], this.getFields2()) || '').toString();
             }
             else if (objectKey.length) {
                 if (options.objects) {