removed: relations between models

wdes · Jul 8, 2019 · 303c57b · 303c57b
1 parent f904fb8
commit 303c57b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 38 deletions.
diff --git a/db/models/monitoring__servers.ts b/db/models/monitoring__servers.ts
@@ -1,9 +1,7 @@
 'use strict';
 
-import { Model, DataTypes, Association, BuildOptions } from 'sequelize';
+import { Model, DataTypes, BuildOptions } from 'sequelize';
 import Sequelize from '@static/sequelize';
-import { MonitoringTimeModel } from '@models/monitoring__times';
-import { MonitoringStatusCodeModel } from '@models/monitoring__status-codes';
 
 export class MonitoringServerModel extends Model {
     public id!: number;
@@ -12,10 +10,7 @@ export class MonitoringServerModel extends Model {
     public monitoringInterval!: string;
     public disabled!: boolean;
 
-    public static associations: {
-        statusCodes: Association<MonitoringServerModel, MonitoringStatusCodeModel>;
-        times: Association<MonitoringServerModel, MonitoringTimeModel>;
-    };
+    public static associations: {};
 }
 
 export type MonitoringServerStatic = typeof Model & {
@@ -54,15 +49,4 @@ const MonitoringServer = <MonitoringServerStatic>Sequelize.sequelize.define(
     }
 );
 
-/*MonitoringTime.hasMany(MonitoringStatusCodeModel, {
-    foreignKey: 'id',
-    sourceKey: 'idServer',
-    as: 'statusCodes',
-});
-MonitoringTime.hasMany(MonitoringTimeModel, {
-    foreignKey: 'id',
-    sourceKey: 'idServer',
-    as: 'times',
-});*/
-
 export default MonitoringServer;
diff --git a/db/models/monitoring__status-codes.ts b/db/models/monitoring__status-codes.ts
@@ -1,17 +1,14 @@
 'use strict';
 
-import { Model, DataTypes, Association, BuildOptions } from 'sequelize';
+import { Model, DataTypes, BuildOptions } from 'sequelize';
 import Sequelize from '@static/sequelize';
-import { MonitoringServerModel } from '@models/monitoring__servers';
 
 export class MonitoringStatusCodeModel extends Model {
     public idServer!: number;
     public time!: Date;
     public statusCode!: number;
 
-    public static associations: {
-        server: Association<MonitoringStatusCodeModel, MonitoringServerModel>;
-    };
+    public static associations: {};
 }
 
 export type MonitoringStatusCodeStatic = typeof Model & {
@@ -43,11 +40,7 @@ const MonitoringStatusCode = <MonitoringStatusCodeStatic>Sequelize.sequelize.def
         freezeTableName: true,
     }
 );
-MonitoringStatusCode.belongsTo(MonitoringServerModel, {
-    foreignKey: 'idServer',
-    targetKey: 'id',
-    as: 'server',
-});
+
 MonitoringStatusCode.removeAttribute('id');
 
 export default MonitoringStatusCode;
diff --git a/db/models/monitoring__times.ts b/db/models/monitoring__times.ts
@@ -1,17 +1,14 @@
 'use strict';
 
-import { Model, DataTypes, Association, BuildOptions } from 'sequelize';
+import { Model, DataTypes, BuildOptions } from 'sequelize';
 import Sequelize from '@static/sequelize';
-import MonitoringServer from '@models/monitoring__servers';
 
 export class MonitoringTimeModel extends Model {
     public idServer!: number;
     public time!: Date;
     public totalTime!: number;
 
-    public static associations: {
-        //server: Association<MonitoringTime, MonitoringServer>;
-    };
+    public static associations: {};
 }
 
 export type MonitoringTimeStatic = typeof Model & {
@@ -43,11 +40,7 @@ const MonitoringTime = <MonitoringTimeStatic>Sequelize.sequelize.define(
         freezeTableName: true,
     }
 );
-MonitoringTime.hasOne(MonitoringServer, {
-    sourceKey: 'idServer',
-    foreignKey: 'id',
-    as: 'server',
-});
+
 MonitoringTime.removeAttribute('id');
 
 export default MonitoringTime;