rework data models drop model.id where not required [ reduce total space required by 26.5% ]

database/migrations/20240202100000 - all:id.js

@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = {
+    up: (queryInterface, Sequelize) => {
+        return Promise.all([
+            queryInterface.removeColumn('incidents', 'id'),
+            queryInterface.removeColumn('markers', 'id'),
+            queryInterface.removeColumn('properties', 'id'),
+            queryInterface.removeColumn('timelines', 'id'),
+            queryInterface.removeColumn('transactions', 'id'),
+        ]);
+    },
+
+    down: (queryInterface, Sequelize) => {
+        const signature = {
+            type: Sequelize.INTEGER,
+            primaryKey: true,
+            autoIncrement: true,
+        };
+
+        Promise.all([
+            queryInterface.addColumn('incidents', 'id', signature),
+            queryInterface.addColumn('markers', 'id', signature),
+            queryInterface.addColumn('properties', 'id', signature),
+            queryInterface.addColumn('timelines', 'id', signature),
+            queryInterface.addColumn('transactions', 'id', signature),
+        ]);
+    }
+};

src/models/incident.ts

@@ -3,7 +3,6 @@ import { DataTypes } from 'sequelize';
 import { coordinateFields } from './utils';
 
 export type IncidentType = {
-    id: number,
     date: string,
     lat: number,
     lng: number,
@@ -15,11 +14,6 @@ export default (sequelize: Sequelize) => {
     const model = sequelize.define(
         'Incident',
         {
-            id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
             date: DataTypes.DATEONLY,
             ...coordinateFields(),
             type: DataTypes.STRING,
@@ -30,6 +24,7 @@ export default (sequelize: Sequelize) => {
             timestamps: false,
         }
     );
+    model.removeAttribute('id');
 
     return model;
 };

src/models/marker.ts

@@ -3,7 +3,6 @@ import { DataTypes } from 'sequelize';
 import { coordinateFields } from './utils';
 
 export type MarkerType = {
-    id: number,
     lat: number,
     lng: number,
     type: string,
@@ -19,11 +18,6 @@ export default (sequelize: Sequelize) => {
     const model = sequelize.define(
         'Marker',
         {
-            id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
             ...coordinateFields(),
             type: DataTypes.STRING,
             label: DataTypes.STRING,
@@ -33,6 +27,7 @@ export default (sequelize: Sequelize) => {
             timestamps: false,
         }
     );
+    model.removeAttribute('id');
 
     return model;
 };

src/models/property.ts

@@ -1,27 +1,21 @@
 import type { Sequelize } from 'sequelize';
 import { DataTypes } from 'sequelize';
 
-import type { GloballyIdentifiedModel, IdentifiedModel } from "../orm.types";
-
 export type PropertyType = {
+    guid: string
     postcode: string,
     propertyType: string,
     propertyForm: string,
     paon: string,
     saon: string,
     street: string,
     city: string,
-} & GloballyIdentifiedModel & IdentifiedModel;
+};
 
 export default (sequelize: Sequelize) => {
     const model = sequelize.define(
         'Property',
         {
-            id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
             guid: {
                 type: DataTypes.STRING,
                 unique: true,
@@ -49,6 +43,7 @@ export default (sequelize: Sequelize) => {
             timestamps: false,
         }
     );
+    model.removeAttribute('id');
 
     return model;
 };

src/models/timeline.ts

@@ -1,24 +1,17 @@
 import type { Sequelize } from 'sequelize';
 import { DataTypes } from 'sequelize';
 
-import type { IdentifiedModel } from "../orm.types";
-
 export type TimelineType = {
     postcode: string,
     date: string,
     avg: number,
     count: number,
-} & IdentifiedModel;
+};
 
 export default (sequelize: Sequelize) => {
     const model = sequelize.define(
         'Timeline',
         {
-            id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
             postcode: {
                 type: DataTypes.STRING(9),
                 primaryKey: true,
@@ -35,6 +28,7 @@ export default (sequelize: Sequelize) => {
             timestamps: false,
         }
     );
+    model.removeAttribute('id');
 
     //@ts-ignore
     model.associate = ({ Postcode, Timeline }) => {

src/models/transaction.ts

@@ -1,11 +1,5 @@
 import type { Sequelize } from 'sequelize';
 import { DataTypes } from 'sequelize';
-import type { GloballyIdentifiedModel, IdentifiedModel } from "../orm.types";
-
-export type TransactionType = {
-    price: number,
-    date: string,
-} & GloballyIdentifiedModel & IdentifiedModel;
 
 // https://www.gov.uk/guidance/about-the-price-paid-data#download-options
 // [
@@ -40,15 +34,16 @@ export type TransactionType = {
                                                 // Note that where a transaction changes category type due to misallocation (as above) it will be deleted from the original category type and added to the correct category with a new transaction unique identifier.
 // ]
 
+export type TransactionType = {
+    guid: string
+    price: number,
+    date: string,
+};
+
 export default (sequelize: Sequelize) => {
     const model = sequelize.define(
         'Transaction',
         {
-            id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
             guid: DataTypes.STRING,
             price: DataTypes.INTEGER,
             date: DataTypes.DATEONLY,
@@ -58,6 +53,7 @@ export default (sequelize: Sequelize) => {
             timestamps: false,
         }
     );
+    model.removeAttribute('id');
 
     //@ts-ignore
     model.associate = ({ Property, Transaction }) => {

src/orm.types.ts

@@ -22,11 +22,3 @@ export type ORM = {
     Incident: ModelStatic<Model<IncidentType>>,
     Marker: ModelStatic<Model<MarkerType>>,
 };
-
-export type IdentifiedModel = {
-    id: number
-}
-
-export type GloballyIdentifiedModel = {
-    guid: string
-}