sowell-models 1.22.1 → 1.23.0

package/package.json

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

package/src/models/AreaItem/index.ts

@@ -4,11 +4,10 @@ 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
@@ -41,7 +40,7 @@ export class AreaCollection
   async find(
     selector?: Record<string, any> | Partial<IArea> | undefined,
     opts?: CollectionFindOptions
-  ) {
+  ): Promise<IArea[]> {
     const result = await super.find(selector, opts)
     return orderBy(result, ["name"], ["asc"])
   }
@@ -72,8 +71,7 @@ export class SPAreaItem extends ApplicationRecord implements IArea {
   @BelongsTo() company!: SPCompany
   @HasOne() areaType!: SPAreaType
   @HasMany() checklists!: SPChecklistItem[]
-  @HasMany() spcategoryItems!: SPCategoryItem[]
-  @HasMany() spSpots!: SPSpotItem[]
+  @HasMany() spIssueReports!: SPIssueReportItem[]
   get _id(): string | undefined {
     return this.id
   }

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 } from "../AreaItem"
+import { IArea, SPAreaItem } from "../AreaItem"
 import { CollectionFindOptions, IClearable } from "../interfaces"
 import { ISpot, SPSpotItem } from "./../Spot"
 import arrayDiffBy from "../types"
@@ -92,6 +92,7 @@ export interface IIssueReport extends IModel {
   origin?: IOrigin
   assignee?: IUser
   seen?: boolean
+  areaId?: number
   validate?: () => string
 }
 
@@ -163,6 +164,7 @@ 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,4 +1,3 @@
-import { SPAreaItem, IArea } from "../AreaItem/index"
 import { Model, Attr, BelongsTo } from "spraypaint"
 import { orderBy } from "lodash"
 import { PouchCollection, PouchORM } from "pouchorm"
@@ -12,7 +11,6 @@ export interface ISpot extends IModel {
   name: string
   placeId?: string
   place?: IPlace
-  area?: IArea
   company?: ICompany
 }
 
@@ -41,7 +39,6 @@ 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

@@ -4,19 +4,28 @@ import { orderBy } from "lodash"
 
 import { ApplicationRecord } from "../ApplicationRecord"
 import { ICompany, SPCompany } from "../Company"
-import { IArea, SPAreaItem } from "../AreaItem"
+import { IAreaType, SPAreaType } from "../AreaItem"
 import { SPCheckpointItem } from "../Checkpoint"
 import { CollectionFindOptions, IClearable } from "../interfaces"
 import { IReason, SPReasonItem } from "../Reason"
+import { SPFamily } from "../Family"
 
+
+export interface ICategoryType extends IModel {
+  _id?: string;
+  name: string;
+  code?: string;
+  areaType?: IAreaType;
+}
 export interface ICategory extends IModel {
   _id?: string
   name: string
+  code?: string
   order?: number
   iconUrl?: string
+  categoryTypeId?: string
+  categoryType?: ICategoryType
   company?: ICompany
-  areaId?: string
-  area?: IArea
   reasons?: IReason[]
 }
 
@@ -40,14 +49,32 @@ export class CategoryCollection
   }
 }
 
+@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;
+  }
+}
+
 @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() area!: SPAreaItem
+  @BelongsTo() categoryType!: SPCategoryTypeItem
   get _id(): string | undefined {
     return this.id
   }