Merge branch 'main' of github.com:efdevcon/monorepo

Author: lassejaco

devconnect-app/src/app/api/data/README.md

@@ -4,7 +4,7 @@
 `GET /api/data`
 
 ## Description
-Fetches supporter and POI (Point of Interest) data from a Notion database. The data is automatically categorized based on the `Is POI` checkbox field.
+Fetches supporter and POI (Point of Interest) data from a Notion database. The data is automatically categorized based on the `POI` select field (previously was boolean `Is POI`).
 
 ## Response Format
 
@@ -15,29 +15,29 @@ Fetches supporter and POI (Point of Interest) data from a Notion database. The d
     "supporters": [
       {
         "name": "Espresso",
-        "layerNaming": "l2s/espresso",
-        "districtId": 1,
-        "locationId": 1
+        "layerName": "l2s/espresso",
+        "districtId": "1",
+        "locationId": "1"
       }
     ],
     "pois": [
       {
         "name": "Help desk 1",
-        "layerNaming": "arts/help-desk-1",
-        "districtId": 3,
-        "locationId": 3
+        "layerName": "arts/help-desk-1",
+        "districtId": "3",
+        "locationId": "3"
       }
     ],
-    "districts": [
-      { "id": 1, "name": "L2s" },
-      { "id": 2, "name": "Social" },
-      { "id": 3, "name": "Hardware & Wallets" }
-    ],
-    "locations": [
-      { "id": 1, "name": "Pista Central" },
-      { "id": 2, "name": "Green Pavilion" },
-      { "id": 3, "name": "Pavilion 9" }
-    ]
+    "districts": {
+      "1": { "name": "L2s" },
+      "2": { "name": "Social" },
+      "3": { "name": "Hardware & Wallets" }
+    },
+    "locations": {
+      "1": { "name": "Pista Central" },
+      "2": { "name": "Green Pavilion" },
+      "3": { "name": "Pavilion 9" }
+    }
   },
   "timestamp": "2025-09-09T17:59:05.480Z"
 }
@@ -46,24 +46,27 @@ Fetches supporter and POI (Point of Interest) data from a Notion database. The d
 ## Data Structure
 
 ### Supporters
-Array of supporter objects where `Is POI` is `false`. Each supporter contains:
+Array of supporter objects where `POI` field is empty. Each supporter contains:
 - `name` (string): Supporter name
-- `layerNaming` (string): Layer naming convention
-- `districtId` (number|null): Reference to districts array ID
-- `locationId` (number|null): Reference to locations array ID
+- `layerName` (string): Layer naming convention
+- `districtId` (string|null): Reference to districts object key
+- `locationId` (string|null): Reference to locations object key
 
 ### POIs (Points of Interest)
-Array of POI objects where `Is POI` is `true`. Each POI contains the same fields as supporters.
+Array of POI objects where `POI` field has a value. Each POI contains the same fields as supporters.
 
 ### Districts
-Array of unique district objects with:
-- `id` (number): Sequential ID starting from 1
-- `name` (string): District name
+Object of unique district objects with numeric string keys:
+
+- Key (string): Sequential ID starting from "1"
+- Value: Object with `name` (string): District name
 
 ### Locations
-Array of unique location objects with:
-- `id` (number): Sequential ID starting from 1
-- `name` (string): Location name
+
+Object of unique location objects with numeric string keys:
+
+- Key (string): Sequential ID starting from "1"
+- Value: Object with `name` (string): Location name
 
 ## Supported Property Types
 - `title` - Page titles

devconnect-app/src/app/api/data/route.ts

@@ -4,8 +4,9 @@ import { Client } from '@notionhq/client';
 /**
  * API endpoint to fetch data
  * GET /api/data
- * 
+ *
  * Attempts to fetch from Notion database, falls back to sample data on error
+ * POI field is now a select type indicating the type of POI (previously was boolean isPOI)
  */
 export async function GET(request: NextRequest) {
   try {
@@ -87,30 +88,39 @@ export async function GET(request: NextRequest) {
         name: getPropertyValue('Supporter Name'),
         district: getPropertyValue('District'),
         location: getPropertyValue('Location'),
-        id: getPropertyValue('Layer naming'),
-        isPOI: getPropertyValue('Is POI'),
+        layerName: getPropertyValue('Layer name'),
+        POI: getPropertyValue('POI'),
       };
     });
 
-    const supporters = data.filter(item => item.isPOI === 'false');
-    const pois = data.filter(item => item.isPOI === 'true');
+    // Filter out entries with empty Supporter Name
+    const filteredData = data.filter(item => item.name && item.name.trim() !== '');
 
