Merge pull request 'feat/new_wifi_tables' (#11 ) from feat/new_wifi_tables into main

Reviewed-on: #11
add wifilocation flags
2025-01-06 21:51:48 +01:00 · 2025-01-06 21:47:13 +01:00 · 2025-01-06 20:11:19 +01:00 · 2025-01-06 15:47:53 +01:00 · 2025-01-06 14:05:03 +01:00
16 changed files with 391 additions and 226 deletions
--- a/server/.env.template
+++ b/server/.env.template
@ -7,7 +7,4 @@ DB_PORT=""
 WEBHOOK_TOKEN="" #Token that is placed a the TTN Webhook auth
 WIGLE_TOKEN="" # Go to account and generate token "Encoded for use"
 WIGLE_BASE_URL="https://api.wigle.net"
-WIGLE_NETWORK_SEARCH="/api/v2/network/search"
-GET_LOCATION_WIFI_MAX_AGE=1209600000 # 14 days in milliseconds (14 * 24 * 60 * 60 * 1000)
-GET_LOCATION_WIFI_MAX=10000          
-GET_LOCATION_WIFI_PRIMITIVE=true  
+WIGLE_NETWORK_SEARCH="/api/v2/network/search"
--- a/server/package-lock.json
+++ b/server/package-lock.json
@ -7,14 +7,13 @@
    "": {
      "name": "locationhub",
      "version": "1.0.0",
-      "license": "ISC",
+      "license": "MIT",
      "dependencies": {
        "cors": "^2.8.5",
        "dotenv": "^16.4.7",
        "express": "^4.21.2",
        "http-status-codes": "^2.3.0",
        "mariadb": "^3.4.0",
-        "memoizee": "^0.4.17",
        "reflect-metadata": "^0.2.2",
        "sequelize": "^6.37.5",
        "swagger-jsdoc": "^6.2.8",
@ -24,7 +23,6 @@
      },
      "devDependencies": {
        "@types/express": "^5.0.0",
-        "@types/memoizee": "^0.4.11",
        "@types/node": "^22.10.2",
        "nodemon": "^3.1.9",
        "ts-node": "^10.9.2",
@ -232,13 +230,6 @@
      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
      "license": "MIT"
    },
-    "node_modules/@types/memoizee": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@types/memoizee/-/memoizee-0.4.11.tgz",
-      "integrity": "sha512-2gyorIBZu8GoDr9pYjROkxWWcFtHCquF7TVbN2I+/OvgZhnIGQS0vX5KJz4lXNKb8XOSfxFOSG5OLru1ESqLUg==",
-      "dev": true,
-      "license": "MIT"
-    },
    "node_modules/@types/mime": {
      "version": "1.3.5",
      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@ -582,19 +573,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/d": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
-      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
-      "license": "ISC",
-      "dependencies": {
-        "es5-ext": "^0.10.64",
-        "type": "^2.7.2"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
    "node_modules/debug": {
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@ -731,79 +709,12 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/es5-ext": {
-      "version": "0.10.64",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
-      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
-      "hasInstallScript": true,
-      "license": "ISC",
-      "dependencies": {
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.3",
-        "esniff": "^2.0.1",
-        "next-tick": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
-      "license": "MIT",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
-      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
-      "license": "ISC",
-      "dependencies": {
-        "d": "^1.0.2",
-        "ext": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "license": "ISC",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
    "node_modules/escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
      "license": "MIT"
    },
-    "node_modules/esniff": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
-      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
-      "license": "ISC",
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.62",
-        "event-emitter": "^0.3.5",
-        "type": "^2.7.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
    "node_modules/esutils": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@ -822,16 +733,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
-      "license": "MIT",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
    "node_modules/express": {
      "version": "4.21.2",
      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
@ -878,15 +779,6 @@
        "url": "https://opencollective.com/express"
      }
    },
-    "node_modules/ext": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
-      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
-      "license": "ISC",
-      "dependencies": {
-        "type": "^2.7.2"
-      }
-    },
    "node_modules/fill-range": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@ -1192,12 +1084,6 @@
        "node": ">=0.12.0"
      }
    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "license": "MIT"
-    },
    "node_modules/js-yaml": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@ -1240,15 +1126,6 @@
      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
      "license": "ISC"
    },
