diff --git a/bls-register-backend/dist/index.js b/bls-register-backend/dist/index.js index 1ed12db..c2222ac 100644 --- a/bls-register-backend/dist/index.js +++ b/bls-register-backend/dist/index.js @@ -120,6 +120,7 @@ const registerColumns = [ const roomStatusColumns = [ "hotel_id", "room_id", + "ip", "app_version", "launcher_version", "config_version", @@ -208,13 +209,15 @@ class DatabaseManager { $3::text[], $4::text[], $5::text[], - $6::int8[], - $7::int8[] + $6::text[], + $7::int8[], + $8::int8[] ) AS u(${roomStatusColumns.join(", ")}) ), dedup AS ( SELECT DISTINCT ON (hotel_id, room_id) hotel_id, room_id, + ip, app_version, launcher_version, config_version, @@ -233,6 +236,7 @@ class DatabaseManager { hotel_id, room_id, device_id, + ip, app_version, launcher_version, config_version, @@ -243,6 +247,7 @@ class DatabaseManager { hotel_id, room_id, device_id, + ip, app_version, launcher_version, config_version, @@ -251,6 +256,7 @@ class DatabaseManager { FROM existing ON CONFLICT (hotel_id, room_id) DO UPDATE SET + ip = EXCLUDED.ip, app_version = EXCLUDED.app_version, launcher_version = EXCLUDED.launcher_version, config_version = EXCLUDED.config_version, @@ -728,6 +734,7 @@ const buildRowsFromPayload = (rawPayload) => { const roomStatusUpdateRow = { hotel_id: hotelId, room_id: roomId, + ip: registerRow.ip, app_version: registerRow.app_version, launcher_version: registerRow.launcher_version, config_version: registerRow.config_version, diff --git a/bls-register-backend/src/db/databaseManager.js b/bls-register-backend/src/db/databaseManager.js index 16f4690..22e2c4f 100644 --- a/bls-register-backend/src/db/databaseManager.js +++ b/bls-register-backend/src/db/databaseManager.js @@ -43,6 +43,7 @@ const registerColumns = [ const roomStatusColumns = [ 'hotel_id', 'room_id', + 'ip', 'app_version', 'launcher_version', 'config_version', @@ -137,13 +138,15 @@ export class DatabaseManager { $3::text[], $4::text[], $5::text[], - $6::int8[], - $7::int8[] + $6::text[], + $7::int8[], + $8::int8[] ) AS u(${roomStatusColumns.join(', ')}) ), dedup AS ( SELECT DISTINCT ON (hotel_id, room_id) hotel_id, room_id, + ip, app_version, launcher_version, config_version, @@ -162,6 +165,7 @@ export class DatabaseManager { hotel_id, room_id, device_id, + ip, app_version, launcher_version, config_version, @@ -172,6 +176,7 @@ export class DatabaseManager { hotel_id, room_id, device_id, + ip, app_version, launcher_version, config_version, @@ -180,6 +185,7 @@ export class DatabaseManager { FROM existing ON CONFLICT (hotel_id, room_id) DO UPDATE SET + ip = EXCLUDED.ip, app_version = EXCLUDED.app_version, launcher_version = EXCLUDED.launcher_version, config_version = EXCLUDED.config_version, diff --git a/bls-register-backend/src/processor/index.js b/bls-register-backend/src/processor/index.js index 646cda8..db6c4a9 100644 --- a/bls-register-backend/src/processor/index.js +++ b/bls-register-backend/src/processor/index.js @@ -213,6 +213,7 @@ export const buildRowsFromPayload = (rawPayload) => { const roomStatusUpdateRow = { hotel_id: hotelId, room_id: roomId, + ip: registerRow.ip, app_version: registerRow.app_version, launcher_version: registerRow.launcher_version, config_version: registerRow.config_version, diff --git a/bls-register-backend/tests/processor.test.js b/bls-register-backend/tests/processor.test.js index 0063e4c..1bac054 100644 --- a/bls-register-backend/tests/processor.test.js +++ b/bls-register-backend/tests/processor.test.js @@ -8,6 +8,7 @@ describe('Register Processor', () => { hotel_id: 1085, room_id: '8888', device_id: '091123987456', + ip: '10.1.2.3:5678', is_send: 0, app_version: '2.1.0', launcher_version: '1.0.0', @@ -24,6 +25,7 @@ describe('Register Processor', () => { expect(rows.registerRows[0].room_id).toBe('8888'); expect(rows.registerRows[0].device_id).toBe('091123987456'); + expect(rows.roomStatusRows[0].ip).toBe('10.1.2.3:5678'); expect(rows.roomStatusRows[0].register_ts_ms).toBe(1770000235000); expect(rows.roomStatusRows[0].upgrade_ts_ms).toBe(1770001235000); });