fix: spaces structure in communities

* increase DB max connection to 50

libs/common/src/database/database.module.ts

@@ -125,7 +125,7 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 20, // set pool max size
+            max: 50, // set pool max size
             idleTimeoutMillis: 5000, // close idle clients after 5 second
             connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
             maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)

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

@@ -1,4 +1,3 @@
--- 1. Load all presence-related logs
 WITH device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -16,7 +15,7 @@ WITH device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 2. Standard transitions: 'none' → 'motion' or 'presence'
+-- 1. All 'none' → presence or motion
 presence_transitions AS (
     SELECT 
         space_id,
@@ -24,31 +23,10 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
+    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
 ),
 
--- 3. Fallback: days with 'motion' or 'presence' but no 'none'
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        MIN(event_time) AS event_time,
-        'presence'::text AS value
-    FROM device_logs
-    WHERE value IN ('motion', 'presence', 'none')
-    GROUP BY space_id, event_time::date
-    HAVING BOOL_OR(value = 'motion') OR BOOL_OR(value = 'presence')
-       AND NOT BOOL_OR(value = 'none')
-),
-
--- 4. Merge both detection sources
-all_presence_events AS (
-    SELECT * FROM presence_transitions
-    UNION ALL
-    SELECT space_id, event_time, event_date, value FROM fallback_daily_presence
-),
-
--- 5. Cluster events per space_id within 30 seconds
+-- 2. Cluster events per space_id within 30s
 clustered_events AS (
     SELECT 
         space_id,
@@ -62,11 +40,11 @@ clustered_events AS (
                 WHEN event_time - LAG(event_time) OVER (PARTITION BY space_id ORDER BY event_time) > INTERVAL '30 seconds'
                 THEN 1 ELSE 0
             END AS new_cluster_flag
-        FROM all_presence_events
+        FROM presence_transitions
     ) marked
 ),
 