-    "node_modules/lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es5-ext": "~0.10.2"
-      }
-    },
    "node_modules/make-error": {
      "version": "1.3.6",
      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@ -1302,25 +1179,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/memoizee": {
-      "version": "0.4.17",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz",
-      "integrity": "sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA==",
-      "license": "ISC",
-      "dependencies": {
-        "d": "^1.0.2",
-        "es5-ext": "^0.10.64",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
    "node_modules/merge-descriptors": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
@ -1420,12 +1278,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-      "license": "ISC"
-    },
    "node_modules/nodemon": {
      "version": "3.1.9",
      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz",
@ -2021,19 +1873,6 @@
        "express": ">=4.0.0 || >=5.0.0-beta"
      }
    },
-    "node_modules/timers-ext": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz",
-      "integrity": "sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww==",
-      "license": "ISC",
-      "dependencies": {
-        "es5-ext": "^0.10.64",
-        "next-tick": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@ -2134,12 +1973,6 @@
        "node": ">= 6.0.0"
      }
    },
-    "node_modules/type": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
-      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
-      "license": "ISC"
-    },
    "node_modules/type-is": {
      "version": "1.6.18",
      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
--- a/server/package.json
+++ b/server/package.json
@ -10,10 +10,9 @@
  },
  "keywords": [],
  "author": "Hendrik Schutter, Philipp Schweizer",
