Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release prior to demo #254

Closed
wants to merge 139 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
ddf10e3
Fixed several Deepsource errors.
youssefr26 Oct 4, 2024
45ea5d5
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 4, 2024
23c90b9
Start of opportunity routes
SarahWohlford Oct 4, 2024
ad22653
Need to merge.
youssefr26 Oct 4, 2024
33841f5
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 4, 2024
e1c5a77
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 8, 2024
bc2c939
213 fix deepsource errors (#216)
RafaelCenzano Oct 8, 2024
d485cbd
updated test_user.py
athalm Oct 10, 2024
7dc9d96
updated test_opportunity.py
athalm Oct 10, 2024
94faf17
updated test_majors.py
athalm Oct 10, 2024
17cd39d
update test_departments.py
athalm Oct 10, 2024
7e24cda
update test_general.py
athalm Oct 10, 2024
684091d
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 11, 2024
fcceb0c
start of routes
SarahWohlford Oct 11, 2024
a8e851e
Merge branch 'CleanUp' of https://github.com/LabConnect-RCOS/LabConne…
SarahWohlford Oct 11, 2024
fc69e4a
Merge branch 'CleanUp' of https://github.com/LabConnect-RCOS/LabConne…
SarahWohlford Oct 11, 2024
afcf18c
Setup db to use postgres
RafaelCenzano Oct 12, 2024
740fd0f
add new columns for profile page
RafaelCenzano Oct 12, 2024
c957e49
clean up auth routes
RafaelCenzano Oct 12, 2024
ba4cb63
fix up profile page
RafaelCenzano Oct 12, 2024
b1aa622
Create new function to format credits
RafaelCenzano Oct 12, 2024
31913f7
fix profile page result with names
RafaelCenzano Oct 12, 2024
2b0e7bd
complete function to return data for user opportunities
RafaelCenzano Oct 12, 2024
b070d79
Update db image
RafaelCenzano Oct 12, 2024
6585473
Run black
RafaelCenzano Oct 12, 2024
fdddb0a
rename to not redefine a builtin function
RafaelCenzano Oct 12, 2024
474d2e1
Profile page (#221)
RafaelCenzano Oct 12, 2024
516ab29
Fixed syntax error
youssefr26 Oct 15, 2024
979679a
Merge branch 'CleanUp' of https://github.com/LabConnect-RCOS/LabConne…
youssefr26 Oct 15, 2024
4d4ad21
Commit to pull
youssefr26 Oct 15, 2024
4dc1bfa
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 15, 2024
0439264
End opportunity_routes
SarahWohlford Oct 15, 2024
b26b3e2
Merge branch 'CleanUp' of https://github.com/LabConnect-RCOS/LabConne…
SarahWohlford Oct 15, 2024
3477e6d
Update DB diagram
RafaelCenzano Oct 16, 2024
edd86e4
Update models to include more data for the departments and update rel…
RafaelCenzano Oct 16, 2024
4af4709
Updated db init test data for testing to match the new db design
RafaelCenzano Oct 16, 2024
4fb56a3
2 new migrations for new db changes
RafaelCenzano Oct 16, 2024
00bc21d
Update routes for departments
RafaelCenzano Oct 16, 2024
5055ce5
Create department routes (#222)
RafaelCenzano Oct 16, 2024
8e58ff1
update test_opportunities_filtering.py
athalm Oct 18, 2024
bfdd042
update test_lab_manager.py
athalm Oct 18, 2024
c8a5aa4
update test_errors.py
athalm Oct 18, 2024
0127a68
update test_courses.py
athalm Oct 18, 2024
1af3deb
Opportunity_routes small fix
SarahWohlford Oct 18, 2024
08d65e8
Fixed getOpportunityCards route
youssefr26 Oct 18, 2024
1517152
Fixed createOpportunity route
youssefr26 Oct 22, 2024
a3953b6
Add token blacklist set for future things
RafaelCenzano Oct 23, 2024
89564f6
update CORS to allow calls from frontend
RafaelCenzano Oct 23, 2024
51bbabf
add testing branches for auth items
RafaelCenzano Oct 23, 2024
b5271f2
rename route
RafaelCenzano Oct 23, 2024
5d9504d
isort and black formatting
RafaelCenzano Oct 23, 2024
9fb11ea
improve auth functions (#224)
RafaelCenzano Oct 23, 2024
0609bca
Callback to specific callback route on frontend
RafaelCenzano Oct 23, 2024
9c2340f
Megre
youssefr26 Oct 25, 2024
7d3af18
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 25, 2024
6303682
Updated Tests
SarahWohlford Oct 25, 2024
a0a9c2c
Added deleteOpportuniy route
youssefr26 Oct 25, 2024
7204119
Added edit routes get and put
youssefr26 Oct 25, 2024
80bd3af
Update Werkzeug
RafaelCenzano Oct 29, 2024
daec828
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 29, 2024
adf5dd9
Improved auth system that encrypts token in a response
RafaelCenzano Oct 29, 2024
63cd185
restore expire time now that it is working
RafaelCenzano Oct 29, 2024
60f59ce
remove setuptools
RafaelCenzano Oct 29, 2024
c3f2d39
Remove wheel
RafaelCenzano Oct 29, 2024
ae21a20
Rename to prevent issues
RafaelCenzano Oct 29, 2024
ed0e84c
Improve Auth System (#227)
RafaelCenzano Oct 29, 2024
55441c2
Added auth to create, edit and delete oppotunity routes.
youssefr26 Oct 30, 2024
8b2fdbc
Added data to test users in db.
youssefr26 Oct 30, 2024
1d4fcb5
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Oct 30, 2024
fabe16d
Cleaned up DeepSource errors.
youssefr26 Oct 30, 2024
402ecd8
Upgrade dependencies (#234)
RafaelCenzano Nov 1, 2024
f000b74
fix frontend name
RafaelCenzano Nov 1, 2024
be7a2fa
223 create and edit routes (#228)
RafaelCenzano Nov 2, 2024
3ddf87d
Remove 2024 issues
RafaelCenzano Nov 6, 2024
4782c28
Updates to handle input from frontend form for create opportunity
RafaelCenzano Nov 6, 2024
38c5e42
Updating years route
RafaelCenzano Nov 6, 2024
869be97
Merge branch 'main' into UpdateTests
RafaelCenzano Nov 6, 2024
1d45edc
Merge branch 'main' into CleanUp
RafaelCenzano Nov 8, 2024
90b8160
Added registration for new users.
youssefr26 Nov 8, 2024
3c2d641
Added route to search for lab_managers and updated edit and create op…
youssefr26 Nov 8, 2024
29106a6
black formatting
RafaelCenzano Nov 9, 2024
ea1977e
Start of opportunity routes change (#217)
RafaelCenzano Nov 9, 2024
c25c4f5
Merge branch 'UpdateTests' into 185-parameterize-tests
athalm Nov 9, 2024
d035523
updated test departments again with the new updated tests
athalm Nov 9, 2024
d9801be
updated test lab manager again
athalm Nov 9, 2024
ffcaa42
update test user again
athalm Nov 9, 2024
7f251ac
Merge branch 'main' of https://github.com/LabConnect-RCOS/LabConnect-…
youssefr26 Nov 12, 2024
a900f5f
Clean up Deepsource error.
youssefr26 Nov 12, 2024
9e86ce1
Cleanup local login testing
RafaelCenzano Nov 12, 2024
03bb278
Fix create route, start work on edit
RafaelCenzano Nov 12, 2024
f8d12ed
Updated register route
youssefr26 Nov 15, 2024
473ff8f
Fixed Deepsource errors
youssefr26 Nov 15, 2024
a793085
Added search route for courses
youssefr26 Nov 15, 2024
7a682fc
Typo fix
youssefr26 Nov 15, 2024
1b9dd71
update db image
RafaelCenzano Nov 15, 2024
97f2648
complete create and edit routes
RafaelCenzano Nov 15, 2024
2f5e40f
Merge branch 'main' into create-edit-opportunity
RafaelCenzano Nov 15, 2024
5e061ab
Small tweaks
RafaelCenzano Nov 15, 2024
bee103f
Create and Edit Opportunities (#243)
RafaelCenzano Nov 15, 2024
ecfe18b
238 add a way to add recommended classes (#242)
RafaelCenzano Nov 15, 2024
d046678
Merge branch 'main' into 236-registration-page
RafaelCenzano Nov 15, 2024
69d45ae
fix missing code
RafaelCenzano Nov 15, 2024
9b01757
236 registration page (#241)
RafaelCenzano Nov 15, 2024
dec5adc
Fixed getOpportunity route
youssefr26 Nov 22, 2024
9e92a95
Merge branch 'UpdateTests' into 185-parameterize-tests
athalm Nov 22, 2024
9a7063a
updated test_opportunity
athalm Nov 22, 2024
a2e0995
Updated and forated Oppotrunity filter route
youssefr26 Nov 22, 2024
41fca53
clean up db init file
RafaelCenzano Nov 22, 2024
25137c7
correct auth routes
RafaelCenzano Nov 22, 2024
6a2cf96
get profile opportunities working
RafaelCenzano Nov 22, 2024
9a81cb0
Complete profile route
RafaelCenzano Nov 22, 2024
fa6464a
update diagram
RafaelCenzano Nov 22, 2024
3012ffb
remove uneeded import
RafaelCenzano Nov 22, 2024
59a53cf
Merge branch 'main' into UpdateTests
RafaelCenzano Nov 22, 2024
430375c
Merge branch 'main' into 185-parameterize-tests
RafaelCenzano Nov 22, 2024
8d27ab2
244 get and filter opportunities (#245)
RafaelCenzano Nov 22, 2024
0679eb4
Merge branch 'main' into 185-parameterize-tests
RafaelCenzano Nov 22, 2024
8f97033
format with black
RafaelCenzano Nov 22, 2024
8fd9742
Merge branch 'main' into profile-page
RafaelCenzano Nov 22, 2024
390260a
Profile Page (#246)
RafaelCenzano Nov 22, 2024
347a897
Merge branch 'main' into UpdateTests
RafaelCenzano Nov 22, 2024
483131f
add postgres to pytest gh action
RafaelCenzano Nov 23, 2024
4c9b8bb
adjust issues
RafaelCenzano Nov 23, 2024
f5121a1
test connection
RafaelCenzano Nov 23, 2024
0594ae8
attempt to fix postgres test
RafaelCenzano Nov 23, 2024
1d70cc0
try removing password
RafaelCenzano Nov 23, 2024
81dd667
fix url
RafaelCenzano Nov 23, 2024
4aa443b
Updated Tests (#240)
RafaelCenzano Nov 23, 2024
87e918c
UpdateTests (#248)
RafaelCenzano Nov 23, 2024
c350d95
Merge branch 'main' into 185-parameterize-tests
athalm Nov 23, 2024
b160331
run black formatter
RafaelCenzano Nov 23, 2024
e3c982d
185 parameterize tests (#239)
RafaelCenzano Nov 23, 2024
4693db3
Bump psycopg2 from 2.9.9 to 2.9.10
dependabot[bot] Dec 1, 2024
5e8f1ed
Bump psycopg2 from 2.9.9 to 2.9.10 (#250)
RafaelCenzano Dec 1, 2024
1b5ebf2
Bump packaging from 24.1 to 24.2
dependabot[bot] Dec 1, 2024
1bae4b6
Bump packaging from 24.1 to 24.2 (#251)
RafaelCenzano Dec 1, 2024
ee41913
Bump pyjwt from 2.9.0 to 2.10.1 (#253)
dependabot[bot] Dec 2, 2024
9aee71d
Bump flask-jwt-extended from 4.6.0 to 4.7.1 (#249)
dependabot[bot] Dec 2, 2024
e047b30
Bump pytest-cov from 5.0.0 to 6.0.0 (#252)
dependabot[bot] Dec 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ on:
jobs:
build:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: labconnect
ports:
- 5432:5432
options: >-
--health-cmd="pg_isready -U postgres -d labconnect"
--health-interval=10s
--health-timeout=5s
--health-retries=3
strategy:
matrix:
python-version: ["3.12.4"]
Expand All @@ -22,9 +36,19 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Setup the Database
- name: Wait for PostgreSQL to be ready
run: |
while ! pg_isready -h localhost -p 5432 -U postgres -d labconnect; do
echo "Waiting for PostgreSQL..."
sleep 2
done
- name: Set up the Database
env:
DATABASE_URL: postgresql+psycopg2://postgres:postgres@localhost:5432/labconnect
run: |
python db_init.py create
- name: Running pytest
env:
DATABASE_URL: postgresql+psycopg2://postgres:postgres@localhost:5432/labconnect
run: |
python -m pytest tests/
5 changes: 3 additions & 2 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ class Config:
)

SQLALCHEMY_DATABASE_URI = os.environ.get(
"DB", f"sqlite:///{os.path.join(basedir, 'db', 'database.db')}"
"DB", "postgresql+psycopg2://postgres:root@localhost/labconnect"
)
# "postgresql+psycopg2://postgres:root@localhost/labconnect"

TOKEN_BLACKLIST = set()


class TestingConfig(Config):
Expand Down
Loading
Loading