Merge pull request #1421 from eduhub-org/fix/location-addresses-improvements

chore: Fix/location addresses improvements

Author: steffen74

.cursor/rules/mobile-responsive-design.mdc

@@ -279,7 +279,15 @@ const MobilePagination: React.FC<PaginationProps> = ({
   }
 
   // Full pagination for desktop
-  return <FullPagination {...props} />;
+  return (
+    <FullPagination
+      pageIndex={pageIndex}
+      pageSize={pageSize}
+      totalCount={totalCount}
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+    />
+  );
 };
 ```
 

backend/metadata/databases/default/tables/public_CourseLocation.yaml

@@ -5,6 +5,9 @@ object_relationships:
   - name: Course
     using:
       foreign_key_constraint_on: courseId
+  - name: DefaultSessionAddress
+    using:
+      foreign_key_constraint_on: defaultSessionAddressId
   - name: LocationOption
     using:
       manual_configuration:
@@ -18,15 +21,25 @@ insert_permissions:
   - role: instructor_access
     permission:
       check:
-        Course:
-          CourseInstructors:
-            Expert:
-              User:
-                id:
-                  _eq: X-Hasura-User-Id
+        _and:
+          - Course:
+              CourseInstructors:
+                Expert:
+                  User:
+                    id:
+                      _eq: X-Hasura-User-Id
+          - _or:
+              - defaultSessionAddressId:
+                  _is_null: true
+              - DefaultSessionAddress:
+                  locationOption:
+                    _ceq:
+                      - $
+                      - locationOption
       columns:
         - courseId
         - defaultSessionAddress
+        - defaultSessionAddressId
         - id
         - locationOption
 select_permissions:
@@ -35,6 +48,7 @@ select_permissions:
       columns:
         - courseId
         - defaultSessionAddress
+        - defaultSessionAddressId
         - id
         - locationOption
       filter: {}
@@ -45,6 +59,7 @@ select_permissions:
         - courseId
         - created_at
         - defaultSessionAddress
+        - defaultSessionAddressId
         - id
         - locationOption
         - updated_at
@@ -56,6 +71,7 @@ update_permissions:
       columns:
         - courseId
         - defaultSessionAddress
+        - defaultSessionAddressId
         - locationOption
       filter:
         Course:
@@ -64,7 +80,15 @@ update_permissions:
               User:
                 id:
                   _eq: X-Hasura-User-Id
-      check: null
+      check:
+        _or:
+          - defaultSessionAddressId:
+              _is_null: true
+          - DefaultSessionAddress:
+              locationOption:
+                _ceq:
+                  - $
+                  - locationOption
 delete_permissions:
   - role: instructor_access
     permission:

backend/metadata/databases/default/tables/public_LocationAddress.yaml

@@ -4,8 +4,15 @@ table:
 object_relationships:
   - name: LocationOption
     using:
-      foreign_key_constraint_on: locationOptionId
+      foreign_key_constraint_on: locationOption
 array_relationships:
+  - name: CourseLocations
+    using:
+      foreign_key_constraint_on:
+        column: defaultSessionAddressId
+        table:
+          name: CourseLocation
+          schema: public
   - name: SessionAddresses
     using:
       foreign_key_constraint_on:
@@ -14,11 +21,20 @@ array_relationships:
           name: SessionAddress
           schema: public
 insert_permissions:
+  - role: admin
+    permission:
+      check: {}
+      columns:
+        - locationOption
+        - shortLabel
+        - address
+        - description
+        - aliases
   - role: instructor_access
     permission:
       check: {}
       columns:
-        - locationOptionId
+        - locationOption
         - shortLabel
         - address
         - description
@@ -27,17 +43,43 @@ insert_permissions:
     permission:
       check: {}
       columns:
-        - locationOptionId
+        - locationOption
         - shortLabel
         - address
         - description
         - aliases
 select_permissions:
+  - role: admin
+    permission:
+      columns:
+        - id
+        - locationOption
+        - shortLabel
+        - address
+        - description
+        - aliases
+        - created_at
+        - updated_at
+      filter: {}
+      allow_aggregations: true
   - role: anonymous
     permission:
       columns:
         - id
-        - locationOptionId
+        - locationOption
+        - shortLabel
+        - address
+        - description
+        - aliases
+        - created_at
+        - updated_at
+      filter: {}
+      allow_aggregations: true
+  - role: instructor_access
+    permission:
+      columns:
+        - id
+        - locationOption
         - shortLabel
         - address
         - description
@@ -50,7 +92,7 @@ select_permissions:
     permission:
       columns:
         - id
-        - locationOptionId
+        - locationOption
         - shortLabel
         - address
         - description
@@ -60,6 +102,16 @@ select_permissions:
       filter: {}
       allow_aggregations: true
 update_permissions:
+  - role: admin
+    permission:
+      columns:
+        - locationOption
+        - shortLabel
+        - address
+        - description
+        - aliases
+      filter: {}
+      check: {}
   - role: instructor_access
     permission:
       columns:
@@ -79,6 +131,9 @@ update_permissions:
       filter: {}
       check: {}
 delete_permissions:
+  - role: admin
+    permission:
+      filter: {}
   - role: instructor_access
     permission:
       filter: {}

backend/metadata/databases/default/tables/public_LocationOption.yaml

@@ -3,6 +3,13 @@ table:
   schema: public
 is_enum: true
 array_relationships:
+  - name: LocationAddresses
+    using:
+      foreign_key_constraint_on:
+        column: locationOption
+        table:
+          name: LocationAddress
+          schema: public
   - name: Locations
     using:
       manual_configuration:
@@ -12,13 +19,6 @@ array_relationships:
         remote_table:
           name: CourseLocation
           schema: public
-  - name: LocationAddresses
-    using:
-      foreign_key_constraint_on:
-        column: locationOptionId
-        table:
-          name: LocationAddress
-          schema: public
 select_permissions:
   - role: anonymous
     permission:

backend/metadata/databases/default/tables/public_SessionAddress.yaml

@@ -5,12 +5,12 @@ object_relationships:
   - name: CourseLocation
     using:
       foreign_key_constraint_on: courseLocationId
-  - name: Session
-    using:
-      foreign_key_constraint_on: sessionId
   - name: LocationAddress
     using:
       foreign_key_constraint_on: locationAddressId
+  - name: Session
+    using:
+      foreign_key_constraint_on: sessionId
 insert_permissions:
   - role: instructor_access
     permission:

backend/migrations/default/1756820000000_add_defaultSessionAddressId_to_CourseLocation/down.sql

@@ -0,0 +1,14 @@
+-- Rollback: Remove defaultSessionAddressId column from CourseLocation table
+
+-- Drop the index first
+DROP INDEX IF EXISTS "public"."idx_course_location_default_session_address_id";
+
+-- Drop the foreign key constraint (the column drop will cascade, but explicit is clearer)
+ALTER TABLE "public"."CourseLocation" 
+DROP CONSTRAINT IF EXISTS "CourseLocation_defaultSessionAddressId_fkey";
+
+-- Drop the column
+ALTER TABLE "public"."CourseLocation" 
+DROP COLUMN IF EXISTS "defaultSessionAddressId";
+
+

backend/migrations/default/1756820000000_add_defaultSessionAddressId_to_CourseLocation/up.sql

@@ -0,0 +1,20 @@
+-- Add defaultSessionAddressId column to CourseLocation table
+-- This field references LocationAddress for default session addresses
+
+ALTER TABLE "public"."CourseLocation" 
+ADD COLUMN "defaultSessionAddressId" integer;
+
+-- Add foreign key constraint to ensure referential integrity
+ALTER TABLE "public"."CourseLocation"
+ADD CONSTRAINT "CourseLocation_defaultSessionAddressId_fkey"
+FOREIGN KEY ("defaultSessionAddressId") REFERENCES "public"."LocationAddress"("id")
+ON UPDATE RESTRICT ON DELETE SET NULL;
+
+-- Create index to optimize queries on defaultSessionAddressId
+CREATE INDEX "idx_course_location_default_session_address_id" 
+ON "public"."CourseLocation" ("defaultSessionAddressId");
+
+COMMENT ON COLUMN "public"."CourseLocation"."defaultSessionAddressId" IS 
+E'References a LocationAddress that serves as the default for sessions in this course location. Replaces the legacy text-based defaultSessionAddress field.';
+
+

backend/migrations/default/1756820100000_migrate_default_session_addresses_to_location_address/down.sql

@@ -0,0 +1,22 @@
+-- Rollback the migration: Clear defaultSessionAddressId from CourseLocation
+-- Note: This doesn't delete the LocationAddress records to avoid data loss
+-- If you need to completely rollback, you should manually review and clean up LocationAddress table
+
+UPDATE "public"."CourseLocation" 
+SET "defaultSessionAddressId" = NULL 
+WHERE "defaultSessionAddressId" IS NOT NULL;
+
+-- Optionally, remove LocationAddress records that were created during this migration
+-- Uncomment the following lines if you want to remove migrated default addresses
+-- WARNING: This will permanently delete the migrated LocationAddress data
+
+-- DELETE FROM "public"."LocationAddress" 
+-- WHERE "description" = 'Migrated from CourseLocation.defaultSessionAddress';
+
+DO $$ BEGIN
+    RAISE NOTICE 'Migration rollback completed. CourseLocation.defaultSessionAddressId set to NULL.';
+    RAISE NOTICE 'LocationAddress records were NOT deleted to preserve data integrity.';
+    RAISE NOTICE 'Review and manually clean up LocationAddress table if needed.';
+END $$;
+
+

backend/migrations/default/1756820100000_migrate_default_session_addresses_to_location_address/up.sql

@@ -0,0 +1,72 @@
+-- Migrate default session addresses from CourseLocation to LocationAddress
+-- This migration creates LocationAddress records for defaultSessionAddress values
+-- and updates CourseLocation to reference the new LocationAddress records
+
+-- Step 1: Insert unique default session addresses into LocationAddress table
+-- Only create entries for non-empty defaultSessionAddress values
+INSERT INTO "public"."LocationAddress" (
+    "locationOptionId",
+    "shortLabel", 
+    "address",
+    "description"
+)
+SELECT DISTINCT
+    cl."locationOption",
+    -- Generate a short label from the first few words or first line of the address
+    CASE 
+        WHEN LENGTH(cl."defaultSessionAddress") <= 50 THEN cl."defaultSessionAddress"
+        WHEN POSITION(E'\n' in cl."defaultSessionAddress") > 0 AND POSITION(E'\n' in cl."defaultSessionAddress") <= 50 
+            THEN LEFT(cl."defaultSessionAddress", POSITION(E'\n' in cl."defaultSessionAddress") - 1)
+        WHEN POSITION(' ' in SUBSTRING(cl."defaultSessionAddress" FROM 45)) > 0 
+            THEN LEFT(cl."defaultSessionAddress", 44 + POSITION(' ' in SUBSTRING(cl."defaultSessionAddress" FROM 45)))
+        ELSE LEFT(cl."defaultSessionAddress", 50) || '...'
+    END,
+    cl."defaultSessionAddress",
+    'Migrated from CourseLocation.defaultSessionAddress'
+FROM "public"."CourseLocation" cl
+WHERE cl."defaultSessionAddress" IS NOT NULL 
+  AND cl."defaultSessionAddress" != ''
+  AND cl."locationOption" IS NOT NULL
+  -- Avoid creating duplicates if the exact same address already exists
+  AND NOT EXISTS (
+    SELECT 1 FROM "public"."LocationAddress" la
+    WHERE la."locationOptionId" = cl."locationOption"
+      AND la."address" = cl."defaultSessionAddress"
+  )
+ON CONFLICT ("locationOptionId", "shortLabel") DO NOTHING;
+
+-- Step 2: Update CourseLocation records to reference the new LocationAddress entries
+UPDATE "public"."CourseLocation" cl
+SET "defaultSessionAddressId" = la.id
+FROM "public"."LocationAddress" la
+WHERE cl."locationOption" = la."locationOptionId"
+  AND cl."defaultSessionAddress" = la."address"
+  AND cl."defaultSessionAddress" IS NOT NULL
+  AND cl."defaultSessionAddress" != '';
+
+-- Report migration statistics
+DO $$
+DECLARE
+    total_course_locations INTEGER;
+    migrated_defaults INTEGER;
+    created_default_addresses INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO total_course_locations 
+    FROM "public"."CourseLocation" 
+    WHERE "defaultSessionAddress" IS NOT NULL AND "defaultSessionAddress" != '';
+    
+    SELECT COUNT(*) INTO migrated_defaults 
+    FROM "public"."CourseLocation" 
+    WHERE "defaultSessionAddressId" IS NOT NULL;
+    
+    SELECT COUNT(*) INTO created_default_addresses 
+    FROM "public"."LocationAddress" 
+    WHERE "description" = 'Migrated from CourseLocation.defaultSessionAddress';
+    
+    RAISE NOTICE 'Default session address migration completed:';
+    RAISE NOTICE '  CourseLocations with defaultSessionAddress: %', total_course_locations;
+    RAISE NOTICE '  Migrated to defaultSessionAddressId: %', migrated_defaults;
+    RAISE NOTICE '  LocationAddress records created: %', created_default_addresses;
+END $$;
+
+