From c8aa462c7a94c1fee690a083955e8549d38d6fe0 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Thu, 16 Jul 2026 11:32:17 -0400 Subject: [PATCH 01/14] added previous fixes into the branch from pos-card-fixes --- app/controllers/main_routes/main_routes.py | 10 ++++----- app/templates/main/departmentPortal.html | 24 ++++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index ec32d4fc..e83e57e4 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -67,20 +67,20 @@ def departmentPortal(org=None,account=None): positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] - posUrl = [] - if not positions: - positionsList = ["No active positions in this department"] + posURL = [] + if positions == []: + pass else: for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posUrl.append(str(i.positionCode)) + posURL.append(str(i.positionCode)) return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positionsList, - posUrl = posUrl) + posURL = posURL) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 173adb3d..1ad252df 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -65,22 +65,20 @@

Positions

and {{ (positions | length) - 7}} more...

+ {% endfor %} + {% if (positions | length) > 7 %} +

and {{ (positions | length) - 7}} more...

+ {% endif %} {% endif %} - {% endfor %} From df65fa4ca62ad1483ce5ca52c226bb1a3a07d5db Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 20 Jul 2026 14:45:01 -0400 Subject: [PATCH 02/14] Revert "Revert position card PR #639" This reverts commit 3e5a529c031e6141fa95b3fa614f4763a92f76d5. --- app/config/contributors.yaml | 3 + app/controllers/main_routes/main_routes.py | 17 +++- app/models/positionHistory.py | 1 + app/static/css/base.css | 27 +++++++ app/static/css/contributors.css | 1 - app/static/css/departmentPortal.css | 31 ++++++++ app/templates/base.html | 20 +++-- app/templates/main/contributors.html | 6 +- app/templates/main/departmentPortal.html | 25 +++--- database/demo_data.py | 91 +++++++++++++++++++--- setup.sh | 10 +++ 11 files changed, 200 insertions(+), 32 deletions(-) create mode 100644 app/static/css/departmentPortal.css diff --git a/app/config/contributors.yaml b/app/config/contributors.yaml index d26cdd36..2a47673c 100755 --- a/app/config/contributors.yaml +++ b/app/config/contributors.yaml @@ -59,4 +59,7 @@ contributors: - name: "Oluwagbayi Makinde" username: "makindeo" year: 2024 + - name: "Bhushan Sah " + username: "sahb" + year: 2029 \ No newline at end of file diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index 43aca3ce..d0991074 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -16,6 +16,8 @@ from app.login_manager import require_login, logout from app.logic.getTableData import getDatatableData from app.logic.banner import Banner +from app.models.positionHistory import PositionHistory + @main_bp.route('/logout', methods=['GET']) def triggerLogout(): @@ -57,7 +59,6 @@ def departmentPortal(org=None,account=None): dept = None - if g.currentUser.isLaborAdmin: departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) else: @@ -66,6 +67,7 @@ def departmentPortal(org=None,account=None): positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] +<<<<<<< HEAD posURL = [] if positions == []: pass @@ -73,13 +75,26 @@ def departmentPortal(org=None,account=None): for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") posURL.append(str(i.positionCode)) +======= + posUrl = [] + if not positions: + positionsList = ["No active positions in this department"] + else: + for i in positions: + positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") + posUrl.append(str(i.positionCode)) +>>>>>>> parent of 3e5a529c (Revert position card PR #639) return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positionsList, +<<<<<<< HEAD posURL = posURL) +======= + posUrl = posUrl) +>>>>>>> parent of 3e5a529c (Revert position card PR #639) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 51467075..9a248aac 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -2,6 +2,7 @@ from app.models.department import Department class PositionHistory(baseModel): + positionTitle = CharField() positionCode = CharField() department = ForeignKeyField(Department) status = CharField() diff --git a/app/static/css/base.css b/app/static/css/base.css index 940f8d6e..812d3c89 100755 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -250,6 +250,7 @@ a { padding: 0.5rem 1rem; background-color: rgba(0, 0, 0, 0.03); border-top: 1px solid rgba(0, 0, 0, 0.125); + margin-top: auto; } .card-footer:last-child { @@ -264,3 +265,29 @@ a { border-top-left-radius: calc(0.25rem - 1px); border-top-right-radius: calc(0.25rem - 1px); } +.site-footer { + position: fixed; + left: 280px; + right: 0; + bottom: 0; + + background-color: #e9ebec; + color: #1e2433; + + padding: 8px 15px; + line-height: 1.4; + box-sizing: border-box; + z-index: 101; + +} + +.sidebar-push { + padding-bottom: 85px; +} + +@media (max-width: 991px) { + .site-footer { + left: 0; + width: 100%; + } +} diff --git a/app/static/css/contributors.css b/app/static/css/contributors.css index 0fe0601b..2f54c122 100755 --- a/app/static/css/contributors.css +++ b/app/static/css/contributors.css @@ -3,7 +3,6 @@ color: #ffffff; padding: 7px 30px; margin-top: 100px; - margin-right: 250px; } .container { top: -75px; diff --git a/app/static/css/departmentPortal.css b/app/static/css/departmentPortal.css new file mode 100644 index 00000000..b563c505 --- /dev/null +++ b/app/static/css/departmentPortal.css @@ -0,0 +1,31 @@ +.card { + border-radius: 1rem; + overflow: hidden; + width: 100%; + height: 100%; + min-width: 100%; + box-shadow: 2px 2px 4px rgba(100, 100, 100, 0.26); +} +.bi-suitcase-lg-fill { /* Bootstrap Icon */ + border: 1px solid #c0c0c0; + border-radius: 8px; + padding: 3px 3.5px 1.5px 3.5px; + font-size: 3rem; + color:#6e6e6e; +} +.card-group { + gap: 1rem; +} +.form-group { + width: 50%; + margin-left: auto ; + margin-right:auto; +} +.card-body { + padding: 1rem 1rem; + min-width: 100% +} +.row { + display: flex; + flex-wrap: wrap; +} \ No newline at end of file diff --git a/app/templates/base.html b/app/templates/base.html index 4d6c2a79..4b982536 100755 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -66,10 +66,20 @@
{% block footer %} -
- Issues? Contact: Systems Support - Created & Designed by the Student Software Development Team -
-{% endblock %} + +{% endblock %} {% endblock %} diff --git a/app/templates/main/contributors.html b/app/templates/main/contributors.html index ffdfe439..af33209d 100755 --- a/app/templates/main/contributors.html +++ b/app/templates/main/contributors.html @@ -23,9 +23,9 @@

Contributors

{% endfor %} -
- -
+
+
+
diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 94df62f4..173adb3d 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -3,6 +3,7 @@ {% block scripts %} {{super()}} + {% endblock %} {% block app_content %} @@ -64,20 +65,22 @@

Positions

and {{ (positions | length) - 7}} more...

- {% endif %} + {% else %} +
  • + {{ p }} +
    • + {% endif %} + + {% elif 7 == loop.index0 %} +

    and {{ (positions | length) - 7}} more...

    {% endif %} + {% endfor %} diff --git a/database/demo_data.py b/database/demo_data.py index de604762..1311a748 100644 --- a/database/demo_data.py +++ b/database/demo_data.py @@ -750,50 +750,119 @@ # Position History ############################# -positionHistory = [ +positionhistory = [ { + "positionTitle": "Student Programmer", "positionCode": "S61407", "status": "Active", "wls": 1, - "revisionDate": f"2025-07-01", + "revisionDate": f"2026-07-01", "description": "", "department": 1 }, { - + "positionTitle": "Research Associate", "positionCode": "S61408", "status": "Active", "wls": 2, - "revisionDate": f"2025-09-01", + "revisionDate": f"2026-09-01", "description": "", "department": 1 }, { + "positionTitle": "Labor Workers", "positionCode": "S61409", "status": "Active", "wls": 3, - "revisionDate": f"2025-07-01", + "revisionDate": f"2026-07-01", "description": "", "department": 1 }, { + "positionTitle": "Teaching Associate", "positionCode": "S61411", "status": "Active", "wls":3, - "revisionDate" : f"2025-01-01", + "revisionDate" : f"2026-01-01", "description": "", "department" : 1 - }, - { + }, + { + "positionTitle": "Teaching Associate", "positionCode": "S61410", "status": "Inactive", "wls":2, - "revisionDate" : f"2025-01-01", + "revisionDate" : f"2026-01-01", + "description": "", + "department" : 3 + }, + { + "positionTitle": "Teaching Associate", + "positionCode": "S61410", + "status": "Active", + "wls":2, + "revisionDate" : f"2026-03-29", + "description": "", + "department" : 3 + }, + { + "positionTitle": "DUMMY POSITION", + "positionCode": "S12345", + "status": "Active", + "wls":3, + "revisionDate" : f"2026-01-23", "description": "", "department" : 1 - }, + }, + { + "positionTitle": "Junior Data Analyst", + "positionCode": "S39568", + "status": "Active", + "wls":4, + "revisionDate" : f"2026-01-31", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Student Manager", + "positionCode": "S74933", + "status": "Active", + "wls":5, + "revisionDate" : f"2026-04-01", + "description": "", + "department" : 1 + }, + { + "positionTitle": "IT Technician", + "positionCode": "S94932", + "status": "Active", + "wls":6, + "revisionDate" : f"2026-05-03", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Human code generator", + "positionCode": "S22222", + "status": "Active", + "wls":1, + "revisionDate" : f"2026-05-03", + "description": "", + "department" : 1 + }, + { + "positionTitle": "Senior Software Engineer", + "positionCode": "S00000", + "status": "Active", + "wls":6, + "revisionDate" : f"2026-05-03", + "description": "", + "department" : 1 + } + + ] -PositionHistory.insert_many(positionHistory).on_conflict_replace().execute() +PositionHistory.insert_many(positionhistory).on_conflict_replace().execute() print(" * position history added") \ No newline at end of file diff --git a/setup.sh b/setup.sh index 895e43b9..c4e43d65 100755 --- a/setup.sh +++ b/setup.sh @@ -39,3 +39,13 @@ export FLASK_APP=app.py # app entry point export APP_ENV=development # default export FLASK_RUN_PORT=8080 # For consistency (python app.py vs flask run) export FLASK_RUN_HOST=0.0.0.0 # To allow external routing to the application + +# Fix symbolic link inside database directory +if ! [ -L "database/app" ]; then + echo "Fixing symlink to app in database directory" + cd database + rm app + ln -s ../app + cd .. +fi + From 00930c4883f6f40c8bc03b7b3af66a55398d8bad Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 20 Jul 2026 14:54:36 -0400 Subject: [PATCH 03/14] re-added fixes to the position card --- app/controllers/main_routes/main_routes.py | 14 ------------ app/templates/main/departmentPortal.html | 26 ++++++++++------------ 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index d0991074..e83e57e4 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -67,7 +67,6 @@ def departmentPortal(org=None,account=None): positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] -<<<<<<< HEAD posURL = [] if positions == []: pass @@ -75,26 +74,13 @@ def departmentPortal(org=None,account=None): for i in positions: positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") posURL.append(str(i.positionCode)) -======= - posUrl = [] - if not positions: - positionsList = ["No active positions in this department"] - else: - for i in positions: - positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posUrl.append(str(i.positionCode)) ->>>>>>> parent of 3e5a529c (Revert position card PR #639) return render_template('main/departmentPortal.html', departments = departments, department = dept, positions = positionsList, -<<<<<<< HEAD posURL = posURL) -======= - posUrl = posUrl) ->>>>>>> parent of 3e5a529c (Revert position card PR #639) @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST']) def addUserToDept(): diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 173adb3d..8385a94e 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -65,24 +65,22 @@

    Positions

      - {% for p in positions %} - {% if 7 > loop.index0 %} - {% if p == "No active positions in this department" %} + {% if positions == [] %} +
    • +

      No active positions in this department

      +
      • + {% else %} + {% for p in positions[:7] %}
    • -

      {{ p }}

      + {{ p }}
      • - {% else %} -
    • - {{ p }} -
      • - {% endif %} - - {% elif 7 == loop.index0 %} -

    and {{ (positions | length) - 7}} more...

    + {% endfor %} + {% if (positions | length) > 7 %} +

    and {{ (positions | length) - 7}} more...

    + {% endif %} {% endif %} - {% endfor %} - +
    View All Positions From 88b5786dbb05ae14032e2601f7da958f21f09f55 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 20 Jul 2026 15:52:54 -0400 Subject: [PATCH 04/14] fixed position card html formatting --- app/templates/main/departmentPortal.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 8385a94e..996c63e8 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -54,11 +54,11 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e
    -
    - -
    +
    + +

    Positions

    From ddaa864ee8868b27281ee2e5091d305717832970 Mon Sep 17 00:00:00 2001 From: fritzj2 Date: Mon, 20 Jul 2026 16:02:41 -0400 Subject: [PATCH 05/14] fixed positionHistory peewee query formatting --- app/controllers/main_routes/main_routes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index e83e57e4..d3e34819 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -65,7 +65,9 @@ def departmentPortal(org=None,account=None): departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - positions = list(PositionHistory.select().where(PositionHistory.department == dept, PositionHistory.status == "Active").order_by(PositionHistory.positionTitle.asc())) if dept else [] + positions = list(PositionHistory.select() + .where(PositionHistory.department == dept, PositionHistory.status == "Active") + .order_by(PositionHistory.positionTitle.asc())) if dept else [] positionsList = [] posURL = [] if positions == []: From 69596d8f2d5031a20242688361674de025674ce9 Mon Sep 17 00:00:00 2001 From: lolongaj Date: Tue, 21 Jul 2026 10:17:18 -0400 Subject: [PATCH 06/14] created a logic file for getting active positions --- app/controllers/main_routes/main_routes.py | 15 ++------------- app/logic/getPositions.py | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 app/logic/getPositions.py diff --git a/app/controllers/main_routes/main_routes.py b/app/controllers/main_routes/main_routes.py index d3e34819..88651a11 100755 --- a/app/controllers/main_routes/main_routes.py +++ b/app/controllers/main_routes/main_routes.py @@ -17,6 +17,7 @@ from app.logic.getTableData import getDatatableData from app.logic.banner import Banner from app.models.positionHistory import PositionHistory +from app.logic.getPositions import getActivePositions @main_bp.route('/logout', methods=['GET']) @@ -64,19 +65,7 @@ def departmentPortal(org=None,account=None): else: departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc())) - - positions = list(PositionHistory.select() - .where(PositionHistory.department == dept, PositionHistory.status == "Active") - .order_by(PositionHistory.positionTitle.asc())) if dept else [] - positionsList = [] - posURL = [] - if positions == []: - pass - else: - for i in positions: - positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posURL.append(str(i.positionCode)) - + positionsList, posURL = getActivePositions(dept) return render_template('main/departmentPortal.html', departments = departments, diff --git a/app/logic/getPositions.py b/app/logic/getPositions.py new file mode 100644 index 00000000..5c32a199 --- /dev/null +++ b/app/logic/getPositions.py @@ -0,0 +1,15 @@ +from app.models.positionHistory import PositionHistory + +def getActivePositions(dept): + positions = list(PositionHistory.select() + .where(PositionHistory.department == dept, PositionHistory.status == "Active") + .order_by(PositionHistory.positionTitle.asc())) if dept else [] + positionsList = [] + posURL = [] + if positions == []: + pass + else: + for i in positions: + positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") + posURL.append(str(i.positionCode)) + return positionsList, posURL \ No newline at end of file From acf93dca48fcb73b2c39a431b84863a232f41dc6 Mon Sep 17 00:00:00 2001 From: lolongaj Date: Tue, 21 Jul 2026 15:02:29 -0400 Subject: [PATCH 07/14] fixed the minor changes --- app/templates/main/departmentPortal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/main/departmentPortal.html b/app/templates/main/departmentPortal.html index 996c63e8..91326fb9 100644 --- a/app/templates/main/departmentPortal.html +++ b/app/templates/main/departmentPortal.html @@ -60,7 +60,7 @@

    {% if department %} {{department.DEPT_NAME}} Portal {% e

    -

    Positions

    +

    Positions

    @@ -76,7 +76,7 @@

    Positions

    {% endfor %} {% if (positions | length) > 7 %} -

    and {{ (positions | length) - 7}} more...

    +

    and {{ (positions | length) - 7}} more ...

    {% endif %} {% endif %} From 66432d69655d0fae02ac0f8655508910a23b86fa Mon Sep 17 00:00:00 2001 From: lolongaj Date: Tue, 21 Jul 2026 15:47:11 -0400 Subject: [PATCH 08/14] create the test_getPositions.py --- tests/code/test_getPositions.py | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 tests/code/test_getPositions.py diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py new file mode 100644 index 00000000..28aa80f9 --- /dev/null +++ b/tests/code/test_getPositions.py @@ -0,0 +1,88 @@ +import pytest +from app.models import mainDB +from app.models.department import Department +from app.models.positionHistory import PositionHistory +from app.logic.getPositions import getActivePositions + +@pytest.mark.integration +def test_getActivePositions(): + with mainDB.atomic() as transaction: + dept1 = Department.create(departmentID=1, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) + + position1 = PositionHistory.create(positionTitle="Teaching Assistant", + positionCode="S34512", + department=dept1, + status="Active", + wls=4, + revisionDate="2023-01-01", + description="") + + position2 = PositionHistory.create(positionTitle="Research Assistant", + positionCode="S34513", + department=dept1, + status="Inactive", + wls=3, + revisionDate="2023-01-01", + description="") + + position3 = PositionHistory.create(positionTitle="Lab Assistant", + positionCode="S34514", + department=dept1, + status="Active", + wls=2, + revisionDate="2023-01-01", + description="") + + position4 = PositionHistory.create(positionTitle="Intern", + positionCode="S34515", + department=dept1, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + positionsList, posURL = getActivePositions(dept1) + + # Check that only active positions are returned + assert len(positionsList) == 3 + assert len(posURL) == 3 + + # Check if position list is returned in alphabetical order + assert positionsList[0] == "Intern: (WLS 1)" + assert positionsList[1] == "Lab Assistant: (WLS 2)" + assert positionsList[2] == "Teaching Assistant: (WLS 4)" + + # Check if the inactive position is not included in the results + assert "Research Assistant: (WLS 3)" not in positionsList + + # Check if posURL contains the correct position codes in the same order as positionsList + assert posURL[0] == "S34515" # Intern + assert posURL[1] == "S34514" # Lab Assistant + assert posURL[2] == "S34512" # Teaching Assistant + + transaction.rollback() + +@pytest.mark.integration +def test_checkNoPosition_In_department(): + with mainDB.atomic() as transaction: + dept2 = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) + + positionsList, posURL = getActivePositions(dept2) + + # Check that no positions are returned for a department with no positions + assert len(positionsList) == 0 + assert len(posURL) == 0 + + transaction.rollback() + +# what if there the department is None? +def test_checkNoDepartment(): +# checks when dept is None (that is similar to when Department.get raises DoesNotExist) + with mainDB.atomic() as transaction: + positionsList, posURL = getActivePositions(None) + + # Check that no positions are returned when department is None + assert len(positionsList) == 0 + assert len(posURL) == 0 + + transaction.rollback() From 8874b4d71e834b54acbf1aa560a6883c1e9a8988 Mon Sep 17 00:00:00 2001 From: ACBerea Date: Tue, 21 Jul 2026 17:21:32 -0400 Subject: [PATCH 09/14] Improved test suite and commented on temporary test results until all tests pass. --- tests/code/test_getPositions.py | 101 ++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 5 deletions(-) diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index 28aa80f9..49fc808b 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -5,7 +5,10 @@ from app.logic.getPositions import getActivePositions @pytest.mark.integration -def test_getActivePositions(): +def test_getActivePositions(): # Test results in duplicate errors. + """ + + """ with mainDB.atomic() as transaction: dept1 = Department.create(departmentID=1, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) @@ -60,14 +63,20 @@ def test_getActivePositions(): assert posURL[1] == "S34514" # Lab Assistant assert posURL[2] == "S34512" # Teaching Assistant + # Check if the inactive position code is not included in posURL + assert "S34513" not in posURL # Research Assistant + transaction.rollback() @pytest.mark.integration -def test_checkNoPosition_In_department(): +def test_checkNoPositionInDepartment(): # Test results in duplicate errors. + """ + + """ with mainDB.atomic() as transaction: - dept2 = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) + dept5 = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) - positionsList, posURL = getActivePositions(dept2) + positionsList, posURL = getActivePositions(dept5) # Check that no positions are returned for a department with no positions assert len(positionsList) == 0 @@ -76,7 +85,11 @@ def test_checkNoPosition_In_department(): transaction.rollback() # what if there the department is None? -def test_checkNoDepartment(): +@pytest.mark.integration +def test_checkNoDepartment(): # Test passes. + """ + + """ # checks when dept is None (that is similar to when Department.get raises DoesNotExist) with mainDB.atomic() as transaction: positionsList, posURL = getActivePositions(None) @@ -86,3 +99,81 @@ def test_checkNoDepartment(): assert len(posURL) == 0 transaction.rollback() + +@pytest.mark.integration +def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. + with mainDB.atomic() as transaction: + deptA = Department.create(departmentID=1, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) + deptB = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) + deptC = Department.create(departmentID=3, DEPT_NAME="Physics", ACCOUNT="6742", ORG="2116", departmentCompliance=True, isActive=True) + deptD = Department.create(departmentID=4, DEPT_NAME="Chemistry", ACCOUNT="6743", ORG="2117", departmentCompliance=True, isActive=True) + + position5 = PositionHistory.create(positionTitle="Teaching Assistant", + positionCode="S34522", + department=deptA, + status="Active", + wls=4, + revisionDate="2023-01-01", + description="") + + position5Dup = PositionHistory.create(positionTitle="Teaching Assistant", # Duplicate active position in the same department (Unsure if this should count as 1 or 2 active positions (Double Check with the team)) + positionCode="S34522", + department=deptA, + status="Active", + wls=4, + revisionDate="2023-01-01", + description="") + + position6 = PositionHistory.create(positionTitle="Research Assistant", + positionCode="S34523", + department=deptB, + status="Active", + wls=3, + revisionDate="2023-01-01", + description="") + + position5DepartmentBCopy = PositionHistory.create(positionTitle="Teaching Assistant", + positionCode="S34522", + department=deptB, + status="Active", + wls=4, + revisionDate="2023-01-01", + description="") + + position7 = PositionHistory.create(positionTitle="Lab Assistant", + positionCode="S34524", + department=deptC, + status="Active", + wls=2, + revisionDate="2023-01-01", + description="") + + position8 = PositionHistory.create(positionTitle="Intern", + positionCode="S34525", + department=deptD, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + positionsListA, posURLA = getActivePositions(deptA) + positionsListB, posURLB = getActivePositions(deptB) + positionsListC, posURLC = getActivePositions(deptC) + positionsListD, posURLD = getActivePositions(deptD) + + # Check that the correct number of active positions are returned for each department + assert len(positionsListA) == 2 # Has a duplicate active position, should return 2 unique active positions + assert len(posURLA) == 2 + + # Check if two different departments with the same position title and code are counted as separate active positions for each department. + assert len(positionsListB) == 2 # Has a duplicate active position with another department, should still return 2 unique active positions (Organized by Department) + assert len(posURLB) == 2 + + assert len(positionsListC) == 1 + assert len(posURLC) == 1 + + assert len(positionsListD) == 1 + assert len(posURLD) == 1 + + + transaction.rollback() \ No newline at end of file From 2fa2ee41a51821be497de4aa9c5f963634e86040 Mon Sep 17 00:00:00 2001 From: lolongaj Date: Wed, 22 Jul 2026 11:21:25 -0400 Subject: [PATCH 10/14] fixed tests that were failing --- tests/code/test_getPositions.py | 50 ++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index 49fc808b..5d5d6155 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -10,7 +10,7 @@ def test_getActivePositions(): # Test results in duplicate errors. """ with mainDB.atomic() as transaction: - dept1 = Department.create(departmentID=1, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) + dept1 = Department.create(departmentID=100, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) position1 = PositionHistory.create(positionTitle="Teaching Assistant", positionCode="S34512", @@ -74,7 +74,7 @@ def test_checkNoPositionInDepartment(): # Test results in duplicate errors. """ with mainDB.atomic() as transaction: - dept5 = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) + dept5 = Department.create(departmentID=101, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) positionsList, posURL = getActivePositions(dept5) @@ -103,10 +103,10 @@ def test_checkNoDepartment(): # Test passes. @pytest.mark.integration def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. with mainDB.atomic() as transaction: - deptA = Department.create(departmentID=1, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) - deptB = Department.create(departmentID=2, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) - deptC = Department.create(departmentID=3, DEPT_NAME="Physics", ACCOUNT="6742", ORG="2116", departmentCompliance=True, isActive=True) - deptD = Department.create(departmentID=4, DEPT_NAME="Chemistry", ACCOUNT="6743", ORG="2117", departmentCompliance=True, isActive=True) + deptA = Department.create(departmentID=102, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) + deptB = Department.create(departmentID=103, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) + deptC = Department.create(departmentID=104, DEPT_NAME="Physics", ACCOUNT="6742", ORG="2116", departmentCompliance=True, isActive=True) + deptD = Department.create(departmentID=105, DEPT_NAME="Chemistry", ACCOUNT="6743", ORG="2117", departmentCompliance=True, isActive=True) position5 = PositionHistory.create(positionTitle="Teaching Assistant", positionCode="S34522", @@ -119,10 +119,26 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. position5Dup = PositionHistory.create(positionTitle="Teaching Assistant", # Duplicate active position in the same department (Unsure if this should count as 1 or 2 active positions (Double Check with the team)) positionCode="S34522", department=deptA, + status="Inactive", + wls=4, + revisionDate="2023-01-01", + description="") + + position9 = PositionHistory.create(positionTitle="Teaching Assistant", + positionCode="S34526", + department=deptA, status="Active", wls=4, revisionDate="2023-01-01", description="") + + # position5DepartmentBCopy = PositionHistory.create(positionTitle="Book Handler", + # positionCode="S34522", + # department=deptB, + # status="Active", + # wls=4, + # revisionDate="2023-01-01", + # description="") position6 = PositionHistory.create(positionTitle="Research Assistant", positionCode="S34523", @@ -132,14 +148,6 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. revisionDate="2023-01-01", description="") - position5DepartmentBCopy = PositionHistory.create(positionTitle="Teaching Assistant", - positionCode="S34522", - department=deptB, - status="Active", - wls=4, - revisionDate="2023-01-01", - description="") - position7 = PositionHistory.create(positionTitle="Lab Assistant", positionCode="S34524", department=deptC, @@ -151,7 +159,7 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. position8 = PositionHistory.create(positionTitle="Intern", positionCode="S34525", department=deptD, - status="Active", + status="Inactive", wls=1, revisionDate="2023-01-01", description="") @@ -166,14 +174,18 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. assert len(posURLA) == 2 # Check if two different departments with the same position title and code are counted as separate active positions for each department. - assert len(positionsListB) == 2 # Has a duplicate active position with another department, should still return 2 unique active positions (Organized by Department) - assert len(posURLB) == 2 + assert len(positionsListB) == 1# Has a duplicate active position with another department, should still return 1 unique active positions (Organized by Department) + assert len(posURLB) == 1 assert len(positionsListC) == 1 assert len(posURLC) == 1 - assert len(positionsListD) == 1 - assert len(posURLD) == 1 + assert len(positionsListD) == 0 + assert len(posURLD) == 0 + + # Check if the different departments can not have same position code + # assert "Book Handler: (WLS 4)" not in positionsListB + transaction.rollback() \ No newline at end of file From b770258c43546a7a5077f9a07fd98758c023bad8 Mon Sep 17 00:00:00 2001 From: ACBerea Date: Wed, 22 Jul 2026 13:38:07 -0400 Subject: [PATCH 11/14] Fixed comments and added new docstrings. --- tests/code/test_getPositions.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index 5d5d6155..4e6f326c 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -5,9 +5,9 @@ from app.logic.getPositions import getActivePositions @pytest.mark.integration -def test_getActivePositions(): # Test results in duplicate errors. +def test_getActivePositions(): """ - + Test to check if the getActivePositions function in getPositions.py correctly retrieves active positions for a single department. """ with mainDB.atomic() as transaction: dept1 = Department.create(departmentID=100, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) @@ -69,9 +69,10 @@ def test_getActivePositions(): # Test results in duplicate errors. transaction.rollback() @pytest.mark.integration -def test_checkNoPositionInDepartment(): # Test results in duplicate errors. +def test_checkNoPositionInDepartment(): """ - + Checks the behavior of getActivePositions when there are no positions in the department. + It should return empty lists for both positionsList and posURL, indicating that no positions are available for the department. """ with mainDB.atomic() as transaction: dept5 = Department.create(departmentID=101, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) @@ -88,7 +89,8 @@ def test_checkNoPositionInDepartment(): # Test results in duplicate errors. @pytest.mark.integration def test_checkNoDepartment(): # Test passes. """ - + Checks the behavior of getActivePositions when the department is None. + It should return empty lists for both positionsList and posURL, indicating that no positions are available for a non-existent department. """ # checks when dept is None (that is similar to when Department.get raises DoesNotExist) with mainDB.atomic() as transaction: @@ -101,7 +103,10 @@ def test_checkNoDepartment(): # Test passes. transaction.rollback() @pytest.mark.integration -def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. +def test_checkPositionDuplicates(): # Test results in duplicate errors. + """ + Test to check if the function correctly handles duplicate position codes within the same department and duplicate elements across different departments. + """ with mainDB.atomic() as transaction: deptA = Department.create(departmentID=102, DEPT_NAME="Computer Science", ACCOUNT="6740", ORG="2114", departmentCompliance=True, isActive=True) deptB = Department.create(departmentID=103, DEPT_NAME="Mathematics", ACCOUNT="6741", ORG="2115", departmentCompliance=True, isActive=True) @@ -116,7 +121,7 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. revisionDate="2023-01-01", description="") - position5Dup = PositionHistory.create(positionTitle="Teaching Assistant", # Duplicate active position in the same department (Unsure if this should count as 1 or 2 active positions (Double Check with the team)) + position5Dup = PositionHistory.create(positionTitle="Teaching Assistant", # Duplicate position from the same department, but with a different status (Inactive). positionCode="S34522", department=deptA, status="Inactive", @@ -170,11 +175,11 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. positionsListD, posURLD = getActivePositions(deptD) # Check that the correct number of active positions are returned for each department - assert len(positionsListA) == 2 # Has a duplicate active position, should return 2 unique active positions + assert len(positionsListA) == 2 # Has a duplicate position name, should return 2 unique active positions due to unique position codes. assert len(posURLA) == 2 - # Check if two different departments with the same position title and code are counted as separate active positions for each department. - assert len(positionsListB) == 1# Has a duplicate active position with another department, should still return 1 unique active positions (Organized by Department) + # Check if two different departments with the same position code are counted as separate active positions for each department. + assert len(positionsListB) == 1 assert len(posURLB) == 1 assert len(positionsListC) == 1 @@ -183,9 +188,4 @@ def test_checkPositionAcrossDepartments(): # Test results in duplicate errors. assert len(positionsListD) == 0 assert len(posURLD) == 0 - # Check if the different departments can not have same position code - # assert "Book Handler: (WLS 4)" not in positionsListB - - - transaction.rollback() \ No newline at end of file From 8ec23c72f8380d2cfe736fe50fc22ae07e71a2e6 Mon Sep 17 00:00:00 2001 From: ACBerea Date: Wed, 22 Jul 2026 15:30:39 -0400 Subject: [PATCH 12/14] Adjusted query to account for the same position codes across departments and improved test suite. --- app/logic/getPositions.py | 44 +++++-- tests/code/test_getPositions.py | 206 ++++++++++++++++++++++++++++++-- 2 files changed, 234 insertions(+), 16 deletions(-) diff --git a/app/logic/getPositions.py b/app/logic/getPositions.py index 5c32a199..76cd8745 100644 --- a/app/logic/getPositions.py +++ b/app/logic/getPositions.py @@ -1,15 +1,45 @@ from app.models.positionHistory import PositionHistory def getActivePositions(dept): + """ + Returns a list of active positions for a given department, along with their corresponding position codes. + The function filters out duplicate position codes within the same department and ensures that a position code can only be Active in ONE place at a time. + """ + if not dept: + return [], [] + positions = list(PositionHistory.select() .where(PositionHistory.department == dept, PositionHistory.status == "Active") - .order_by(PositionHistory.positionTitle.asc())) if dept else [] + .order_by(PositionHistory.positionTitle.asc())) + positionsList = [] posURL = [] - if positions == []: - pass - else: - for i in positions: - positionsList.append(i.positionTitle + ": " + "(WLS " + str(i.wls) + ")") - posURL.append(str(i.positionCode)) + seenCodes = set() + # Iterate through the positions and filter out duplicates based on positionCode and department + for pos in positions: + code = pos.positionCode + + # Same dept returned two Active rows with the same code (shouldn't normally happen, but guards against bad data) -> skip the duplicate + if code in seenCodes: + continue + + # Enforces: A positionCode can only be Active in ONE place at a time, regardless of department or revisionDate. + # If an earlier-created Active row with this code exists in a DIFFERENT department, this one loses. + claimedElsewhere = (PositionHistory + .select() + .where( + PositionHistory.positionCode == code, + PositionHistory.status == "Active", + PositionHistory.department != dept, + PositionHistory.id < pos.id # Uses PeeWee's auto-incrementing ID to determine which row was created first. + ) + .exists()) + + if claimedElsewhere: + continue + + seenCodes.add(code) # Mark this code as seen for the current department to avoid duplicates + positionsList.append(pos.positionTitle + ": " + "(WLS " + str(pos.wls) + ")") + posURL.append(str(pos.positionCode)) + return positionsList, posURL \ No newline at end of file diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index 4e6f326c..955e1b90 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -33,7 +33,7 @@ def test_getActivePositions(): department=dept1, status="Active", wls=2, - revisionDate="2023-01-01", + revisionDate="2026-01-01", description="") position4 = PositionHistory.create(positionTitle="Intern", @@ -136,14 +136,17 @@ def test_checkPositionDuplicates(): # Test results in duplicate errors. wls=4, revisionDate="2023-01-01", description="") - - # position5DepartmentBCopy = PositionHistory.create(positionTitle="Book Handler", - # positionCode="S34522", - # department=deptB, - # status="Active", - # wls=4, - # revisionDate="2023-01-01", - # description="") + + # Note: position5DepartmentBCopy intentionally uses a different revisionDate + # (2026-01-01) than position5 (2023-01-01) to confirm revisionDate does NOT + # factor into which department keeps a contested positionCode. + position5DepartmentBCopy = PositionHistory.create(positionTitle="Book Handler", + positionCode="S34522", + department=deptB, + status="Active", + wls=4, + revisionDate="2026-01-01", + description="") position6 = PositionHistory.create(positionTitle="Research Assistant", positionCode="S34523", @@ -169,6 +172,7 @@ def test_checkPositionDuplicates(): # Test results in duplicate errors. revisionDate="2023-01-01", description="") + # Get the active positions for each department positionsListA, posURLA = getActivePositions(deptA) positionsListB, posURLB = getActivePositions(deptB) positionsListC, posURLC = getActivePositions(deptC) @@ -179,6 +183,7 @@ def test_checkPositionDuplicates(): # Test results in duplicate errors. assert len(posURLA) == 2 # Check if two different departments with the same position code are counted as separate active positions for each department. + # The position with code "S34522" is active in department A, so it should not be counted as active in department B. assert len(positionsListB) == 1 assert len(posURLB) == 1 @@ -188,4 +193,187 @@ def test_checkPositionDuplicates(): # Test results in duplicate errors. assert len(positionsListD) == 0 assert len(posURLD) == 0 + # Check that the correct position titles and codes are returned for department B and A (Focused on the contested position code "S34522" due to the duplicate across departments) + assert "Research Assistant: (WLS 3)" in positionsListB + assert "Book Handler: (WLS 4)" not in positionsListB + assert "Book Handler: (WLS 4)" not in positionsListA + assert "S34523" in posURLB + assert "S34522" not in posURLB + transaction.rollback() + +@pytest.mark.integration +def test_checkPositionClaimOrderIndependentOfDeptOrder(): # FAILS + """ + + """ + with mainDB.atomic() as transaction: + deptA = Department.create(departmentID=106, + DEPT_NAME="Biology", + ACCOUNT="6744", + ORG="2118", + departmentCompliance=True, + isActive=True) + + deptB = Department.create(departmentID=107, + DEPT_NAME="History", + ACCOUNT="6745", + ORG="2119", + departmentCompliance=True, + isActive=True) + + # deptB's row is created FIRST + positionB = PositionHistory.create(positionTitle="Archivist", + positionCode="S99001", + department=deptB, + status="Active", wls=2, + revisionDate="2023-01-01", + description="") + + positionA = PositionHistory.create(positionTitle="Curator", + positionCode="S99001", + department=deptA, + status="Active", + wls=2, + revisionDate="2023-01-01", + description="") + + positionsListA, posURLA = getActivePositions(deptA) + positionsListB, posURLB = getActivePositions(deptB) + + # deptB claimed the code first therefore deptA should lose it, not deptB + assert len(positionsListA) == 0 + assert len(positionsListB) == 1 + assert "Archivist: (WLS 2)" in positionsListB + + transaction.rollback() + +@pytest.mark.integration +def test_checkDuplicateActiveWithinSameDepartment(): + """ + + """ + with mainDB.atomic() as transaction: + dept = Department.create(departmentID=108, + DEPT_NAME="Art", + ACCOUNT="6746", + ORG="2120", + departmentCompliance=True, + isActive=True) + + # Create two active positions with the same code in the same department + pos1 = PositionHistory.create(positionTitle="Assistant A", + positionCode="S99002", + department=dept, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + pos2 = PositionHistory.create(positionTitle="Assistant B", + positionCode="S99002", + department=dept, + status="Active", + wls=1, + revisionDate="2023-06-01", + description="") + + positionsList, posURL = getActivePositions(dept) + + # Only one should be counted despite two Active rows with the same code + assert len(positionsList) == 1 + assert len(posURL) == 1 + + transaction.rollback() + +@pytest.mark.integration +def test_checkThreeWayPositionCodeConflict(): # FAILS + """ + + """ + with mainDB.atomic() as transaction: + deptA = Department.create(departmentID=109, + DEPT_NAME="Physics2", + ACCOUNT="6747", + ORG="2121", + departmentCompliance=True, + isActive=True) + + deptB = Department.create(departmentID=110, + DEPT_NAME="Chem2", + ACCOUNT="6748", + ORG="2122", + departmentCompliance=True, + isActive=True) + + deptC = Department.create(departmentID=111, + DEPT_NAME="Bio2", + ACCOUNT="6749", + ORG="2123", + departmentCompliance=True, + isActive=True) + + # Create three active positions with the same code in different departments + posA = PositionHistory.create(positionTitle="First Claim", + positionCode="S99003", + department=deptA, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + posB = PositionHistory.create(positionTitle="Second Claim", + positionCode="S99003", + department=deptB, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + posC = PositionHistory.create(positionTitle="Third Claim", + positionCode="S99003", + department=deptC, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + listA, urlA = getActivePositions(deptA) + listB, urlB = getActivePositions(deptB) + listC, urlC = getActivePositions(deptC) + + assert len(listA) == 1 # only the first-created claim survives + assert len(listB) == 0 + assert len(listC) == 0 + + transaction.rollback() + +@pytest.mark.integration +def test_checkInactiveElsewhereDoesNotBlockActiveClaim(): + with mainDB.atomic() as transaction: + deptA = Department.create(departmentID=114, DEPT_NAME="Geology", ACCOUNT="6752", ORG="2126", departmentCompliance=True, isActive=True) + deptB = Department.create(departmentID=115, DEPT_NAME="Astronomy", ACCOUNT="6753", ORG="2127", departmentCompliance=True, isActive=True) + + # Create an inactive position in deptA and an active position in deptB with the same code + PositionHistory.create(positionTitle="Old Role", + positionCode="S99005", + department=deptA, + status="Inactive", + wls=1, + revisionDate="2020-01-01", + description="") + + PositionHistory.create(positionTitle="Current Role", + positionCode="S99005", + department=deptB, + status="Active", + wls=1, + revisionDate="2023-01-01", + description="") + + listB, urlB = getActivePositions(deptB) + + # deptA's row is Inactive, so it should never block deptB's Active claim + assert len(listB) == 1 + assert "Current Role: (WLS 1)" in listB + transaction.rollback() \ No newline at end of file From b5bea1cfad2e5558aa998fef274a8e63e60d281f Mon Sep 17 00:00:00 2001 From: ACBerea Date: Wed, 22 Jul 2026 16:29:01 -0400 Subject: [PATCH 13/14] Changed positionHistory.py index to no longer create a uniqueness constrant. (The constraint was stopping multiple of the same revision dates from exisiting.) Added empty docstring to fill in future commit in test suite. --- app/models/positionHistory.py | 2 +- tests/code/test_getPositions.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/positionHistory.py b/app/models/positionHistory.py index 9a248aac..fd129c76 100644 --- a/app/models/positionHistory.py +++ b/app/models/positionHistory.py @@ -11,5 +11,5 @@ class PositionHistory(baseModel): description = TextField(default=None) class Meta: - indexes = ( (('positionCode', 'revisionDate', 'status'), True), ) + indexes = ( (('positionCode', 'revisionDate', 'status'), False), ) diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index 955e1b90..d82c6ae9 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -349,6 +349,9 @@ def test_checkThreeWayPositionCodeConflict(): # FAILS @pytest.mark.integration def test_checkInactiveElsewhereDoesNotBlockActiveClaim(): + """ + + """ with mainDB.atomic() as transaction: deptA = Department.create(departmentID=114, DEPT_NAME="Geology", ACCOUNT="6752", ORG="2126", departmentCompliance=True, isActive=True) deptB = Department.create(departmentID=115, DEPT_NAME="Astronomy", ACCOUNT="6753", ORG="2127", departmentCompliance=True, isActive=True) From 39f0fa123fa38fb5b811c626eee20638a761e1d7 Mon Sep 17 00:00:00 2001 From: ACBerea Date: Wed, 22 Jul 2026 16:46:06 -0400 Subject: [PATCH 14/14] Added docstrings to functions that lacked them in test_getPositions.py --- tests/code/test_getPositions.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/code/test_getPositions.py b/tests/code/test_getPositions.py index d82c6ae9..6897c1d8 100644 --- a/tests/code/test_getPositions.py +++ b/tests/code/test_getPositions.py @@ -87,7 +87,7 @@ def test_checkNoPositionInDepartment(): # what if there the department is None? @pytest.mark.integration -def test_checkNoDepartment(): # Test passes. +def test_checkNoDepartment(): """ Checks the behavior of getActivePositions when the department is None. It should return empty lists for both positionsList and posURL, indicating that no positions are available for a non-existent department. @@ -103,7 +103,7 @@ def test_checkNoDepartment(): # Test passes. transaction.rollback() @pytest.mark.integration -def test_checkPositionDuplicates(): # Test results in duplicate errors. +def test_checkPositionDuplicates(): """ Test to check if the function correctly handles duplicate position codes within the same department and duplicate elements across different departments. """ @@ -202,9 +202,10 @@ def test_checkPositionDuplicates(): # Test results in duplicate errors. transaction.rollback() @pytest.mark.integration -def test_checkPositionClaimOrderIndependentOfDeptOrder(): # FAILS +def test_checkPositionClaimOrderIndependentOfDeptOrder(): """ - + Checks that the order of department creation does not affect which department receives a contested position code. + The department that created the position first (based on the auto-incrementing ID) should be the one that retains the active position, regardless of the order in which departments were created. """ with mainDB.atomic() as transaction: deptA = Department.create(departmentID=106, @@ -250,7 +251,8 @@ def test_checkPositionClaimOrderIndependentOfDeptOrder(): # FAILS @pytest.mark.integration def test_checkDuplicateActiveWithinSameDepartment(): """ - + Checks that if the same department has two active positions with the same position code, only one of them is counted in the results. + This test ensures that the function correctly filters out duplicates based on position code within the same department """ with mainDB.atomic() as transaction: dept = Department.create(departmentID=108, @@ -286,9 +288,10 @@ def test_checkDuplicateActiveWithinSameDepartment(): transaction.rollback() @pytest.mark.integration -def test_checkThreeWayPositionCodeConflict(): # FAILS +def test_checkThreeWayPositionCodeConflict(): """ - + Checks that if three different departments have active positions with the same position code, + only the department that created the position first (based on the auto-incrementing ID) retains the active position. """ with mainDB.atomic() as transaction: deptA = Department.create(departmentID=109, @@ -350,7 +353,7 @@ def test_checkThreeWayPositionCodeConflict(): # FAILS @pytest.mark.integration def test_checkInactiveElsewhereDoesNotBlockActiveClaim(): """ - + Checks that if a department has an inactive position with a certain position code, it does not block another department from claiming that position code as active. """ with mainDB.atomic() as transaction: deptA = Department.create(departmentID=114, DEPT_NAME="Geology", ACCOUNT="6752", ORG="2126", departmentCompliance=True, isActive=True)