feat: link teachers to Joomla user accounts for auto-access (#1188)

bcordis · claude · web-flow · commit bde9fb8eb2f3 · 2026-03-19T18:35:25.000-05:00
* feat: link teachers to Joomla user accounts for auto-access (#1180) Add user_id column to teachers table, enabling teacher-to-user linkage. When a teacher is linked to a Joomla user, that user automatically gains access to content at locations where they teach via the multi-campus location system. Implements the previously stubbed getTeacherLocations() and userIsTeacher() methods in CwmlocationHelper. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: consolidate 10.3.0 SQL update files into single migration Merge three separate dated files into one since none have been released. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: rename SQL update file to reflect latest modification date Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
diff --git a/admin/forms/teacher.xml b/admin/forms/teacher.xml
@@ -27,6 +27,10 @@
                addfieldprefix="Joomla\Component\Contact\Administrator\Field"
                description="JBS_TCH_SELECT_CONTACT_DESC"
                label="JBS_TCH_SELECT_CONTACT_LABEL"/>
+        <field name="user_id"
+               type="user"
+               label="JBS_TCH_USER_ACCOUNT"
+               description="JBS_TCH_USER_ACCOUNT_DESC"/>
     </fieldset>
 
     <fieldset name="sidebar" label="JGLOBAL_FIELDSET_OPTIONS">
diff --git a/admin/language/en-GB/en-GB.com_proclaim.ini b/admin/language/en-GB/en-GB.com_proclaim.ini
@@ -2297,6 +2297,8 @@ JBS_TCH_TEACHER_IMAGE_LARGE = "Teacher Image Large"
 JBS_TCH_TITLE_DESC = "Title or salutation like Prof"
 JBS_TCH_TWITTER = "Twitter Feed"
 JBS_TCH_TWITTER_DESC = "Enter a full URL link to the teacher's Twitter feed starting with http://"
+JBS_TCH_USER_ACCOUNT = "Joomla User Account"
+JBS_TCH_USER_ACCOUNT_DESC = "Link this teacher to a Joomla user account. When linked, the user automatically gains access to content at locations where they teach."
 JBS_TCH_ORG_NAME = "Organization"
 JBS_TCH_ORG_NAME_DESC = "The organization this teacher belongs to. Used in Schema.org worksFor. Leave blank to use the site default."
 JBS_TCH_ORG_NAME_HINT = "Leave blank for site default"
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
@@ -555,6 +555,7 @@ CREATE TABLE IF NOT EXISTS `#__bsms_teachers`
     `link3`             VARCHAR(150)                                              DEFAULT NULL,
     `linklabel3`        VARCHAR(150)                                              DEFAULT NULL,
     `contact`           INT(11)                                                   DEFAULT NULL,
+    `user_id`           INT(10) UNSIGNED                                          DEFAULT NULL,
     `address`           MEDIUMTEXT,
     `social_links`      TEXT                                                      DEFAULT NULL,
     `landing_show`      INT(3)                                                    DEFAULT NULL,
@@ -571,7 +572,8 @@ CREATE TABLE IF NOT EXISTS `#__bsms_teachers`
     KEY `idx_access` (`access`),
     KEY `idx_checkout` (`checked_out`),
     KEY `idx_createdby` (`created_by`),
-    KEY `idx_published_access` (`published`, `access`)
+    KEY `idx_published_access` (`published`, `access`),
+    KEY `idx_teacher_user` (`user_id`)
 ) ENGINE InnoDB
   DEFAULT CHARSET = utf8mb4
   DEFAULT COLLATE = utf8mb4_unicode_ci;
diff --git a/admin/sql/updates/mysql/10.3.0-20260318.sql b/admin/sql/updates/mysql/10.3.0-20260318.sql
diff --git a/admin/sql/updates/mysql/10.3.0-20260319.sql b/admin/sql/updates/mysql/10.3.0-20260319.sql
@@ -15,3 +15,11 @@ UPDATE `#__bsms_teachers` AS t
 SET t.`ordering` = ranked.`new_ordering`;
 
 ALTER TABLE `#__bsms_teachers` DROP COLUMN IF EXISTS `landing_ordering`;
+
+-- Add organization name field to teachers for Schema.org worksFor override
+ALTER TABLE `#__bsms_teachers` ADD COLUMN `org_name` VARCHAR(255) DEFAULT NULL AFTER `title`;
+
+-- Add Joomla user account linkage for teacher auto-access
+ALTER TABLE `#__bsms_teachers`
+    ADD COLUMN `user_id` INT(10) UNSIGNED DEFAULT NULL AFTER `contact`,
+    ADD KEY `idx_teacher_user` (`user_id`);
diff --git a/admin/src/Helper/CwmlocationHelper.php b/admin/src/Helper/CwmlocationHelper.php
@@ -19,6 +19,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\Database\DatabaseInterface;
+use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 
 /**
@@ -204,37 +205,114 @@ public static function applySecurityFilter(QueryInterface $query, string $alias,
     /**
      * Return location IDs where the user has an associated teacher record.
      *
+     * Joins through both the many-to-many study_teachers table and the legacy
+     * teacher_id column on studies to cover all assignment paths.
+     *
      * @param   int  $userId  Joomla user ID.
      *
      * @return  int[]  Location IDs.
      *
-     * @since   10.1.0
-     * @todo    Implement once a user_id column is added to #__bsms_teachers.
-     *          When available, join: teachers.user_id = $userId
-     *          → study_teachers.teacher_id → studies.location_id.
+     * @since   10.3.0
      */
     public static function getTeacherLocations(int $userId): array
     {
-        // Stub: teacher-to-user linkage requires a user_id field on #__bsms_teachers
-        // which is not present in the current schema. Return empty until Phase 2.
-        return [];
+        if ($userId <= 0) {
+            return [];
+        }
+
+        $db = Factory::getContainer()->get(DatabaseInterface::class);
+
+        // Many-to-many path: teachers → study_teachers → studies
+        $query1 = $db->getQuery(true)
+            ->select('DISTINCT ' . $db->quoteName('s.location_id'))
+            ->from($db->quoteName('#__bsms_teachers', 't'))
+            ->innerJoin(
+                $db->quoteName('#__bsms_study_teachers', 'st')
+                . ' ON ' . $db->quoteName('st.teacher_id') . ' = ' . $db->quoteName('t.id')
+            )
+            ->innerJoin(
+                $db->quoteName('#__bsms_studies', 's')
+                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('st.study_id')
+            )
+            ->where($db->quoteName('t.user_id') . ' = :userId1')
+            ->where($db->quoteName('s.location_id') . ' IS NOT NULL')
+            ->where($db->quoteName('s.location_id') . ' > 0')
+            ->bind(':userId1', $userId, ParameterType::INTEGER);
+
+        // Legacy path: teachers → studies.teacher_id
+        $query2 = $db->getQuery(true)
+            ->select('DISTINCT ' . $db->quoteName('s.location_id'))
+            ->from($db->quoteName('#__bsms_teachers', 't'))
+            ->innerJoin(
+                $db->quoteName('#__bsms_studies', 's')
+                . ' ON ' . $db->quoteName('s.teacher_id') . ' = ' . $db->quoteName('t.id')
+            )
+            ->where($db->quoteName('t.user_id') . ' = :userId2')
+            ->where($db->quoteName('s.location_id') . ' IS NOT NULL')
+            ->where($db->quoteName('s.location_id') . ' > 0')
+            ->bind(':userId2', $userId, ParameterType::INTEGER);
+
+        $db->setQuery('(' . $query1 . ') UNION (' . $query2 . ')');
+
+        return array_map('intval', $db->loadColumn() ?: []);
     }
 
     /**
      * Determine whether a user is a teacher of a specific message.
      *
+     * Checks both the many-to-many study_teachers table and the legacy
+     * teacher_id column on the study record.
+     *
      * @param   int  $userId     Joomla user ID.
      * @param   int  $messageId  Message (study) ID.
      *
      * @return  bool
      *
-     * @since   10.1.0
-     * @todo    Implement once a user_id column is added to #__bsms_teachers.
+     * @since   10.3.0
      */
     public static function userIsTeacher(int $userId, int $messageId): bool
     {
-        // Stub: see getTeacherLocations() note.
-        return false;
+        if ($userId <= 0 || $messageId <= 0) {
+            return false;
+        }
+
+        $db = Factory::getContainer()->get(DatabaseInterface::class);
+
+        // Check many-to-many path
+        $query = $db->getQuery(true)
+            ->select('1')
+            ->from($db->quoteName('#__bsms_teachers', 't'))
+            ->innerJoin(
+                $db->quoteName('#__bsms_study_teachers', 'st')
+                . ' ON ' . $db->quoteName('st.teacher_id') . ' = ' . $db->quoteName('t.id')
+            )
+            ->where($db->quoteName('t.user_id') . ' = :userId')
+            ->where($db->quoteName('st.study_id') . ' = :studyId')
+            ->bind(':userId', $userId, ParameterType::INTEGER)
+            ->bind(':studyId', $messageId, ParameterType::INTEGER);
+
+        $db->setQuery($query, 0, 1);
+
+        if ($db->loadResult()) {
+            return true;
+        }
+
+        // Check legacy teacher_id path
+        $query2 = $db->getQuery(true)
+            ->select('1')
+            ->from($db->quoteName('#__bsms_teachers', 't'))
+            ->innerJoin(
+                $db->quoteName('#__bsms_studies', 's')
+                . ' ON ' . $db->quoteName('s.teacher_id') . ' = ' . $db->quoteName('t.id')
+            )
+            ->where($db->quoteName('t.user_id') . ' = :userId2')
+            ->where($db->quoteName('s.id') . ' = :studyId2')
+            ->bind(':userId2', $userId, ParameterType::INTEGER)
+            ->bind(':studyId2', $messageId, ParameterType::INTEGER);
+
+        $db->setQuery($query2, 0, 1);
+
+        return (bool) $db->loadResult();
     }
 
     /**
diff --git a/admin/src/Table/CwmteacherTable.php b/admin/src/Table/CwmteacherTable.php
@@ -119,6 +119,9 @@ class CwmteacherTable extends Table
     /** @var int|null Contact ID @since 7.0.0 */
     public ?int $contact = null;
 
+    /** @var int|null Linked Joomla user ID @since 10.3.0 */
+    public ?int $user_id = null;
+
     /** @var string|null Mailing address @since 7.0.0 */
     public ?string $address = null;
 
@@ -277,7 +280,7 @@ public function bind($src, $ignore = ''): bool
 
         // Cast typed int properties to prevent PHP 8.3 TypeError when form posts strings
         foreach ([
-            'id', 'list_show', 'published', 'asset_id', 'access', 'contact',
+            'id', 'list_show', 'published', 'asset_id', 'access', 'contact', 'user_id',
             'landing_show', 'created_by', 'modified_by', 'checked_out',
         ] as $field) {
             if (isset($src[$field])) {
diff --git a/admin/tmpl/cwmteacher/edit.php b/admin/tmpl/cwmteacher/edit.php
@@ -68,6 +68,7 @@ class="form-validate" enctype="multipart/form-data">
                 <?php echo $this->form->renderField('email'); ?>
                 <?php echo $this->form->renderField('address'); ?>
                 <?php echo $this->form->renderField('contact'); ?>
+                <?php echo $this->form->renderField('user_id'); ?>
                 <?php if ($this->form->getValue('contact')) : ?>
                     <a href="<?php echo Route::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $this->form->getValue('contact')); ?>"
                        target="_blank" class="btn btn-sm btn-secondary mb-3">
diff --git a/tests/unit/Admin/Helper/CwmlocationHelperTest.php b/tests/unit/Admin/Helper/CwmlocationHelperTest.php
@@ -64,35 +64,35 @@ public function testResetCacheForUser(): void
     }
 
     // -------------------------------------------------------------------------
-    // getTeacherLocations / userIsTeacher stubs
+    // getTeacherLocations / userIsTeacher edge cases (no DB needed)
     // -------------------------------------------------------------------------
 
     /**
-     * getTeacherLocations() is stubbed and must return an empty array for any
-     * user ID until a user_id column is added to #__bsms_teachers.
+     * getTeacherLocations() returns empty for zero or negative user IDs
+     * without hitting the database.
      *
      * @return void
-     * @since  10.1.0
+     * @since  10.3.0
      */
-    public function testGetTeacherLocationsReturnsEmptyArray(): void
+    public function testGetTeacherLocationsReturnsEmptyForInvalidUserId(): void
     {
-        $this->assertSame([], CwmlocationHelper::getTeacherLocations(1));
-        $this->assertSame([], CwmlocationHelper::getTeacherLocations(999));
         $this->assertSame([], CwmlocationHelper::getTeacherLocations(0));
+        $this->assertSame([], CwmlocationHelper::getTeacherLocations(-1));
     }
 
     /**
-     * userIsTeacher() is stubbed and must return false for any combination of
-     * user ID and message ID until the teacher-user linkage is implemented.
+     * userIsTeacher() returns false for zero or negative IDs without
+     * hitting the database.
      *
      * @return void
-     * @since  10.1.0
+     * @since  10.3.0
      */
-    public function testUserIsTeacherReturnsFalse(): void
+    public function testUserIsTeacherReturnsFalseForInvalidIds(): void
     {
-        $this->assertFalse(CwmlocationHelper::userIsTeacher(1, 1));
         $this->assertFalse(CwmlocationHelper::userIsTeacher(0, 0));
-        $this->assertFalse(CwmlocationHelper::userIsTeacher(999, 999));
+        $this->assertFalse(CwmlocationHelper::userIsTeacher(-1, 1));
+        $this->assertFalse(CwmlocationHelper::userIsTeacher(1, 0));
+        $this->assertFalse(CwmlocationHelper::userIsTeacher(1, -1));
     }
 
     // -------------------------------------------------------------------------
