- Merged master

- Splitted a function into 3 functions
- Changed some functions names

Author: orronai

.gitignore

@@ -135,3 +135,4 @@ yarn-error.log*
 lms/lmsweb/config.py
 db.sqlite
 vim.session
+devops/rabbitmq.cookie

devops/build.sh

@@ -4,8 +4,9 @@ SCRIPT_FILE_PATH=$(readlink -f "${0}")
 SCRIPT_FOLDER=$(dirname "${SCRIPT_FILE_PATH}")
 MAIN_FOLDER="${SCRIPT_FOLDER}/.."
 
-echo "Asking for sudo to chown the rabbitmq cookie:"
-sudo chown "$USER:$USER" "$SCRIPT_FOLDER/rabbitmq.cookie"
+echo "Using sudo to remove the old erlang cookie"
+ERLANG_COOKIE_FILE="${SCRIPT_FOLDER}/rabbitmq.cookie"
+sudo rm -f "$ERLANG_COOKIE_FILE"
 
 echo "Running build on folder ${MAIN_FOLDER}"
 ( cd "${MAIN_FOLDER}" && docker build -t lms . )

devops/lms.yml

@@ -2,13 +2,13 @@ version: "3"
 
 services:
   db:
-    image: postgres:13-alpine
+    image: postgres:14-alpine
     ports:
       - 5432:5432
     volumes:
       - db-data-volume:/pg_data
     environment:
-      - PGDATA=/pg_data/13/data
+      - PGDATA=/pg_data/14/data
       - POSTGRES_DB=${DB_NAME:-db}
       - POSTGRES_USER=${DB_USERNAME:-postgres}
       - POSTGRES_PASSWORD=${DB_PASSWORD:-postgres}
@@ -97,6 +97,7 @@ services:
     volumes:
       - ../lms:/app_dir/lms
       - ../../notebooks-tests:/app_dir/notebooks-tests
+      - repositories-data-volume:/repositories
     environment:
       - DB_NAME=${DB_NAME:-db}
       - DB_USER=${DB_USERNAME:-postgres}
@@ -109,6 +110,7 @@ services:
       - CELERY_CHECKS_PUBLIC_VHOST=lmstests-public
       - CELERY_RABBITMQ_HOST=rabbitmq
       - CELERY_RABBITMQ_PORT=5672
+      - REPOSITORY_FOLDER=/repositories
     links:
       - db
       - rabbitmq
@@ -126,6 +128,7 @@ volumes:
   docker-engine-lib:
   db-data-volume:
   rabbit-data-volume:
+  repositories-data-volume:
 
 
 networks:

devops/rabbitmq.cookie

@@ -7,9 +7,12 @@ else
   echo "Using default dev variables"
 fi
 
-
 SCRIPT_FILE_PATH=$(readlink -f "${0}")
 SCRIPT_FOLDER=$(dirname "${SCRIPT_FILE_PATH}")
+ERLANG_COOKIE_FILE="${SCRIPT_FOLDER}/rabbitmq.cookie"
+
+echo erlang_cookie=AAVyo5djdSMGIZXiwEQs3JeVaBx5l14z > "$ERLANG_COOKIE_FILE"
+chmod 600 "$ERLANG_COOKIE_FILE"
 
 docker network create lms
 

devops/start.sh

@@ -1,15 +1,20 @@
 docker stop lms_db_1
 
 # Put values here if you've configured them before
-# DB_NAME=lms
-# DB_USERNAME=lmsweb
-# DB_PASSWORD=
+CURRENT_VERSION=11
+NEW_VERSION=14
+DB_NAME=lms
+DB_USERNAME=lmsweb
+DB_PASSWORD=
+
+echo "Remove these two lines to indicate you have filled the details"
+return 1
 
 CURRENT_DATE=$(date +%d-%m-%Y_%H_%M_%S)
 MOUNT_PATH=/pg_data