-    // remove isPOI property from result
-    const cleanSupporters = supporters.map(item => { delete item.isPOI; return item; });
-    const cleanPois = pois.map(item => { delete item.isPOI; return item; });
+    const supporters = filteredData.filter(item => !item.POI || item.POI.trim() === '');
+    const pois = filteredData.filter(item => item.POI && item.POI.trim() !== '');
 
-    // Get unique districts and locations with IDs
-    const uniqueDistricts = [...new Set(data.map(item => item.district).filter(Boolean))]
-      .map((district, index) => ({ id: index + 1, name: district }));
-    
-    const uniqueLocations = [...new Set(data.map(item => item.location).filter(Boolean))]
-      .map((location, index) => ({ id: index + 1, name: location }));
+    // remove POI property from result (was previously isPOI boolean)
+    const cleanSupporters = supporters.map(item => { delete item.POI; return item; });
+    const cleanPois = pois.map(item => { delete item.POI; return item; });
+
+    // Get unique districts and locations as objects with numeric ID as key
+    const uniqueDistrictsArray = [...new Set(filteredData.map(item => item.district).filter(Boolean))];
+    const uniqueDistricts = uniqueDistrictsArray.reduce((acc, district, index) => {
+      acc[(index + 1).toString()] = { name: district };
+      return acc;
+    }, {} as Record<string, { name: string }>);
+
+    const uniqueLocationsArray = [...new Set(filteredData.map(item => item.location).filter(Boolean))];
+    const uniqueLocations = uniqueLocationsArray.reduce((acc, location, index) => {
+      acc[(index + 1).toString()] = { name: location };
+      return acc;
+    }, {} as Record<string, { name: string }>);
 
-    // Create lookup maps for district and location IDs
-    const districtMap = new Map(uniqueDistricts.map(d => [d.name, d.id]));
-    const locationMap = new Map(uniqueLocations.map(l => [l.name, l.id]));
+    // Create lookup maps for district and location (name -> numeric ID)
+    const districtMap = new Map(uniqueDistrictsArray.map((name, index) => [name, (index + 1).toString()]));
+    const locationMap = new Map(uniqueLocationsArray.map((name, index) => [name, (index + 1).toString()]));
 
-    // Replace district and location names with IDs in supporters and POIs
+    // Replace district and location names with their numeric IDs in supporters and POIs
     const supportersWithIds = cleanSupporters.map(item => {
       const { district, location, ...rest } = item;
       return {

devconnect/src/pages/api/notion/[...id].ts

@@ -38,7 +38,7 @@ function extractFieldName(propertyName: string): { name: string | null; mode: 'e
 }
 
 // Helper function to determine field type from Notion property
-function getFieldType(property: any): 'text' | 'email' | 'file' | 'url' | 'title' | 'select' | 'status' | 'checkbox' | 'formula' | null {
+function getFieldType(property: any): 'text' | 'email' | 'file' | 'url' | 'title' | 'select' | 'status' | 'checkbox' | 'formula' | 'rollup' | null {
   switch (property.type) {
     case 'rich_text':
       return 'text';
@@ -58,8 +58,9 @@ function getFieldType(property: any): 'text' | 'email' | 'file' | 'url' | 'title
       return 'checkbox';
     case 'formula':
       return 'formula';
+    case 'rollup':
+      return 'rollup';
     default:
-      console.log(`Unsupported property type: ${property.type}`);
       return null;
   }
 }
@@ -84,6 +85,39 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   }
 }
 
+
+// Helper function to fetch supporter data from rollup
+async function fetchSupporterFromRollup(pageProperties: any, notion: Client): Promise<string> {
+  // Look for "Parent item" relation in the current page properties
+  const parentRelation = pageProperties["Parent item"];
+  if (parentRelation && parentRelation.type === 'relation' && parentRelation.relation && parentRelation.relation.length > 0) {
+    const parentPageId = parentRelation.relation[0].id;
+
+    try {
+      const parentPage = await notion.pages.retrieve({ page_id: parentPageId });
+      const parentProperties = (parentPage as any).properties;
+
+      // Look for "Supporters Tracker" in parent page
+      const supportersTracker = parentProperties["Supporters Tracker"];
+      if (supportersTracker && supportersTracker.relation && supportersTracker.relation.length > 0) {
+        const supporterPageId = supportersTracker.relation[0].id;
+        const supporterPage = await notion.pages.retrieve({ page_id: supporterPageId });
+        const supporterData = supporterPage as any;
+
+        // Extract supporter name/title like in organization API
+        return supporterData.properties?.['Supporter Name']?.title?.[0]?.plain_text ||
+          supporterData.properties?.Name?.title?.[0]?.plain_text ||
+          supporterData.properties?.Title?.title?.[0]?.plain_text ||
+          'Unknown Supporter';
+      }
+    } catch (error) {
+      console.error('Failed to fetch supporter data from rollup:', error);
+    }
+  }
+
+  return '';
+}
+
 // GET: Fetch page data for the given id
 async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: string) {
   const notion = new Client({ auth: process.env.NOTION_SECRET });
@@ -94,7 +128,8 @@ async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: stri
     if (page.object !== 'page' || !('properties' in page)) {
       return res.status(400).json({ error: 'Invalid page object' });
     }
-    
+
+
     // Get database schema to access field descriptions
     let databaseSchema: any = null;
     if (page.parent && page.parent.type === 'database_id') {
@@ -109,7 +144,7 @@ async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: stri
     const fields: Array<{
       name: string;
       value: string;
-      type: 'text' | 'email' | 'file' | 'url' | 'title' | 'select' | 'status' | 'checkbox' | 'formula';
+      type: 'text' | 'email' | 'file' | 'url' | 'title' | 'select' | 'status' | 'checkbox' | 'formula' | 'rollup';
       mode: 'edit' | 'read';
       order: number;
       description?: string;
@@ -172,6 +207,15 @@ async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: stri
             }
           }
           break;
+        case 'rollup':
+          if (propertyAny.type === 'rollup') {
+            // Handle rollup fields - they are read-only calculated fields
+            fieldValue = '[Calculated Field]';
+          }
+          break;
+        default:
+          fieldValue = '[UNSUPPORTED TYPE]';
+          break;
       }
 
       configFields.push({ name: fieldName, value: fieldValue, order });
@@ -256,6 +300,63 @@ async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: stri
             }
           }
           break;
