db/versions/11290-blackOrchid/00-firstScript.sql

@@ -1,6 +1,3 @@
-
+ALTER TABLE `vn`.`operator`
-ALTER TABLE `vn`.`worker`
+ADD COLUMN `machineFk` int(11) DEFAULT NULL,
-ADD COLUMN `motoFk` INT(11) UNSIGNED DEFAULT NULL;
+ADD CONSTRAINT `operator_machine_FK` FOREIGN KEY (`machineFk`) REFERENCES `vn`.`machine` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
-
-ALTER TABLE `vn`.`worker`
-ADD CONSTRAINT `worker_machineFk` FOREIGN KEY (`motoFk`) REFERENCES `machine` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;

modules/worker/back/models/operator.json

@@ -30,6 +30,9 @@
 		"isOnReservationMode": {
 			"type": "boolean",
 			"required": true
+		},
+        "machineFk": {
+            "type": "number"
         }
 	},
 	"relations": {
@@ -53,6 +56,11 @@
 			"model": "ItemPackingType",
 			"foreignKey": "itemPackingTypeFk",
 			"primaryKey": "code"
+		},
+        "machine": {
+            "type": "belongsTo",
+            "model": "Machine",
+            "foreignKey": "machineFk"
         }
 	}
 }