sowell-models 1.8.1 → 1.8.3

package/package.json

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

package/src/models/Author/index.ts

@@ -1,18 +1,8 @@
-import { Model, Attr } from "spraypaint"
-import { ICompany } from "../Company"
+import { Model } from "spraypaint"
 import { SPUserItem } from "../User"
-
-export interface Author {
-  _id?: string
-  fname: string
-  lname: string
-  email?: string
-  company?: ICompany
-}
 @Model()
 export class SPAuthor extends SPUserItem {
   static jsonapiType = "authors"
-  @Attr() name!: string
 }
 
 @Model()

package/src/models/IssueReport/index.ts

@@ -55,6 +55,17 @@ export interface ITalk {
   files: string[]
   created_at?: Date
 }
+export type ActivityName = "assignation" | "status" | "email" | "erp"
+export interface IActivity extends IModel {
+  _id?: string
+  name: ActivityName
+  createdAt: Date
+  metadata?: Record<string, any>
+  authorId?: string
+  author?: IUser
+  issueReportId?: string
+  issueReport?: IIssueReport
+}
 
 export interface IIssueReport extends IModel {
   _id?: string
@@ -73,9 +84,10 @@ export interface IIssueReport extends IModel {
   residence?: IResidence
   area?: IArea
   talks?: ITalk[]
+  activities?: IActivity[]
   spot?: ISpot | ISpot[]
   imgs?: string[]
-  isTenantRequest?:boolean
+  isTenantRequest?: boolean
   reason?: IReason
   origin?: IOrigin
   assignee?: IUser
@@ -85,7 +97,8 @@ export interface IIssueReport extends IModel {
 
 export class IssueCollection
   extends PouchCollection<IIssueReport>
-  implements IClearable {
+  implements IClearable
+{
   async beforeInit(): Promise<void> {
     await this.addIndex(["_id", "remoteId"])
   }
@@ -96,7 +109,7 @@ export class IssueCollection
 
   async find(
     selector?: Record<string, any> | Partial<IIssueReport> | undefined,
-    opts?: CollectionFindOptions
+    opts?: CollectionFindOptions,
   ): Promise<IIssueReport[]> {
     const result = await super.find(selector, opts)
     return orderBy(result, ["name"], ["asc"])
@@ -109,10 +122,20 @@ export class IssueCollection
   }
 }
 
+@Model()
+export class SPActivity extends ApplicationRecord implements IActivity {
+  static jsonapiType = "activities"
+  @Attr() name!: ActivityName
+  @Attr({ persist: false }) createdAt!: Date
+  @Attr() metadata!: Record<string, any>
+  @BelongsTo() issueReport!: SPIssueReportItem
+  @BelongsTo() author!: SPUserItem
+}
 @Model()
 export class SPIssueReportItem
   extends ApplicationRecord
-  implements Partial<IIssueReport> {
+  implements Partial<IIssueReport>
+{
   static jsonapiType = "issue_reports"
   @Attr() isTenantRequest!: boolean
   @Attr() message!: string
@@ -141,23 +164,21 @@ export class SPIssueReportItem
   @BelongsTo() origin?: SPOriginItem | undefined
   @BelongsTo() assignee?: SPAssignee
   @HasMany() unseenIssues!: SPUnseenIssue[]
+  @HasMany() activities!: SPActivity[]
 
   static async validate(payload: IssueReportPayload): Promise<string> {
-    const schema = yup
-      .object()
-      .required()
-      .shape({
-        category: yup.string(),
-        agency: yup.string(),
-        residence: yup.string().nullable().notRequired(),
-        place: yup.string().nullable().notRequired(),
-        spot: yup.string().nullable().notRequired(),
-        checkpoint: yup.string(),
-        description: yup.string().required(),
-        priority: yup.number().required(),
-        visitReport: yup.string(),
-        isTenantRequest: yup.boolean()
-      })
+    const schema = yup.object().required().shape({
+      category: yup.string(),
+      agency: yup.string(),
+      residence: yup.string().nullable().notRequired(),
+      place: yup.string().nullable().notRequired(),
+      spot: yup.string().nullable().notRequired(),
+      checkpoint: yup.string(),
+      description: yup.string().required(),
+      priority: yup.number().required(),
+      visitReport: yup.string(),
+      isTenantRequest: yup.boolean(),
+    })
 
     const isValid = await schema.isValid(payload)
 

package/src/models/User/index.ts

@@ -44,6 +44,24 @@ export class UserCollection extends PouchCollection<IUser> {
   }
 }
 
+export class AssigneeCollection extends PouchCollection<IUser> {
+  async beforeInit(): Promise<void> {
+    await this.addIndex(["id"])
+  }
+
+  async clear(): Promise<void> {
+    await PouchORM.clearDatabase("assignees")
+  }
+
+  async bulkUpsertIfNotExists(items: IUser[]): Promise<IUser[]> {
+    const existingItems = await super.find({})
+    const diff = arrayDiffBy(existingItems, items, "id")
+    const upsertedIssueReport = await super.bulkUpsert(diff.missingLeft)
+    return upsertedIssueReport
+  }
+}
+
+
 @Model()
 export class SPUserItem extends ApplicationRecord implements IUser {
   static jsonapiType = "users"