sowell-models 1.30.0 → 1.32.0

package/package.json

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

package/src/index.ts

@@ -25,3 +25,5 @@ export * from './models/Location';
 export * from './models/Origin';
 export * from './models/Provider';
 export * from './models/UnseenIssue';
+export * from './models/Form';
+export * from './models/FormAnswer';

package/src/models/Form/index.ts

@@ -0,0 +1,13 @@
+import { Attr, Model } from 'spraypaint'
+import { ApplicationRecord } from '../ApplicationRecord'
+
+export interface IForm {
+  id?: string
+  name?: string
+}
+
+@Model()
+export class SPForm extends ApplicationRecord implements IForm {
+  static jsonapiType = 'forms'
+  @Attr() name!: string
+}

package/src/models/FormAnswer/index.ts

@@ -0,0 +1,29 @@
+import { Attr, BelongsTo, Model } from 'spraypaint'
+import { ApplicationRecord } from '../ApplicationRecord'
+import { IUser, SPUserItem } from '../User'
+import { IForm, SPForm } from '../Form'
+
+export interface IFormAnswerData {
+  data: any[]
+  agency?: string
+  residence?: string
+  place?: string
+  spot?: string
+}
+
+export interface IFormAnswer {
+  id?: string
+  createdAt?: string
+  answers?: IFormAnswerData
+  author?: IUser
+  form?: IForm
+}
+
+@Model()
+export class SPFormAnswer extends ApplicationRecord implements IFormAnswer {
+  static jsonapiType = 'form_answers'
+  @Attr() createdAt!: string
+  @Attr() answers!: IFormAnswerData
+  @BelongsTo() author!: SPUserItem
+  @BelongsTo() form!: SPForm
+}

package/src/models/IssueReport/index.ts

@@ -1,4 +1,4 @@
-import { Model, Attr, BelongsTo, HasMany } from "spraypaint"
+import { Model, Attr, BelongsTo, HasMany, HasOne } from "spraypaint"
 import { IModel, PouchCollection, PouchORM } from "pouchorm"
 import { orderBy } from "lodash"
 import * as yup from "yup"
@@ -32,6 +32,7 @@ export interface IssueReportPayload {
   spot?: string
   areaNature?: "housing" | "other_spots" | "common_areas" | "zone"
   isTenantRequest?: boolean
+  tenantSpot?: string
   reason?: string
   origin?: string
   assignee?: string
@@ -89,6 +90,7 @@ export interface IIssueReport extends IModel {
   spot?: ISpot | ISpot[]
   imgs?: string[]
   isTenantRequest?: boolean
+  tenantSpot?: ISpot 
   reason?: IReason
   origin?: IOrigin
   assignee?: IUser
@@ -161,6 +163,7 @@ export class SPIssueReportItem
   @BelongsTo() residence!: IResidence
   @BelongsTo() place!: SPPlaceItem
   @BelongsTo() spot!: SPSpotItem
+  @BelongsTo() tenantSpot?: SPSpotItem
   @BelongsTo() company!: SPCompany
   @BelongsTo() visitReport!: SPVisitReport
   @BelongsTo() checkpoint!: SPCheckpointItem
@@ -183,6 +186,7 @@ export class SPIssueReportItem
       priority: yup.number().required(),
       visitReport: yup.string(),
       isTenantRequest: yup.boolean(),
+      tenantSpot: yup.string().nullable().notRequired()
     })
 
     const isValid = await schema.isValid(payload)