-  "license": "ISC",
+  "license": "MIT",
  "devDependencies": {
    "@types/express": "^5.0.0",
-    "@types/memoizee": "^0.4.11",
    "@types/node": "^22.10.2",
    "nodemon": "^3.1.9",
    "ts-node": "^10.9.2",
@ -25,7 +24,6 @@
    "express": "^4.21.2",
    "http-status-codes": "^2.3.0",
    "mariadb": "^3.4.0",
-    "memoizee": "^0.4.17",
    "reflect-metadata": "^0.2.2",
    "sequelize": "^6.37.5",
    "swagger-jsdoc": "^6.2.8",
--- a/server/sql/tables.sql
+++ b/server/sql/tables.sql
@ -16,13 +16,30 @@ CREATE TABLE IF NOT EXISTS wifi_scan (
    lp_ttn_end_device_uplinks_id UUID,
    mac VARCHAR(255),
    rssi NUMERIC,
-    latitude DOUBLE NOT NULL,
-    longitude DOUBLE NOT NULL,
    created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    FOREIGN KEY (lp_ttn_end_device_uplinks_id) REFERENCES lp_ttn_end_device_uplinks(lp_ttn_end_device_uplinks_id)
 );

+CREATE TABLE IF NOT EXISTS wifi_location (
+    mac VARCHAR(255) PRIMARY KEY,
+    latitude DOUBLE,
+    longitude DOUBLE,
+    request_limit_exceeded boolean NOT NULL,
+    location_not_resolvable boolean NOT NULL,
+    created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS wifi_location_history (
+    wifi_location_history_id UUID PRIMARY KEY,
+    mac VARCHAR(255),
+    latitude DOUBLE NOT NULL,
+    longitude DOUBLE NOT NULL,
+    created_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at_utc TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+);
+
 CREATE TABLE IF NOT EXISTS ttn_gateway_reception (
    ttn_gateway_reception_id UUID PRIMARY KEY,
    lp_ttn_end_device_uplinks_id UUID,
--- a/server/src/controller/ttnController.ts
+++ b/server/src/controller/ttnController.ts
@ -17,7 +17,6 @@ const ttnGatewayReceptionService = container.resolve(
  TtnGatewayReceptionService
 );
 const wifiScanService = container.resolve(WifiScanService);
-
 const locationService = container.resolve(LocationService);

 const router = express.Router();
@ -61,8 +60,6 @@ router.post(
            rssi: w.rssi,
          })) ?? [];

-      console.log(wifiScans);
-
      const ttnGatewayReceptions = message.uplink_message.rx_metadata.map(
        (g) => ({
          lp_ttn_end_device_uplinks_id,
@ -85,9 +82,8 @@ router.post(

        locationService.createLocationFromTriangulation({
          lp_ttn_end_device_uplinks_id,
-          wifi: wifiResults.map(({ latitude, longitude, rssi }) => ({
-            latitude,
-            longitude,
+          wifi: wifiResults.map(({ mac, rssi }) => ({
+            mac,
            rssi,
          })),
          ttn_gw: gatewayResults.map(({ latitude, longitude, rssi }) => ({
--- a/server/src/middleware/authentificationMiddleware.ts
+++ b/server/src/middleware/authentificationMiddleware.ts
@ -29,8 +29,7 @@ export function authenticateHeader(req: Request, res: Response, next: NextFuncti
            res.status(StatusCodes.UNAUTHORIZED).json({ error: "Authentication failed" });
            return;
        }
-        console.log("Bearer token is correct!");
-
+        //console.log("Bearer token is correct!");
        next();
    } catch (error) {
        res.status(StatusCodes.INTERNAL_SERVER_ERROR)
--- a/server/src/models/wifiLocation.ts
+++ b/server/src/models/wifiLocation.ts
@ -0,0 +1,52 @@
+import { DataTypes, Model } from "sequelize";
+import { sequelize } from "../database/database";
+
+export class WifiLocation extends Model {
+  public mac!: string;
+  public latitude!: number;
+  public longitude!: number;
+  public request_limit_exceeded!: boolean;
+  public location_not_resolvable!: boolean;
+  public created_at_utc!: Date;
+  public updated_at_utc!: Date;
+}
+
+WifiLocation.init(
+  {
+    mac: {
+      type: DataTypes.STRING,
+      primaryKey: true,
+      allowNull: false,
+    },
+    latitude: {
+      type: DataTypes.NUMBER,
+    },
+    longitude: {
+      type: DataTypes.NUMBER,
+    },
+    request_limit_exceeded: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false,
+    },
+    location_not_resolvable: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false,
+    },
+    created_at_utc: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+    updated_at_utc: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+  },
+  {
+    sequelize,
+    modelName: "WifiLocation",
+    tableName: "wifi_location",
+    timestamps: false,
+  }
+);
--- a/server/src/models/wifiLocationHistory.ts
+++ b/server/src/models/wifiLocationHistory.ts
@ -0,0 +1,50 @@
+import { DataTypes, Model } from "sequelize";
+import { sequelize } from "../database/database";
+
+export class WifiLocationHistory extends Model {
+  public wifi_location_history_id!: string;
+  public mac!: string;
+  public latitude!: number;
+  public longitude!: number;
+  public created_at_utc!: Date;
+  public updated_at_utc!: Date;
+}
+
+WifiLocationHistory.init(
+  {
+    wifi_location_history_id: {
+      type: DataTypes.UUID,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true,
+      allowNull: false,
+    },
+    mac: {
+      type: DataTypes.STRING,
+      allowNull: false,
+    },
+    latitude: {
+      type: DataTypes.NUMBER,
+      allowNull: false,
+    },
+    longitude: {
+      type: DataTypes.NUMBER,
+      allowNull: false,
+    },
+    created_at_utc: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+    updated_at_utc: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+  },
+  {
+    sequelize,
+    modelName: "WifiLocationHistory",
+    tableName: "wifi_location_history",
+    timestamps: false,
+  }
+);
--- a/server/src/models/wifiScan.ts
+++ b/server/src/models/wifiScan.ts
@ -6,8 +6,6 @@ export class WifiScan extends Model {
  public wifi_scan_id!: string;
  public mac!: string;
  public rssi!: number;
-  public latitude!: number;
-  public longitude!: number;
  public created_at_utc!: Date;
  public updated_at_utc!: Date;
 }
@ -32,14 +30,6 @@ WifiScan.init(
      type: DataTypes.NUMBER,
      allowNull: false,
    },
-    latitude: {
-      type: DataTypes.NUMBER,
-      allowNull: false,
-    },
-    longitude: {
-      type: DataTypes.NUMBER,
-      allowNull: false,
-    },
    created_at_utc: {
      type: DataTypes.DATE,
      defaultValue: DataTypes.NOW,
--- a/server/src/proxy/wigle.ts
+++ b/server/src/proxy/wigle.ts
@ -1,4 +1,7 @@
-import memoizee from "memoizee";
+interface WigleApiResonse {
+  response?: WifiLocationResponse,
+  status_code: number,
+}

 interface WifiLocationResponse {
  success: boolean;
@ -43,7 +46,7 @@ interface Result {

 export const getLocationForWifi = async (
  mac: string
-): Promise<WifiLocationResponse | undefined> => {
+): Promise<WigleApiResonse | undefined> => {
  try {
    const url = `${process.env.WIGLE_BASE_URL!}${process.env
      .WIGLE_NETWORK_SEARCH!}?netid=${encodeURIComponent(mac)}`;
@ -57,17 +60,12 @@ export const getLocationForWifi = async (
    });

    if (response.ok) {
-      return await response.json();
+      return { status_code: response.status, response: await response.json() };
    }
    console.log(response.status);
-    return undefined;
+    return { status_code: response.status };
  } catch (error) {
    console.error("Error during call of API wigle.net:", error);
+    return undefined;
  }
 };
-
-export const getLocationForWifiMemoized = memoizee(getLocationForWifi, {
-  maxAge: Number(process.env.GET_LOCATION_WIFI_MAX_AGE),
-  max: Number(process.env.GET_LOCATION_WIFI_MAX),
-  primitive: process.env.GET_LOCATION_WIFI_PRIMITIVE === "true",
-});
--- a/server/src/repositories/wifiLocationHistoryRepository.ts
+++ b/server/src/repositories/wifiLocationHistoryRepository.ts
@ -0,0 +1,43 @@
+import { Attributes, FindOptions } from "sequelize";
+import { injectable } from "tsyringe";
+import { WifiLocationHistory } from "../models/wifiLocationHistory";
+
+@injectable()
+export class WifiLocationHistoryRepository {
+  public async findAll() {
+    return await WifiLocationHistory.findAll();
+  }
+
+  public async findOne(options?: FindOptions<Attributes<WifiLocationHistory>>) {
+    return await WifiLocationHistory.findOne(options);
+  }
+
+  public async findById(id: string) {
+    return await WifiLocationHistory.findByPk(id);
+  }
+
+  public async create(data: Partial<WifiLocationHistory>) {
+    return await WifiLocationHistory.create(data);
+  }
+
+  public async createMany(data: Partial<WifiLocationHistory>[]) {
+    return await WifiLocationHistory.bulkCreate(data);
+  }
+
+  public async update(id: string, data: Partial<WifiLocationHistory>) {
+    const wifiScan = await this.findById(id);
+    if (wifiScan) {
+      return await wifiScan.update(data);
+    }
+    return null;
+  }
+
+  public async delete(id: string) {
+    const wifiScan = await this.findById(id);
+    if (wifiScan) {
+      await wifiScan.destroy();
+      return true;
+    }
+    return false;
+  }
+}
--- a/server/src/repositories/wifiLocationRepository.ts
+++ b/server/src/repositories/wifiLocationRepository.ts
@ -0,0 +1,39 @@
+import { Attributes, FindOptions } from "sequelize";
+import { injectable } from "tsyringe";
+import { WifiLocation } from "../models/wifiLocation";
+
+@injectable()
+export class WifiLocationRepository {
+  public async findAll(options?: FindOptions<Attributes<WifiLocation>>) {
+    return await WifiLocation.findAll(options);
+  }
+
+  public async findById(id: string) {
+    return await WifiLocation.findByPk(id);
+  }
+
+  public async create(data: Partial<WifiLocation>) {
+    return await WifiLocation.create(data);
+  }
+
+  public async createMany(data: Partial<WifiLocation>[]) {
+    return await WifiLocation.bulkCreate(data);
+  }
+
+  public async update(id: string, data: Partial<WifiLocation>) {
+    const wifiScan = await this.findById(id);
+    if (wifiScan) {
+      return await wifiScan.update(data);
+    }
+    return null;
+  }
+
+  public async delete(id: string) {
+    const wifiScan = await this.findById(id);
+    if (wifiScan) {
+      await wifiScan.destroy();
+      return true;
+    }
+    return false;
+  }
+}
--- a/server/src/services/locationService.ts
+++ b/server/src/services/locationService.ts
@ -1,6 +1,7 @@
 import { inject, injectable } from "tsyringe";
 import { Location } from "../models/location";
 import { LocationRepository } from "../repositories/locationRepository";
+import { WifiLocationService } from "./wifiLocationService";

 interface CreateLocationParams {
  lp_ttn_end_device_uplinks_id: string;
@ -11,7 +12,10 @@ interface CreateLocationParams {

 interface CreateLocationTriangulationParams {
  lp_ttn_end_device_uplinks_id: string;
-  wifi: LocationSignal[];
+  wifi: {
+    mac: string;
+    rssi: number;
+  }[];
  ttn_gw: LocationSignal[];
  gnss?: Coordinates;
 }
@ -39,8 +43,10 @@ interface UpdateTtnGatewayReceptionParams {
 export class LocationService {
  constructor(
    @inject(LocationRepository)
-    private repository: LocationRepository
-  ) {}
+    private repository: LocationRepository,
+    @inject(WifiLocationService)
+    private wifiLocationService: WifiLocationService
+  ) { }

  public async getAllLocations() {
    return this.repository.findAll();
@ -65,7 +71,9 @@ export class LocationService {
  public async createLocationFromTriangulation(
    data: CreateLocationTriangulationParams
  ) {
-    const wifi_location = this.calculateVirtualLocation(data.wifi);
+    const wifi_location = this.calculateVirtualLocation(
+      await this.enrichWifiObjectWithLocation(data.wifi)
+    );
    const gateway_location = this.calculateVirtualLocation(data.ttn_gw);

    return this.createLocation({
@ -84,6 +92,29 @@ export class LocationService {
    return this.repository.delete(id);
  }

+  private async enrichWifiObjectWithLocation(
+    wifis: CreateLocationTriangulationParams["wifi"]
+  ) {
+    const enrichedWifi = await Promise.all(
+      wifis.map(async (wifi) => {
+        const location = await this.wifiLocationService.getWifiLocationByMac(
+          wifi.mac
+        );
+
+        return location?.latitude !== undefined &&
+          location.longitude !== undefined
+          ? {
+            rssi: wifi.rssi,
+            latitude: location.latitude,
+            longitude: location.longitude,
+          }
+          : null;
+      })
+    );
+
+    return enrichedWifi.filter((wifi) => wifi !== null);
+  }
+
  private calculateVirtualLocation(locations: LocationSignal[]) {
    if (locations.length === 0) return undefined;

--- a/server/src/services/wifiLocationHistoryService.ts
+++ b/server/src/services/wifiLocationHistoryService.ts
@ -0,0 +1,57 @@
+import { inject, injectable } from "tsyringe";
+import { WifiLocationHistoryRepository } from "../repositories/wifiLocationHistoryRepository";
+
+interface CreateWifiLocationHistoryParams {
+  mac: string;
+  latitude: number;
+  longitude: number;
+}
+
+interface UpdateWifiLocationHistoryParams {
+  mac: string;
+  latitude: number;
+  longitude: number;
+}
+
+@injectable()
+export class WifiLocationHistoryService {
+  constructor(
+    @inject(WifiLocationHistoryRepository)
+    private repository: WifiLocationHistoryRepository
+  ) { }
+
+  public async getAllWifiLocationHistories() {
+    return this.repository.findAll();
+  }
+
+  public async getWifiLocationHistoryById(id: string) {
+    return this.repository.findById(id);
+  }
+
+  public async createWifiLocationHistory(
+    data: CreateWifiLocationHistoryParams
+  ) {
+    const existingEntry = await this.repository.findOne({
+      where: {
+        mac: data.mac,
+      },
+      order: [["updated_at_utc", "DESC"]],
+    });
+
+    if (!existingEntry || existingEntry.latitude !== data.latitude || existingEntry.longitude !== data.longitude) {
+      return await this.repository.create(data);
+    }
+
+    return existingEntry;
+  }
+
+  public async updateWifiLocationHistory(
+    data: UpdateWifiLocationHistoryParams
+  ) {
+    return this.repository.update(data.mac, data);
+  }
+
+  public async deleteWifiLocationHistory(id: string) {
+    return this.repository.delete(id);
+  }
+}
--- a/server/src/services/wifiLocationService.ts
+++ b/server/src/services/wifiLocationService.ts
@ -0,0 +1,80 @@
+import { Op } from "sequelize";
+import { inject, injectable } from "tsyringe";
+import { getLocationForWifi } from "../proxy/wigle";
+import { WifiLocationRepository } from "../repositories/wifiLocationRepository";
+import { WifiLocationHistoryService } from "./wifiLocationHistoryService";
+import { StatusCodes } from "http-status-codes";
+
+interface UpdateWifiLocationParams {
+  mac: string;
+  latitude: number;
+  longitude: number;
+}
+
+@injectable()
+export class WifiLocationService {
+  constructor(
+    @inject(WifiLocationRepository) private repository: WifiLocationRepository,
+    @inject(WifiLocationHistoryService)
+    private wifiLocationHistory: WifiLocationHistoryService
+  ) { }
+
+  public async getAllWifiLocations() {
+    return this.repository.findAll();
+  }
+
+  public async getAllWifiLocationsByAddresses(macAddresses: string[]) {
+    return this.repository.findAll({
+      where: { mac: { [Op.in]: macAddresses } },
+    });
+  }
+
+  public async getWifiLocationByMac(mac: string) {
+    let wifiLocation = await this.repository.findById(mac);
+
+    if (wifiLocation) return wifiLocation;
+
+    const apiResponse = await getLocationForWifi(mac);
+
+    if (apiResponse == undefined) {
+      await this.repository.create({
+        mac,
+      });
+      return undefined;
+    }
+
+    if (apiResponse.response == undefined) {
+      const request_limit_exceeded = apiResponse.status_code === StatusCodes.TOO_MANY_REQUESTS;
+      await this.repository.create({
+        mac,
+        request_limit_exceeded,
+      });
+      return undefined;
+    }
+
+    if (apiResponse.response.totalResults == 0) {
+      await this.repository.create({ mac, location_not_resolvable: true });
+      return undefined;
+    }
+
+    wifiLocation = await this.repository.create({
+      mac,
+      latitude: apiResponse.response.results[0].trilat,
+      longitude: apiResponse.response.results[0].trilong,
+    });
+
+    await this.wifiLocationHistory.createWifiLocationHistory(
+      wifiLocation.dataValues
+    );
+
+    return wifiLocation;
+  }
+
+  public async updateWifiLocation(data: UpdateWifiLocationParams) {
+    return this.repository.update(data.mac, data);
+  }
+
+  public async deleteWifiLocation(id: string) {
+    return this.repository.delete(id);
+  }
+}
--- a/server/src/services/wifiScanService.ts
+++ b/server/src/services/wifiScanService.ts
@ -1,5 +1,4 @@
 import { inject, injectable } from "tsyringe";
-import { getLocationForWifiMemoized } from "../proxy/wigle";
 import { WifiScanRepository } from "../repositories/wifiScanRepository";

 interface CreateWifiScanParams {
@ -12,8 +11,6 @@ interface UpdateWifiScanParams {
  wifi_scan_id: string;
  mac?: string;
  rssi?: number;
-  latitude?: number;
-  longitude?: number;
 }

@injectable()
@ -31,23 +28,11 @@ export class WifiScanService {
  }

  public async createWifiScan(data: CreateWifiScanParams) {
-    const apiResponse = await getLocationForWifiMemoized(data.mac);
-
-    if (apiResponse !== undefined && apiResponse.results.length > 0)
-      return this.repository.create({
-        ...data,
-        latitude: apiResponse.results[0].trilat,
-        longitude: apiResponse.results[0].trilong,
-      });
+      return this.repository.create(data);
  }

  public async createWifiScans(data: CreateWifiScanParams[]) {
-    let wifiScans = await Promise.all(
-      data.map(async (wifi) => {
-        return await this.createWifiScan(wifi);
-      })
-    );
-    return wifiScans.filter((wifi) => wifi !== undefined);
+    return await this.repository.createMany(data);
  }

  public async updateWifiScan(data: UpdateWifiScanParams) {
Author	SHA256	Message	Date
Hendrik Schutter	5a5dcb6334	Merge pull request 'feat/new_wifi_tables' (#11 ) from feat/new_wifi_tables into main Reviewed-on: #11	2025-01-06 21:51:48 +01:00
localhorst	df9c84e9df	add wifilocation flags	2025-01-06 21:47:13 +01:00
localhorst	f6db27a225	Merge branch 'main' into feat/new_wifi_tables	2025-01-06 20:11:19 +01:00
Philipp Schweizer	e43cb76e4d	feat: impl. use of new tables	2025-01-06 15:47:53 +01:00
Philipp Schweizer	c2e0fe94a4	feat: db tables and repo and service written	2025-01-06 14:05:03 +01:00