【优化】医疗物资需求 数据模型

Author: TechQuery

package.json

@@ -28,11 +28,11 @@
         "@types/koa-logger": "^3.1.1",
         "@types/koa-multer": "^1.0.0",
         "@types/koa-router": "^7.4.0",
-        "@typescript-eslint/eslint-plugin": "^2.17.0",
-        "@typescript-eslint/parser": "^2.17.0",
+        "@typescript-eslint/eslint-plugin": "^2.18.0",
+        "@typescript-eslint/parser": "^2.18.0",
         "eslint": "^6.8.0",
         "husky": "^4.2.1",
-        "lint-staged": "^10.0.2",
+        "lint-staged": "^10.0.4",
         "nodemon": "^2.0.2",
         "prettier": "^1.19.1",
         "ts-node": "^8.6.2",

source/model/Supplies.ts

@@ -1,6 +1,22 @@
-import { Length, IsArray, IsOptional } from 'class-validator';
+import {
+    Length,
+    IsObject,
+    IsUrl,
+    IsArray,
+    IsOptional,
+    IsString
+} from 'class-validator';
 
-interface Contact {
+import { Address } from './common';
+
+export interface Supplies {
+    name: string;
+    type: 'face' | 'leg' | 'disinfection' | 'device' | 'other';
+    remark: string;
+    count: number;
+}
+
+export interface Contact {
     name: string;
     phone: string;
 }
@@ -9,16 +25,20 @@ export class RequirementModel {
     @Length(5)
     hospital: string;
 
-    @Length(10)
-    address: string;
+    @IsObject()
+    address: Address;
 
-    @IsArray()
-    coords: number[];
+    @IsUrl()
+    url: string;
 
     @IsArray()
-    supplies: string[];
+    supplies: Supplies[];
 
     @IsOptional()
     @IsArray()
     contacts?: Contact[];
+
+    @IsOptional()
+    @IsString()
+    remark?: string;
 }

source/model/common.ts

@@ -0,0 +1,7 @@
+export interface Address {
+    province: string;
+    city: string;
+    district: string;
+    detail: string;
+    coords: number[];
+}