exchanging address relationship with employee

Lissone · May 15, 2021 · 3446109 · 3446109
1 parent dfe6df7
commit 3446109
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 71 deletions.
diff --git a/src/entities/IAddress.ts b/src/entities/IAddress.ts
@@ -6,7 +6,8 @@ export interface IAddress {
   district: string
   city: string
   state: string
+  employeeCpf: string
   createdAt: Date
   updatedAt: Date
-  employee?: IEmployee
+  employee: IEmployee
 }
diff --git a/src/entities/IEmployee.ts b/src/entities/IEmployee.ts
@@ -15,7 +15,6 @@ export interface IEmployee {
   role: string
   access: number
   companyCnpj?: string
-  addressId?: number
   createdAt: Date
   updatedAt: Date
   company?: ICompany

diff --git a/src/external/database/entities/AddressEntity.ts b/src/external/database/entities/AddressEntity.ts
@@ -26,6 +26,11 @@ export const AddressEntity = new EntitySchema<IAddress>({
       type: String,
       nullable: false
     },
+    employeeCpf: {
+      name: 'employee_cpf',
+      type: String,
+      nullable: false
+    },
     createdAt: {
       name: 'created_at',
       type: 'datetime2',
@@ -40,9 +45,11 @@ export const AddressEntity = new EntitySchema<IAddress>({
   relations: {
     employee: {
       type: 'one-to-one',
+      joinColumn: ({
+        name: 'employee_cpf'
+      }),
       target: 'employee',
-      inverseSide: 'address',
-      nullable: true
+      nullable: false
     }
   }
 })
diff --git a/src/external/database/entities/EmployeeEntity.ts b/src/external/database/entities/EmployeeEntity.ts
@@ -54,11 +54,6 @@ export const EmployeeEntity = new EntitySchema<IEmployee>({
       type: String,
       nullable: true,
     },
-    addressId: {
-      name: 'address_id',
-      type: Number,
-      nullable: true,
-    },
     createdAt: {
       name: 'created_at',
       type: 'datetime2',
@@ -81,10 +76,8 @@ export const EmployeeEntity = new EntitySchema<IEmployee>({
     },
     address: {
       type: 'one-to-one',
-      joinColumn: ({
-        name: 'address_id'
-      }),
       target: 'address',
+      inverseSide: 'employee',
       nullable: true
     },
     absences: {

diff --git a/src/swagger.json b/src/swagger.json
@@ -117,52 +117,21 @@
 						"schema": {
 							"type": "object",
 							"properties": {
-								"street": {
-									"type": "string"
-								},
-								"district": {
-									"type": "string"
-								},
-								"city": {
-									"type": "string"
-								},
-								"state": {
-									"type": "string"
-								}
-							}
+                "cnpj": {
+                  "type": "string"
+                },
+                "name": {
+                  "type": "string"
+                }
+              }
 						}
 					}
 				],
 				"responses": {
 					"201": {
 						"description": "Created",
 						"schema": {
-							"type": "object",
-							"properties": {
-								"id": {
-									"type": "integer"
-								},
-								"street": {
-									"type": "string"
-								},
-								"district": {
-									"type": "string"
-								},
-								"city": {
-									"type": "string"
-								},
-								"state": {
-									"type": "string"
-								},
-								"createdAt": {
-									"type": "date-time",
-									"example": "2021-01-30T08:30:00Z"
-								},
-								"updatedAt": {
-									"type": "date-time",
-									"example": "2021-01-30T08:30:00Z"
-								}
-							}
+							"$ref": "#/definitions/Company"
 						}
 					},
 					"500": {
@@ -263,6 +232,9 @@
                 },
                 "state": {
                   "type": "string"
+                },
+                "employeeCpf": {
+                  "type": "string"
                 }
               }
 						}
@@ -397,9 +369,6 @@
 								},
 								"companyCpf": {
 									"type": "string"
-								},
-								"addressId": {
-									"type": "integer"
 								}
 							}
 						}
@@ -482,9 +451,6 @@
 								"companyCpf": {
 									"type": "string"
 								},
-								"addressId": {
-									"type": "integer"
-								},
 								"createdAt": {
 									"type": "date-time",
 									"example": "2021-01-30T08:30:00Z"
@@ -883,9 +849,6 @@
         "companyCpf": {
 					"type": "string"
 				},
-        "addressId": {
-					"type": "integer"
-				},
         "createdAt": {
           "type": "date-time",
           "example": "2021-01-30T08:30:00Z"
@@ -927,6 +890,9 @@
 				"city": {
 					"type": "string"
 				},
+        "employeeCpf": {
+					"type": "string"
+				},
         "state": {
 					"type": "string"
 				},
@@ -947,19 +913,10 @@
     "Company": {
 			"type": "object",
 			"properties": {
-				"id": {
-					"type": "integer"
-				},
-				"street": {
-					"type": "string"
-				},
-				"district": {
-					"type": "string"
-				},
-				"city": {
+				"cnpj": {
 					"type": "string"
 				},
-				"state": {
+				"name": {
 					"type": "string"
 				},
         "createdAt": {