update procedures

DATA-adjust-procedures

libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 -- Query Pipeline Starts Here
@@ -277,7 +276,10 @@ SELECT
   a.daily_avg_ch2o,a.daily_max_ch2o, a.daily_min_ch2o
 FROM daily_percentages p
 LEFT JOIN daily_averages a 
-  ON p.space_id = a.space_id AND p.event_date = a.event_date
+  ON p.space_id = a.space_id 
+  AND p.event_date = a.event_date
+JOIN params  
+    ON params.event_date = a.event_date
 ORDER BY p.space_id, p.event_date)
 
 

libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 presence_logs AS (
@@ -86,8 +85,7 @@ final_data AS (
     ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
   FROM summed_intervals s
   JOIN params p 
-    ON p.space_id = s.space_id 
+    ON p.event_date = s.event_date
-   AND p.event_date = s.event_date
 )
 
 INSERT INTO public."space-daily-occupancy-duration" (

libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 device_logs AS (
@@ -87,8 +86,7 @@ SELECT summary.space_id,
        count_total_presence_detected
 FROM summary
 JOIN params P ON true
-where summary.space_id = P.space_id
+where (P.event_date IS NULL or summary.event_date::date = P.event_date)
-and (P.event_date IS NULL or summary.event_date::date = P.event_date)
 ORDER BY space_id, event_date)
 
 

src/app.module.ts

@@ -37,6 +37,7 @@ import { VisitorPasswordModule } from './vistor-password/visitor-password.module
 
 import { ThrottlerGuard } from '@nestjs/throttler';
 import { ThrottlerModule } from '@nestjs/throttler/dist/throttler.module';
+import { isArray } from 'class-validator';
 import { winstonLoggerOptions } from '../libs/common/src/logger/services/winston.logger';
 import { AqiModule } from './aqi/aqi.module';
 import { OccupancyModule } from './occupancy/occupancy.module';
@@ -50,7 +51,12 @@ import { WeatherModule } from './weather/weather.module';
       throttlers: [{ ttl: 60000, limit: 30 }],
       generateKey: (context) => {
         const req = context.switchToHttp().getRequest();
-        return req.headers['x-forwarded-for'] || req.ip;
+        console.log('Real IP:', req.headers['x-forwarded-for']);
+        return req.headers['x-forwarded-for']
+          ? isArray(req.headers['x-forwarded-for'])
+            ? req.headers['x-forwarded-for'][0].split(':')[0]
+            : req.headers['x-forwarded-for'].split(':')[0]
+          : req.ip;
       },
     }),
     WinstonModule.forRoot(winstonLoggerOptions),

src/main.ts

@@ -21,18 +21,6 @@ async function bootstrap() {
 
   app.use(new RequestContextMiddleware().use);
 
-  app.use((req, res, next) => {
-    console.log(
-      'Real IP:',
-      req.ip,
-      req.headers['x-forwarded-for'],
-      req.connection.remoteAddress,
-    );
-    next();
-  });
-
-  // app.getHttpAdapter().getInstance().set('trust proxy', 1);
-
   app.use(
     helmet({
       contentSecurityPolicy: false,