-PG_OLD_DATA=/pg_data/11/data
-PG_NEW_DATA=/pg_data/13/data
-BACKUP_FILENAME=v11.$CURRENT_DATE.sql
+PG_OLD_DATA=/pg_data/${CURRENT_VERSION}/data
+PG_NEW_DATA=/pg_data/${NEW_VERSION}/data
+BACKUP_FILENAME=v${CURRENT_VERSION}.${CURRENT_DATE}.sql
 BACKUP_PATH=$MOUNT_PATH/backup/$BACKUP_FILENAME
 BACKUP_DIR=$(dirname "$BACKUP_PATH")
 VOLUME_NAME=lms_db-data-volume
@@ -20,7 +25,7 @@ docker run --rm -v $VOLUME_NAME:$MOUNT_PATH \
        -e POSTGRES_DB="${DB_NAME:-db}" \
        -e POSTGRES_USER="${DB_USERNAME:-postgres}" \
        -e POSTGRES_PASSWORD="${DB_PASSWORD:-postgres}" \
-       postgres:11-alpine \
+       postgres:${CURRENT_VERSION}-alpine \
        /bin/bash -c "chown -R postgres:postgres $MOUNT_PATH \
                 && su - postgres /bin/bash -c \"/usr/local/bin/pg_ctl -D \\\"\$PGDATA\\\" start\" \
                 && mkdir -p \"$BACKUP_DIR\" \
@@ -33,7 +38,7 @@ docker run --rm -v $VOLUME_NAME:$MOUNT_PATH \
        -e POSTGRES_DB="${DB_NAME:-db}" \
        -e POSTGRES_USER="${DB_USERNAME:-postgres}" \
        -e POSTGRES_PASSWORD="${DB_PASSWORD:-postgres}" \
-       postgres:13-alpine \
+       postgres:$NEW_VERSION-alpine \
        /bin/bash -c "ls -la \"$BACKUP_DIR\" \
                 && mkdir -p \"\$PGDATA\" \
                 && chown -R postgres:postgres \"\$PGDATA\" \
@@ -43,3 +48,5 @@ docker run --rm -v $VOLUME_NAME:$MOUNT_PATH \
                 && su - postgres -c \"psql -f $BACKUP_PATH\" \
                 && printf \"\\\nhost all all all md5\\\n\" >> \"\$PGDATA/pg_hba.conf\" \
                 "
+echo "Upgrade finished. Check for bad log messages. If none found, rerun:"
+echo "source ./build.sh && source ./start.sh && source ./bootstrap.sh"

devops/upgrade_pg/upgrade.sh

@@ -287,10 +287,20 @@ def _add_exercise_course_id_and_number_columns_constraint() -> bool:
         db_config.database.commit()
 
 
+def _add_user_course_constaint() -> bool:
+    migrator = db_config.get_migrator_instance()
+    with db_config.database.transaction():
+        migrate(
+            migrator.add_index('usercourse', ('user_id', 'course_id'), True),
+        )
+        db_config.database.commit()
+
+
 def _last_status_view_migration() -> bool:
     Solution = models.Solution
     _migrate_column_in_table_if_needed(Solution, Solution.last_status_view)
     _migrate_column_in_table_if_needed(Solution, Solution.last_time_view)
+    return True
 
 
 def _uuid_migration() -> bool:
@@ -299,25 +309,37 @@ def _uuid_migration() -> bool:
     return True
 
 
+def _assessment_migration() -> bool:
+    Solution = models.Solution
+    _add_not_null_column(Solution, Solution.assessment)
+    return True
+
+
 def main():
     with models.database.connection_context():
         if models.database.table_exists(models.Exercise.__name__.lower()):
             _add_exercise_course_id_and_number_columns_constraint()
 
         if models.database.table_exists(models.Solution.__name__.lower()):
             _last_status_view_migration()
+            _assessment_migration()
 
         if models.database.table_exists(models.User.__name__.lower()):
             _api_keys_migration()
             _last_course_viewed_migration()
             _uuid_migration()
 
+        if models.database.table_exists(models.UserCourse.__name__.lower()):
+            _add_user_course_constaint()
+
         models.database.create_tables(models.ALL_MODELS, safe=True)
 
         if models.Role.select().count() == 0:
             models.create_basic_roles()
         if models.User.select().count() == 0:
             models.create_demo_users()
+        if models.SolutionAssessment.select().count() == 0:
+            models.create_basic_assessments()
         if models.Course.select().count() == 0:
             course = models.create_basic_course()
             _exercise_course_migration(course)