Merge pull request #129 from Code-Institute-Org/fix_activity_log_courses

Fix activity log courses

Author: ray-codeinstitute

.github/workflows/python-app.yml

@@ -13,8 +13,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Install AWS CLI
-        run: sudo apt-get update -y && sudo apt-get install -y awscli
       - run: docker info
       - name: Docker Login
         run: AWS_DEFAULT_REGION=eu-west-1 AWS_ACCESS_KEY_ID=${{secrets.AWS_ACCESS_KEY}} AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} aws ecr get-login-password | docker login --username AWS --password-stdin 949266541515.dkr.ecr.eu-west-1.amazonaws.com/ci-edx-platform

lms/djangoapps/ci_program/models.py

@@ -302,7 +302,14 @@ def _get_or_infer_block_id(
             children = course_xblock.get('fields', {}).get('children')
             if children:
                 activity_state = json.loads(activity_log[0].state)
-                section_block = children[activity_state.get('position', 1) - 1]
+                # Bugs have occured when student was enrolled in multiple runs
+                # of the same course where the number of children was different
+                child_index = activity_state.get('position', 1) - 1
+                if len(children) > child_index:
+                    section_block = children[child_index]
+                else:
+                    log.warning("Activity log position out of sync with course: %s %s", child_index, course_key)
+                    section_block = children[0]
                 block_id = section_block[1] if section_block else None
         return block_id