--- 6. Determine dominant type (motion vs presence) per cluster
+-- 3. Determine dominant type (motion vs presence) per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -82,7 +60,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 7. Count clusters by dominant type
+-- 4. Count clusters by dominant type
 summary AS (
     SELECT 
         space_id,
@@ -92,16 +70,15 @@ summary AS (
         COUNT(*) AS count_total_presence_detected
     FROM cluster_type
     GROUP BY space_id, event_date
-),
-
--- 8. Prepare final result
-final_table AS (
-    SELECT *
-    FROM summary
-    ORDER BY space_id, event_date
 )
 
--- 9. Insert or upsert into the destination table
+-- 5. Output
+, final_table as (
+SELECT *
+FROM summary
+ORDER BY space_id, event_date)
+
+
 INSERT INTO public."presence-sensor-daily-space-detection" (
 	space_uuid,
 	event_date,
@@ -120,4 +97,4 @@ ON CONFLICT (space_uuid, event_date) DO UPDATE
 SET
     count_motion_detected = EXCLUDED.count_motion_detected,
     count_presence_detected = EXCLUDED.count_presence_detected,
-    count_total_presence_detected = EXCLUDED.count_total_presence_detected;
+    count_total_presence_detected = EXCLUDED.count_total_presence_detected;

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

@@ -4,7 +4,6 @@ WITH params AS (
       $2::uuid AS space_id
 ),
 
--- 1. Load logs
 device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -22,7 +21,7 @@ device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 2. Transitions from 'none' → motion/presence
+-- 1. All 'none' → presence or motion
 presence_transitions AS (
     SELECT 
         space_id,
@@ -30,30 +29,10 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
+    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
 ),
 
--- 3. Fallback: days with motion/presence but no 'none'
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        MIN(event_time) AS event_time,
-        'presence'::text AS value
-    FROM device_logs
-    GROUP BY space_id, event_time::date
-    HAVING BOOL_OR(value = 'motion') OR BOOL_OR(value = 'presence')
-       AND NOT BOOL_OR(value = 'none')
-),
-
--- 4. Combine standard and fallback detections
-all_presence_events AS (
-    SELECT * FROM presence_transitions
-    UNION ALL
-    SELECT * FROM fallback_daily_presence
-),
-
--- 5. Cluster detections (within 30s)
+-- 2. Cluster events per space_id within 30s
 clustered_events AS (
     SELECT 
         space_id,
@@ -67,11 +46,11 @@ clustered_events AS (
                 WHEN event_time - LAG(event_time) OVER (PARTITION BY space_id ORDER BY event_time) > INTERVAL '30 seconds'
                 THEN 1 ELSE 0
             END AS new_cluster_flag
-        FROM all_presence_events
+        FROM presence_transitions
     ) marked
 ),
 
--- 6. Dominant type per cluster
+-- 3. Determine dominant type (motion vs presence) per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -87,7 +66,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 7. Count presence by type
+-- 4. Count clusters by dominant type
 summary AS (
     SELECT 
         space_id,
@@ -97,22 +76,22 @@ summary AS (
         COUNT(*) AS count_total_presence_detected
     FROM cluster_type
     GROUP BY space_id, event_date
-),
-
--- 8. Filter by params and return final table
-final_table AS (
-    SELECT 
-        summary.space_id,
-        summary.event_date,
-        count_motion_detected,
-        count_presence_detected,
-        count_total_presence_detected
-    FROM summary
-    JOIN params p ON summary.space_id = p.space_id
-    WHERE p.event_date IS NULL OR summary.event_date = p.event_date
 )
 
--- 9. Insert or upsert into the table
+-- 5. Output
+, final_table as (
+SELECT summary.space_id,
+       summary.event_date,
+       count_motion_detected,
+       count_presence_detected,
+       count_total_presence_detected
+FROM summary
+JOIN params P ON true
+where summary.space_id = P.space_id
+and (P.event_date IS NULL or summary.event_date::date = P.event_date)
+ORDER BY space_id, event_date)
+
+
 INSERT INTO public."presence-sensor-daily-space-detection" (
 	space_uuid,
 	event_date,

libs/common/src/sql/queries/fact_hourly_space_presence_detected/fact_hourly_space_presence_detected.sql

@@ -30,19 +30,6 @@ presence_detection AS (
     FROM device_logs
 ),
 
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        0 AS event_hour,
-        COUNT(*) > 0 AS has_presence,
-        BOOL_OR(value = 'none') AS has_none
-    FROM device_logs
-    WHERE value IN ('motion', 'presence', 'none')
-    GROUP BY space_id, event_time::date
-    HAVING COUNT(*) > 0 AND NOT BOOL_OR(value = 'none')
-),
-
 space_level_presence_events AS (
     SELECT DISTINCT 
         pd.space_id,
@@ -51,15 +38,6 @@ space_level_presence_events AS (
         pd.event_time
     FROM presence_detection pd
     WHERE presence_started = 1
-
-    UNION
-
-    SELECT 
-        fdp.space_id,
-        fdp.event_date,
-        fdp.event_hour,
-        NULL::timestamp AS event_time
-    FROM fallback_daily_presence fdp
 ),
 
 space_level_presence_summary AS (
@@ -99,4 +77,3 @@ LEFT JOIN space_level_presence_summary pds
 ORDER BY space_id, event_date, event_hour;
 
 
-

src/community/services/community.service.ts

@@ -207,7 +207,8 @@ export class CommunityService {
 
       if (search) {
         qb.andWhere(
-          `c.name ILIKE '%${search}%' ${includeSpaces ? "OR space.space_name ILIKE '%" + search + "%'" : ''}`,
+          `c.name ILIKE :search ${includeSpaces ? 'OR space.space_name ILIKE :search' : ''}`,
+          { search: `%${search}%` },
         );
       }
 
@@ -215,12 +216,22 @@ export class CommunityService {
 
       const { baseResponseDto, paginationResponseDto } =
         await customModel.findAll({ ...pageable, modelName: 'community' }, qb);
+
+      if (includeSpaces) {
+        baseResponseDto.data = baseResponseDto.data.map((community) => ({
+          ...community,
+          spaces: this.spaceService.buildSpaceHierarchy(community.spaces || []),
+        }));
+      }
       return new PageResponse<CommunityDto>(
         baseResponseDto,
         paginationResponseDto,
       );
     } catch (error) {
       // Generic error handling
+      if (error instanceof HttpException) {
+        throw error;
+      }
       throw new HttpException(
         error.message || 'An error occurred while fetching communities.',
         HttpStatus.INTERNAL_SERVER_ERROR,

src/main.ts

@@ -26,8 +26,6 @@ async function bootstrap() {
     rateLimit({
       windowMs: 5 * 60 * 1000,
       max: 500,
-      standardHeaders: true,
-      legacyHeaders: false,
     }),
   );
 
@@ -36,7 +34,7 @@ async function bootstrap() {
     next();
   });
 
-  app.getHttpAdapter().getInstance().set('trust proxy', 1);
+  // app.getHttpAdapter().getInstance().set('trust proxy', 1);
 
   app.use(
     helmet({

src/space/services/space.service.ts

@@ -681,7 +681,7 @@ export class SpaceService {
     }
   }
 
-  private buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
+  buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
     const map = new Map<string, SpaceEntity>();
 
     // Step 1: Create a map of spaces by UUID