plug updated

Author: Robin Buschmann

app.ts

@@ -128,6 +128,8 @@ http.createServer(app).listen(
 );
 
 
+// FOR INITIAL DATA IMPORT
+// ----------------------------------------------
 import {Injector} from 'di-ts';
 import {SoapService} from "./services/SoapService";
 import {DataImporter} from "./services/DataImporter";

migrations/20160921160113-alter-table-plug-add-category.ts

@@ -0,0 +1,28 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function(db) {
+
+  return db.runSql(`
+    ALTER TABLE Plug ADD category ENUM('Other', 'Type1', 'Type2', 'CCS_CHAdeMO') NOT NULL;
+  `);
+};
+
+exports.down = function(db) {
+  return db.runSql(`
+    ALTER TABLE Plug DROP COLUMN category;
+  `);
+};

migrations/20160922063902-update-plug.ts

@@ -0,0 +1,51 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function(db) {
+
+  return db.runSql(`
+    UPDATE Plug 
+    SET category = 'Type1' 
+    WHERE \`option\` IN 
+    (
+    'Type 1 Connector (Cable Attached)'
+    );
+    
+    UPDATE Plug 
+    SET category = 'Type2' 
+    WHERE \`option\` IN 
+    (
+    'Type 2 Outlet',
+    'Type 2 Connector (Cable Attached)'
+    );
+    
+    UPDATE Plug 
+    SET category = 'CCS_CHAdeMO' 
+    WHERE \`option\` IN 
+    (
+    'CHAdeMO',
+    'CCS Combo 2 Plug (Cable Attached)',
+    'CCS Combo 1 Plug (Cable Attached)'
+    );
+  `);
+};
+
+exports.down = function(db) {
+  return db.runSql(`
+      UPDATE Plug 
+      SET category = 'Other';
+  `);
+};

migrations/20160922081147-alter-table-plug-add-label.ts

@@ -0,0 +1,28 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function(db) {
+
+  return db.runSql(`
+    ALTER TABLE Plug ADD label VARCHAR(255) DEFAULT NULL;
+  `);
+};
+
+exports.down = function(db) {
+  return db.runSql(`
+    ALTER TABLE Plug DROP COLUMN label;
+  `);
+};

migrations/20160922081200-update-plug.ts

@@ -0,0 +1,43 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+exports.up = function(db) {
+
+  return db.runSql(`
+    UPDATE Plug 
+    SET label = 'Type 1' 
+    WHERE \`option\` = 'Type 1 Connector (Cable Attached)';
+    
+    UPDATE Plug 
+    SET label = 'Type 2 Cable' 
+    WHERE \`option\` = 'Type 2 Connector (Cable Attached)';
+    
+    UPDATE Plug 
+    SET label = 'CCS 1' 
+    WHERE \`option\` = 'CCS Combo 2 Plug (Cable Attached)';
+    
+    UPDATE Plug 
+    SET label = 'CCS 2' 
+    WHERE \`option\` = 'CCS Combo 1 Plug (Cable Attached)';
+  `);
+};
+
+exports.down = function(db) {
+  return db.runSql(`
+    UPDATE Plug 
+      SET label = NULL;
+  `);
+};

models/LocationCluster.ts

@@ -42,6 +42,9 @@ export class LocationCluster extends Model<LocationCluster> implements ILocation
   @Column({
     type: DataType.VIRTUAL,
     get() {
+      
+      // TODO Hier gehört nicht alles hin ;)
+      
       const chargingLocations = this.getDataValue('chargingLocations');
       const groupCount = chargingLocations.length;
       let evses;

models/Plug.ts

@@ -18,6 +18,12 @@ export class Plug extends Model<Plug> {
   @Column
   option: string;
 
+  @Column
+  category: string;
+
+  @Column
+  label: string;
+
   @BelongsToMany(() => EVSE, () => EVSEPlug)
   evses;