+        case 'rollup':
+          if (propertyAny.type === 'rollup') {
+            // Handle rollup fields - fetch supporter data if rollup is empty
+            const rollupResult = propertyAny.rollup;
+
+            if (rollupResult && rollupResult.type === 'array') {
+              const arrayValues = rollupResult.array || [];
+
+              // Check if rollup is empty but we have a parent with Supporters Tracker
+              if (arrayValues.length === 0 || (arrayValues.length === 1 && arrayValues[0].type === 'relation' && arrayValues[0].relation.length === 0)) {
+                // Try to fetch supporter data from parent page
+                const supporterName = await fetchSupporterFromRollup(page.properties, notion);
+                fieldValue = supporterName || '[Calculated Field]';
+              } else {
+                // Process normal rollup array
+                const processedValues = arrayValues.map((item: any) => {
+                  if (item.type === 'select' && item.select) {
+                    return item.select.name;
+                  } else if (item.type === 'status' && item.status) {
+                    return item.status.name;
+                  } else if (item.type === 'title' && item.title) {
+                    return item.title[0]?.plain_text || '';
+                  } else if (item.type === 'rich_text' && item.rich_text) {
+                    return item.rich_text[0]?.plain_text || '';
+                  } else if (item.type === 'number' && item.number !== undefined) {
+                    return item.number.toString();
+                  } else if (item.type === 'checkbox') {
+                    return item.checkbox ? 'true' : 'false';
+                  } else if (item.type === 'date' && item.date) {
+                    return item.date.start || '';
+                  }
+                  return '';
+                }).filter(Boolean);
+
+                fieldValue = processedValues.join(', ');
+              }
+            } else if (rollupResult) {
+              // Handle other rollup types
+              if (rollupResult.type === 'string') {
+                fieldValue = rollupResult.string || '';
+              } else if (rollupResult.type === 'number') {
+                fieldValue = rollupResult.number?.toString() || '';
+              } else if (rollupResult.type === 'boolean') {
+                fieldValue = rollupResult.boolean ? 'true' : 'false';
+              } else if (rollupResult.type === 'date') {
+                fieldValue = rollupResult.date?.start || '';
+              } else {
+                fieldValue = '[Calculated Field]';
+              }
+            } else {
+              fieldValue = '[Calculated Field]';
+            }
+          }
+          break;
+        default:
+          fieldValue = '[UNSUPPORTED TYPE]';
+          break;
       }
 
       // Extract description and options from database schema if available
@@ -299,9 +400,10 @@ async function handleGet(req: NextApiRequest, res: NextApiResponse, pageId: stri
       });
     }
 
+
     // Sort fields by order
     fields.sort((a, b) => a.order - b.order);
-    
+
     // Return flat array of fields with config information
     return res.status(200).json({
       fields,