sowell-models 1.22.0 → 1.22.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sowell-models",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "description": "SoWell models",
   "type": "module",
   "main": "./src/index.ts",

package/src/models/AreaItem/index.ts

@@ -4,10 +4,11 @@ import { orderBy } from "lodash"
 
 import { ICompany, SPCompany } from "../Company"
 import { ApplicationRecord } from "../ApplicationRecord"
+import { SPCategoryItem } from "../category"
 import { CollectionFindOptions, IClearable } from "../interfaces"
+import { SPSpotItem } from "../Spot"
 import { SPChecklistItem } from "../Checklist"
 import { ILocation, SPLocationItem } from "../Location"
-import { SPIssueReportItem } from "../IssueReport"
 
 export interface IAreaType extends IModel {
   _id?: string
@@ -71,7 +72,8 @@ export class SPAreaItem extends ApplicationRecord implements IArea {
   @BelongsTo() company!: SPCompany
   @HasOne() areaType!: SPAreaType
   @HasMany() checklists!: SPChecklistItem[]
-  @HasMany() spIssueReports!: SPIssueReportItem[]
+  @HasMany() spcategoryItems!: SPCategoryItem[]
+  @HasMany() spSpots!: SPSpotItem[]
   get _id(): string | undefined {
     return this.id
   }

package/src/models/Checklist/index.ts

@@ -23,6 +23,7 @@ export interface IChecklist extends IModel {
   periodicity?: string
   defaultAgent?: string
   allowedAgents?: string[]
+  skipProviderStep?: boolean
 }
 
 export class ChecklistCollection
@@ -55,6 +56,7 @@ export class SPChecklistItem extends ApplicationRecord implements IChecklist {
   @Attr() periodicity!: string
   @Attr() allowedAgents!: string[]
   @Attr() defaultAgent!: string
+  @Attr() skipProviderStep!: boolean
   @BelongsTo() company!: SPCompany
   @BelongsTo() family!: SPFamily
   @HasOne() area!: SPAreaItem

package/src/models/IssueReport/index.ts

@@ -11,7 +11,7 @@ import { IUser, SPUserItem } from "../User"
 import { ICheckpoint, SPCheckpointItem } from "../Checkpoint"
 import { SPVisitReport } from "../VisitReport"
 import { IResidence } from "../Residence"
-import { IArea, SPAreaItem } from "../AreaItem"
+import { IArea } from "../AreaItem"
 import { CollectionFindOptions, IClearable } from "../interfaces"
 import { ISpot, SPSpotItem } from "./../Spot"
 import arrayDiffBy from "../types"
@@ -92,7 +92,6 @@ export interface IIssueReport extends IModel {
   origin?: IOrigin
   assignee?: IUser
   seen?: boolean
-  areaId?: number
   validate?: () => string
 }
 
@@ -164,7 +163,6 @@ export class SPIssueReportItem
   @BelongsTo() reason!: SPReasonItem
   @BelongsTo() origin?: SPOriginItem | undefined
   @BelongsTo() assignee?: SPAssignee
-  @BelongsTo() area!: SPAreaItem
   @HasMany() unseenIssues!: SPUnseenIssue[]
   @HasMany() activities!: SPActivity[]
 

package/src/models/Spot/index.ts

@@ -1,3 +1,4 @@
+import { SPAreaItem, IArea } from "../AreaItem/index"
 import { Model, Attr, BelongsTo } from "spraypaint"
 import { orderBy } from "lodash"
 import { PouchCollection, PouchORM } from "pouchorm"
@@ -11,6 +12,7 @@ export interface ISpot extends IModel {
   name: string
   placeId?: string
   place?: IPlace
+  area?: IArea
   company?: ICompany
 }
 
@@ -39,6 +41,7 @@ export class SPSpotItem extends ApplicationRecord implements ISpot {
   static jsonapiType = "spots"
   @Attr() name!: string
   @BelongsTo() place!: SPPlaceItem
+  @BelongsTo() area!: SPAreaItem
   @BelongsTo() company!: SPCompany
   get _id(): string | undefined {
     return this.id

package/src/models/VisitReport/index.ts

@@ -42,7 +42,7 @@ export interface CheckpointProps {
   id?: string
   label?: string
   status: CheckpointStatus
-  issueReportId?: string
+  issue_report_id?: string
   issue?: {
     description: string
     priority: string

package/src/models/category/index.ts

@@ -1,85 +1,56 @@
-import { Model, Attr, BelongsTo, HasMany } from 'spraypaint';
-import { IModel, PouchCollection, PouchORM } from 'pouchorm';
-import { orderBy } from 'lodash';
+import { Model, Attr, BelongsTo, HasMany } from "spraypaint"
+import { IModel, PouchCollection, PouchORM } from "pouchorm"
+import { orderBy } from "lodash"
 
-import { ApplicationRecord } from '../ApplicationRecord';
-import { ICompany, SPCompany } from '../Company';
-import { SPCheckpointItem } from '../Checkpoint';
-import { CollectionFindOptions, IClearable } from '../interfaces';
-import { IReason, SPReasonItem } from '../Reason';
-import { IAreaType, SPAreaType } from '../AreaItem';
-import { SPFamily } from '../Family';
-
-export interface ICategoryType extends IModel {
-  _id?: string;
-  name: string;
-  code?: string;
-  areaType?: IAreaType;
-}
+import { ApplicationRecord } from "../ApplicationRecord"
+import { ICompany, SPCompany } from "../Company"
+import { IArea, SPAreaItem } from "../AreaItem"
+import { SPCheckpointItem } from "../Checkpoint"
+import { CollectionFindOptions, IClearable } from "../interfaces"
+import { IReason, SPReasonItem } from "../Reason"
 
 export interface ICategory extends IModel {
-  _id?: string;
-  name: string;
-  code?: string;
-  order?: number;
-  iconUrl?: string;
-  categoryTypeId?: string;
-  categoryType?: ICategoryType;
-  company?: ICompany;
-  reasons?: IReason[];
+  _id?: string
+  name: string
+  order?: number
+  iconUrl?: string
+  company?: ICompany
+  areaId?: string
+  area?: IArea
+  reasons?: IReason[]
 }
 
 export class CategoryCollection
   extends PouchCollection<ICategory>
-  implements IClearable
-{
+  implements IClearable {
   async beforeInit(): Promise<void> {
     // NOTE: none
   }
 
   async clear(): Promise<void> {
-    await PouchORM.clearDatabase('categories');
+    await PouchORM.clearDatabase("categories")
   }
 
   async find(
     selector?: Record<string, any> | Partial<ICategory> | undefined,
-    opts?: CollectionFindOptions,
+    opts?: CollectionFindOptions
   ): Promise<ICategory[]> {
-    const result = await super.find(selector, opts);
-    return orderBy(result, ['order'], ['asc']);
-  }
-}
-
-@Model()
-export class SPCategoryTypeItem
-  extends ApplicationRecord
-  implements ICategoryType
-{
-  static jsonapiType = 'category_types';
-  @Attr() name!: string;
-  @Attr() code?: string;
-  @BelongsTo() areaType!: SPAreaType;
-  @BelongsTo() family!: SPFamily[];
-  @HasMany() categories!: SPCategoryItem[];
-  get _id(): string | undefined {
-    return this.id;
+    const result = await super.find(selector, opts)
+    return orderBy(result, ["order"], ["asc"])
   }
 }
 
 @Model()
 export class SPCategoryItem extends ApplicationRecord implements ICategory {
-  static jsonapiType = 'categories';
-  @Attr() name!: string;
-  @Attr() order!: number;
-  @Attr() code?: string;
-  @Attr() iconUrl!: string;
-  @Attr() areaName!: string;
-  @BelongsTo() company!: SPCompany;
-  @BelongsTo() categoryType!: SPCategoryTypeItem;
-  @BelongsTo() areaType!: SPAreaType;
+  static jsonapiType = "categories"
+  @Attr() name!: string
+  @Attr() order!: number
+  @Attr() iconUrl!: string
+  @BelongsTo() company!: SPCompany
+  @BelongsTo() area!: SPAreaItem
   get _id(): string | undefined {
-    return this.id;
+    return this.id
   }
-  @HasMany() checkpoints!: SPCheckpointItem[];
-  @HasMany() reasons!: SPReasonItem[];
+  @HasMany() checkpoints!: SPCheckpointItem[]
+  @HasMany() reasons!: SPReasonItem[]
 }