sowell-models 1.6.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sowell-models",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "SoWell models",
   "type": "module",
   "engines": {

package/src/models/Author/index.ts

@@ -1,6 +1,6 @@
 import { Model, Attr } from "spraypaint"
-import { ApplicationRecord } from "../ApplicationRecord"
 import { ICompany } from "../Company"
+import { SPUserItem } from "../User"
 
 export interface Author {
   _id?: string
@@ -10,7 +10,12 @@ export interface Author {
   company?: ICompany
 }
 @Model()
-export class SPAuthor extends ApplicationRecord {
+export class SPAuthor extends SPUserItem {
   static jsonapiType = "authors"
   @Attr() name!: string
 }
+
+@Model()
+export class SPAssignee extends SPUserItem {
+  static jsonapiType = "assignees"
+}

package/src/models/Checklist/index.ts

@@ -9,7 +9,6 @@ import { ICheckpoint, SPCheckpointItem } from "../Checkpoint"
 import { CollectionFindOptions, IClearable } from "../interfaces"
 import { IArea, SPAreaItem } from "../AreaItem"
 import { IFamily, SPFamily } from "../Family"
-import { CleanerType } from "../VisitProp"
 export interface IChecklist extends IModel {
   _id?: string
   id?: string
@@ -21,7 +20,7 @@ export interface IChecklist extends IModel {
   area?: IArea
   checkpoints?: ICheckpoint[]
   family?: IFamily
-  defaultCleaner?: CleanerType
+  allowedAgents?: string[]
 }
 
 export class ChecklistCollection
@@ -39,7 +38,7 @@ export class ChecklistCollection
   async find(
     selector?: Record<string, any> | Partial<IChecklist> | undefined,
     opts?: CollectionFindOptions
-  ) {
+  ): Promise<IChecklist[]> {
     const result = await super.find(selector, opts)
     return orderBy(result, ["name"], ["asc"])
   }
@@ -51,7 +50,7 @@ export class SPChecklistItem extends ApplicationRecord implements IChecklist {
   @Attr() isPlanned!: boolean
   @Attr() iconUrl!: string
   @Attr({ persist: false }) updatedAt!: Date
-  @Attr() defaultCleaner!: CleanerType
+  @Attr() allowedAgents!: string[]
   @BelongsTo() company!: SPCompany
   @BelongsTo() family!: SPFamily
   @HasOne() area!: SPAreaItem

package/src/models/Company/index.ts

@@ -11,14 +11,14 @@ export interface ICompany extends IModel {
   id?: string
   _id?: string
   name?: string
-  config?: string[]
+  config?: Record<string, any>
 }
 
 @Model()
 export class SPCompany extends ApplicationRecord implements ICompany {
   static jsonapiType = "companies"
   @Attr() name!: string
-  @Attr() config!: string[]
+  @Attr() config!: Record<string, any>
   @HasMany("areas") spAreaItems!: SPAreaItem[]
   @HasMany("agencies") spAgencyItems!: SPAgencyItem[]
   @HasMany("residences") spResidenceItems!: SPResidenceItem[]

package/src/models/IssueReport/index.ts

@@ -18,6 +18,7 @@ import arrayDiffBy from "../types"
 import { IReason, SPReasonItem } from "../Reason"
 import { IOrigin, SPOriginItem } from "../Origin"
 import { SPUnseenIssue } from "../UnseenIssue"
+import { SPAssignee } from "../Author"
 export interface IssueReportPayload {
   category?: string
   agency?: string
@@ -33,6 +34,7 @@ export interface IssueReportPayload {
   isTenantRequest?: boolean
   reason?: string
   origin?: string
+  assignee?: string
 }
 
 export type Tab = "mySector" | "others"
@@ -76,6 +78,7 @@ export interface IIssueReport extends IModel {
   isTenantRequest?:boolean
   reason?: IReason
   origin?: IOrigin
+  assignee?: IUser
   seen?: boolean
   validate?: () => string
 }
@@ -94,7 +97,7 @@ export class IssueCollection
   async find(
     selector?: Record<string, any> | Partial<IIssueReport> | undefined,
     opts?: CollectionFindOptions
-  ) {
+  ): Promise<IIssueReport[]> {
     const result = await super.find(selector, opts)
     return orderBy(result, ["name"], ["asc"])
   }
@@ -136,9 +139,10 @@ export class SPIssueReportItem
   @BelongsTo() checkpoint!: SPCheckpointItem
   @BelongsTo() reason!: SPReasonItem
   @BelongsTo() origin?: SPOriginItem | undefined
+  @BelongsTo() assignee?: SPAssignee
   @HasMany() unseenIssues!: SPUnseenIssue[]
 
-  static async validate(payload: IssueReportPayload) {
+  static async validate(payload: IssueReportPayload): Promise<string> {
     const schema = yup
       .object()
       .required()

package/src/models/VisitProp/index.ts

@@ -7,7 +7,6 @@ import { ICheckpoint, SPCheckpointItem } from "../Checkpoint"
 import { IResidence, SPResidenceItem } from "../Residence"
 import { ISpot, SPSpotItem } from "../Spot"
 
-export type CleanerType = "reporter" | "tenant" | "provider" | "others"
 export interface IVisitProp extends IModel {
   _id?: string
   status?: "pending" | "missing"
@@ -19,14 +18,12 @@ export interface IVisitProp extends IModel {
   residenceId?: number
   spot?: ISpot
   spotId?: number
-  cleaner?: CleanerType
 }
 
 @Model()
 export class SPVisitPropItem extends ApplicationRecord implements IVisitProp {
   static jsonapiType = "visit_props"
   @Attr() status!: "pending" | "missing"
-  @Attr() cleaner!: CleanerType
   @Attr() placeId!: number
   @Attr() checkpointId!: number
   @Attr() residenceId!: number

package/src/models/VisitReport/index.ts

@@ -5,7 +5,6 @@ import { IUser, SPUserItem } from "../User"
 import { IIssueReport, SPIssueReportItem } from "../IssueReport"
 import { ApplicationRecord } from "../ApplicationRecord"
 import { IVisitSchedule, SPVisitSchedule } from "../VisitSchedule"
-import { ICheckpoint } from "../Checkpoint"
 import * as yup from "yup"
 import { IChecklist, SPChecklistItem } from "../Checklist"
 import { IPlace, SPPlaceItem } from "../Place"
@@ -35,6 +34,7 @@ export interface VisitReportPayload {
   comment?: string
   isMissingProvider?: boolean
   validate?: (payload: VisitReportPayload) => string
+  agent?: string
 }
 
 export interface CheckpointProps {
@@ -51,14 +51,13 @@ export interface CheckpointProps {
   }
   category?: number
   comment?: string
-  cleaner?: "tenant" | "provider" | "reporter" | "others"
   coefficient?: number
 }
 
 export interface IVisitReport extends IModel {
   id?: string
   createdAt?: Date
-  checkpoints: ICheckpoint[] | CheckpointProps[]
+  checkpoints: CheckpointProps[]
   visitSchedule?: IVisitSchedule
   checklist?: IChecklist
   residence?: IResidence
@@ -73,6 +72,7 @@ export interface IVisitReport extends IModel {
   }
   score?: number
   isMissingProvider?: boolean
+  agent?: string
   validate?: (payload: VisitReportPayload) => string
 }
 
@@ -90,6 +90,7 @@ export class SPVisitReport extends ApplicationRecord implements IVisitReport {
   @Attr() comment!: string
   @Attr() imgs!: string[]
   @Attr() isMissingProvider!: boolean
+  @Attr() agent!: string
   @BelongsTo() author!: SPUserItem
   @BelongsTo() visitSchedule!: SPVisitSchedule
   @BelongsTo() checklist!: SPChecklistItem