Merge pull request #162 from adhocteam/js-145-activity-report-display-id

jasalisbury · web-flow · commit 4d1d36ff1b08 · 2021-02-16T16:34:03.000-06:00
Add displayId virtual field to activity reports
diff --git a/docs/openapi/index.yaml b/docs/openapi/index.yaml
@@ -24,6 +24,11 @@ components:
       properties:
         id:
           type: number
+        displayId:
+          type: string
+          description: >
+            A human readable report ID, of the form `R[Region]-AR-[ID]`. A report with
+            the ID of 20 in region 8 would have a displayId of `R08-AR-20`
         userId:
           type: number
           description: The id of the author of the report
diff --git a/src/models/activityReport.js b/src/models/activityReport.js
@@ -38,6 +38,12 @@ export default (sequelize, DataTypes) => {
     }
   }
   ActivityReport.init({
+    displayId: {
+      type: DataTypes.VIRTUAL,
+      get() {
+        return `R${this.regionId.toString().padStart(2, '0')}-AR-${this.id}`;
+      },
+    },
     userId: {
       type: DataTypes.INTEGER,
     },

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ export default (sequelize, DataTypes) => {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`ActivityReport.init({`
	`41`	`+ displayId: {`
	`42`	`+ type: DataTypes.VIRTUAL,`
	`43`	`+ get() {`
	`44`	+ return `R${this.regionId.toString().padStart(2, '0')}-AR-${this.id}`;
	`45`	`+ },`
	`46`	`+ },`
`41`	`47`	`userId: {`
`42`	`48`	`type: DataTypes.INTEGER,`
`43`	`49`	`},`