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.

Sign up for GitHub

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

feat:Connect iOS Notifications to Grade Published Hook #186

Closed
wants to merge 18 commits into from
Closed

feat:Connect iOS Notifications to Grade Published Hook #186

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0ae6ce1
feat: implemented base grade notification hook service
Antonwy Jun 18, 2023
2ed0600
Merge branch 'main' into feature/new-grade-published-hook
Antonwy Jun 18, 2023
ec9be06
feat: implemented base grade notification hook service
Antonwy Jul 2, 2023
dc5d937
feat: added api key option
Antonwy Jul 2, 2023
9de8f85
Merge branch 'feature/new-grade-published-hook' into feature/connecte…
Antonwy Jul 2, 2023
58d2858
refactor: cleanup unused files
Antonwy Jul 2, 2023
1b738a8
feat: added api key protection for exam results hook callback
Antonwy Jul 2, 2023
0ea9f80
fix: linter errors
Antonwy Jul 2, 2023
a4ef8ef
resolved most merge conflicts
Antonwy Oct 13, 2023
5b59e8e
resolved most merge conflicts
Antonwy Oct 16, 2023
55a0bac
fix: made API_KEY nullable
Antonwy Oct 16, 2023
8003b00
fix: adjusted naming convention and updated imports
Antonwy Oct 16, 2023
066ee20
fix: dropped `isEncrypted` column from EncryptedGrade
Antonwy Oct 16, 2023
00eced6
fix: syntactic sugar
Antonwy Oct 16, 2023
0d1e8c9
fix: naming and other fixes
Antonwy Oct 16, 2023
3d73b8b
Merge branch 'main' into feature/connected-ios-notifications-to-grade…
Antonwy Oct 16, 2023
cf258fa
Merge branch 'main' into feature/connected-ios-notifications-to-grade…
Antonwy Oct 16, 2023
84dbbbe
Merge remote-tracking branch 'origin/feature/connected-ios-notificati…
Antonwy Oct 16, 2023
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
2 changes: 2 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ DB_PORT=3306
APNS_KEY_ID=
APNS_TEAM_ID=
APNS_P8_FILE_PATH=/secrets/AuthKey_XXXX.p8
API_KEY=secret_api_key
IOS_EXAMS_HOOK_CALLBACK_URL=http://backend:50051/v1/ios/exams/new

ENVIRONMENT=dev

Expand Down
10 changes: 7 additions & 3 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,26 @@ services:
- APNS_KEY_ID=${APNS_KEY_ID}
- APNS_TEAM_ID=${APNS_TEAM_ID}
- APNS_P8_FILE_PATH=${APNS_P8_FILE_PATH}
- API_KEY=${API_KEY}
Antonwy marked this conversation as resolved.
Show resolved Hide resolved
- IOS_EXAMS_HOOK_CALLBACK_URL=${IOS_EXAMS_HOOK_CALLBACK_URL}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add any additional variables here

Campus-Backend/deployment/charts/backend/templates/deployments/backend-v2.yaml

Line 42 in 12f5cd6

- name: APNS_P8_FILE_PATH
and tell me offline what should be written there ^^

volumes:
- ./apns_auth_key.p8:${APNS_P8_FILE_PATH}
depends_on:
- db

db:
container_name: campus-db
image: bitnami/mariadb:10
image: mariadb:latest
Antonwy marked this conversation as resolved.
Show resolved Hide resolved
ports:
- ${DB_PORT:-3306}:3306
environment:
- MARIADB_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
- MARIADB_DATABASE=${DB_NAME}
volumes:
- campus-db-data:/bitnami/mariadb
- ./deployment/charts/backend/files/source-schema.sql:/docker-entrypoint-startdb.d/schema.sql
- campus-db-data:/var/lib/mysql
- ./source-schema.sql:/entrypoint/schema.sql
# Execute in container to init with schema:
# mysql --user=root --password=secret_root_password campus_db < /entrypoint/schema.sql
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional?
This means that the source-shema we use as a source of truth is not used anymore or am I understanding this incorrectly?

Suggested change
- campus-db-data:/var/lib/mysql
- ./source-schema.sql:/entrypoint/schema.sql
# Execute in container to init with schema:
# mysql --user=root --password=secret_root_password campus_db < /entrypoint/schema.sql
- campus-db-data:/bitnami/mariadb
- ./deployment/charts/backend/files/source-schema.sql:/docker-entrypoint-startdb.d/schema.sql

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2023-09-17 at 18 55 25@2x

Somehow does the bitnami image not work on my local machine. Did you encounter something similar?

Copy link
Member

@CommanderStorm CommanderStorm Sep 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I did not.

  • What is your platform?
  • Does deleting the docker volume and re-running fix this issue?
    My assumption is that said directory is owned by root on your machine. This won't work, as the container is a non-root container.


volumes:
campus-db-data:
Loading