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

draft: Stage #89

Draft
wants to merge 123 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
6992a38
Merge branch 'stage'
Dec 14, 2021
b6cd349
Create Entity
SebastianStorz Dec 5, 2022
db11114
Create Query for old values
SebastianStorz Dec 5, 2022
eed608d
Create Aggregator and Injection
SebastianStorz Dec 6, 2022
8c2477f
Commit before cleanign up entity again.
SebastianStorz Dec 6, 2022
0afa10a
Clean up Entity
SebastianStorz Dec 6, 2022
14ecb8a
Add aggregation to update end_date when finished
SebastianStorz Dec 6, 2022
5dcfd7f
Implement Aggregation for new Employments and fixes to Aggregation
SebastianStorz Dec 7, 2022
8768d22
Implement Anonymization for deleted Persons
SebastianStorz Dec 7, 2022
12270cc
Remove unecessary comment
SebastianStorz Dec 7, 2022
5d408d0
Merge branch 'stage'
Dec 14, 2022
abf70d8
add user information to sentry and clean up .env files
SebastianStorz Jun 21, 2023
20e0877
lint
SebastianStorz Jun 21, 2023
f8d6cd5
Merge branch 'sentry' into issue/hc-212
SebastianStorz Jun 27, 2023
77ba73a
add basic RoleOverview endpoint
SebastianStorz Jun 28, 2023
76ba101
add colors to role overview and filter endpoint
SebastianStorz Jun 29, 2023
3608862
fix missing canton information and link between groups
SebastianStorz Jul 4, 2023
53fb593
enable necessary features only
SebastianStorz Jul 4, 2023
98a5a46
enable fetching in cronjob
SebastianStorz Jul 4, 2023
1c5a708
lint
SebastianStorz Jul 5, 2023
002e30f
fix: deactivate bruteforce group import
SebastianStorz Jul 5, 2023
16f4a59
lint
SebastianStorz Jul 5, 2023
d63c0c5
Add some doc for clarity
SebastianStorz Jul 5, 2023
29c09fc
fix undefined index warning
SebastianStorz Jul 5, 2023
e2204b1
implement group meeting locations
SebastianStorz Jul 11, 2023
2b3ddfc
remove var dump
SebastianStorz Jul 11, 2023
5ab45bc
lint
SebastianStorz Jul 11, 2023
942ac60
Sanitize Lat and Long
SebastianStorz Jul 12, 2023
9e78a69
add check to only aggregate meeting points of current date
SebastianStorz Jul 12, 2023
e0816d9
Add sorting to ensure newest qualifications get displayed
SebastianStorz Jul 13, 2023
7e78610
lint inline control structures
SebastianStorz Jul 13, 2023
4aff37d
fix .env.test
SebastianStorz Jul 17, 2023
dec22f8
Merge branch 'stage'
SebastianStorz Jul 17, 2023
0e2153d
minor fixes
SebastianStorz Jul 18, 2023
3c686b2
lint
SebastianStorz Jul 18, 2023
369da63
Merge branch 'issue/hc-212' into stage
SebastianStorz Jul 18, 2023
1bc30d5
partial implementation without backend filters
SebastianStorz Sep 1, 2023
5011724
enable reflections for census
SebastianStorz Sep 7, 2023
0f5bfd3
fix roleoverview date range filter
SebastianStorz Sep 7, 2023
eeaa4f0
Merge pull request #92 from digio-ch/issue/hc-194
TaminoWalter Sep 8, 2023
df5ad63
Merge pull request #93 from digio-ch/stage
SebastianStorz Sep 14, 2023
dfedf01
fix: wrong parameter order
SebastianStorz Sep 19, 2023
7932db5
fix: move groupsetting creation to end of group creation
SebastianStorz Sep 19, 2023
db9fdba
Merge pull request #94 from digio-ch/bugfix
c0depwn Sep 25, 2023
6e54d13
WIP: All widgets without filter
SebastianStorz Sep 26, 2023
67eadb5
Merge branch 'stage' into issue/hc-235
SebastianStorz Sep 26, 2023
42f6c00
lint
SebastianStorz Sep 26, 2023
73d96d7
Merge pull request #95 from digio-ch/issue/hc-235
SebastianStorz Sep 26, 2023
0d6733e
lint
SebastianStorz Sep 26, 2023
d764bcf
Merge pull request #96 from digio-ch/issue/hc-235
SebastianStorz Sep 26, 2023
e5f1f19
Add filter
SebastianStorz Sep 27, 2023
d5af65a
lint
SebastianStorz Sep 27, 2023
455ea41
Merge branch 'stage' into issue/hc-235
SebastianStorz Sep 27, 2023
50aeeb4
Merge pull request #97 from digio-ch/issue/hc-235
SebastianStorz Sep 27, 2023
d3c3d5b
fix query, fix colors
SebastianStorz Sep 29, 2023
1f9329d
Merge pull request #98 from digio-ch/issue/hc-235
SebastianStorz Sep 29, 2023
909379b
lint
SebastianStorz Sep 29, 2023
8d96886
Merge pull request #99 from digio-ch/issue/hc-235
SebastianStorz Sep 29, 2023
c0dd1a9
various fixes
SebastianStorz Oct 6, 2023
7c507b8
lint
SebastianStorz Oct 6, 2023
92a93e8
Merge pull request #100 from digio-ch/issue/hc-235
SebastianStorz Oct 6, 2023
f4db67f
fix: reduce census API computation duration by ~93%
SebastianStorz Oct 27, 2023
b5ceb1b
fix: prevent 0 division and null errors
SebastianStorz Oct 27, 2023
8de0204
fix: use proper entities for preview
SebastianStorz Oct 27, 2023
445e429
add crontab and finish census command
SebastianStorz Oct 27, 2023
732e11d
Merge pull request #101 from digio-ch/issue/hc-235
SebastianStorz Oct 27, 2023
e316ab3
Merge pull request #102 from digio-ch/stage
SebastianStorz Nov 10, 2023
a5c9b19
fix: increase contrast between colors in Roleoverview
SebastianStorz Dec 19, 2023
efa4d38
Merge pull request #103 from digio-ch/hc-237-unfinished
SebastianStorz Dec 20, 2023
57433a0
fix: prevent unknown grouptypes from causing errors
SebastianStorz Feb 8, 2024
7e4c4e3
restructure census services and create census date provider
SebastianStorz Feb 8, 2024
9ac50ab
implement latest year and date range functions
SebastianStorz Feb 8, 2024
c434c98
add comment
SebastianStorz Feb 8, 2024
097a58f
adjust description
SebastianStorz Feb 8, 2024
cd5712f
fix query
SebastianStorz Feb 8, 2024
199c85e
add dynamic year to widgets with no date information
SebastianStorz Feb 8, 2024
e02e1f6
sort camps by start date
SebastianStorz Feb 8, 2024
1cc682d
add logger warning for invalid groups
SebastianStorz Feb 15, 2024
8af93d8
change help text
SebastianStorz Feb 15, 2024
ed5ab3e
Revert "change help text"
SebastianStorz Feb 15, 2024
008702f
change help text
SebastianStorz Feb 15, 2024
4cd7c22
Merge pull request #113 from digio-ch/issue/hc-243
SebastianStorz Feb 15, 2024
a6f7fca
update composer image
SebastianStorz Feb 15, 2024
ec839c5
revert version change and enforce http 1 for git
SebastianStorz Feb 15, 2024
549e195
try to increase buffer size instead
SebastianStorz Feb 15, 2024
13d2ef1
retry with updated gitlab version
SebastianStorz Feb 15, 2024
0d547b2
.
SebastianStorz Feb 15, 2024
0f8286e
disable proxy for http1
SebastianStorz Feb 15, 2024
dd5b2bc
enable git tracing
SebastianStorz Feb 15, 2024
58e998f
verbose composer
SebastianStorz Feb 15, 2024
04db146
.
SebastianStorz Feb 15, 2024
9841524
Merge pull request #112 from digio-ch/issue/hc-241
SebastianStorz Feb 15, 2024
5d38db4
Merge pull request #111 from digio-ch/issue/hc-240
SebastianStorz Feb 15, 2024
5ab8cd3
linting
SebastianStorz Feb 15, 2024
cb4a96f
Merge pull request #114 from digio-ch/issue/hc-244
SebastianStorz Feb 15, 2024
33f8093
lint
SebastianStorz Feb 15, 2024
5f3213f
prevent faulty role data from breaking the aggregation
SebastianStorz Feb 16, 2024
9ca608d
lint
SebastianStorz Feb 16, 2024
310e553
Merge pull request #115 from digio-ch/issue/hc-244
SebastianStorz Feb 16, 2024
9800583
prevent invalid encoding edgecases and fix buffering
SebastianStorz May 27, 2024
5dd2323
add buffering to roles
SebastianStorz May 27, 2024
1c77d95
Merge pull request #120 from digio-ch/issue/hc-246
SebastianStorz May 27, 2024
bae8a71
lint
SebastianStorz May 28, 2024
5bdc4c8
Merge pull request #121 from digio-ch/issue/hc-246
SebastianStorz May 28, 2024
887fd39
change grouptype to region
SebastianStorz Jul 21, 2024
e927ffa
Merge pull request #123 from digio-ch/issue/hc-251
SebastianStorz Jul 21, 2024
2bac08c
Gamification merger
SebastianStorz Sep 11, 2024
faae2e4
Add placeholder text
SebastianStorz Sep 11, 2024
a22c9af
adjust level restrictions and change revision goal check
SebastianStorz Sep 11, 2024
50c45f8
Merge pull request #124 from digio-ch/issue/gamification
SebastianStorz Sep 11, 2024
dcd889d
lint
SebastianStorz Sep 11, 2024
44b5719
Merge pull request #125 from digio-ch/issue/gamification
SebastianStorz Sep 11, 2024
727462a
add auto linting command to readme
SebastianStorz Sep 11, 2024
094b15e
change "docker-compose" to "docker compose" for test files
SebastianStorz Sep 11, 2024
f2d572d
Merge pull request #127 from digio-ch/issue/gamification
SebastianStorz Sep 11, 2024
64bbf41
add placeholders
SebastianStorz Sep 11, 2024
ef805ce
fix: QUAP subdepartments for regions
SebastianStorz Sep 30, 2024
06960b0
Merge pull request #128 from digio-ch/issue/hc-251
SebastianStorz Sep 30, 2024
b7f8ae6
lint
SebastianStorz Sep 30, 2024
098a224
Issue/hc 254 (#129)
SebastianStorz Nov 1, 2024
456a039
add beta status default
SebastianStorz Nov 1, 2024
e58b908
add displayed default
SebastianStorz Nov 1, 2024
016e0ab
fix el_filled out
SebastianStorz Nov 1, 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
11 changes: 11 additions & 0 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,14 @@ GRAYLOG_CLIENT_CERT=
GRAYLOG_CLIENT_KEY=

IMPORT_TARGET_DIR=data

# Sentry (you can add your local sentry dsn here for easier debugging.)
SENTRY_DSN=""

# XDebug config
XDEBUG_CONFIG="remote_host="
PHP_IDE_CONFIG=""

###> symfony/mailer ###
# MAILER_DSN=smtp://mailer:1025
###< symfony/mailer ###
2 changes: 1 addition & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ GRAYLOG_CLIENT_KEY=
IMPORT_TARGET_DIR=data

# Sentry
SENTRY_DSN=https://[email protected]/26
SENTRY_DSN=""
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- name: setup test env
run: cp -f .env.test .env
- name: Build test image
run: docker-compose -f docker/docker-compose.yml build --build-arg BUILD_TEST=1 healthcheck-core
run: docker compose -f docker/docker-compose.yml build --build-arg BUILD_TEST=1 healthcheck-core
- name: Start compose
run: docker-compose -f docker/docker-compose.yml up -d
run: docker compose -f docker/docker-compose.yml up -d
- name: Install dependencies
run: docker exec --user=$(id -u) healthcheck-core-local composer install --no-interaction --no-scripts
- name: Lint PSR12
Expand All @@ -36,6 +36,6 @@ jobs:
- name: docker cleanup
run: |
cp -f .env.test .env
docker-compose -f docker/docker-compose.yml down
docker compose -f docker/docker-compose.yml down
docker image prune -f
docker volume prune -f
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ We use the PSR-12 PHP standard. You can check your code using the following comm

`docker exec healthcheck-core-local php vendor/bin/phpcs --standard=PSR12 --report=full --ignore=src/Migrations/ --runtime-set ignore_warnings_on_exit 1 src/`

Auto linting:
`docker exec healthcheck-core-local php vendor/bin/phpcbf --standard=PSR12 --report=full --ignore=src/Migrations/ --runtime-set ignore_warnings_on_exit 1 src/`

#### Running Tests

To run tests locally make sure to use the `env.test` instead of the created `.env`. You can do that by replacing the
Expand All @@ -85,4 +88,4 @@ restart the healthcheck-core service container in order for the changes to take

Once you are up and running with the new env run:

`docker exec healthcheck-core-local php bin/phpunit`
`docker exec healthcheck-core-local php bin/phpunit`
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"symfony/dotenv": "5.1.*",
"symfony/flex": "1.17.*",
"symfony/framework-bundle": "5.1.*",
"symfony/mailer": "5.1.*",
"symfony/polyfill-intl-messageformatter": "^1.18",
"symfony/security-bundle": "5.1.*",
"symfony/serializer": "5.1.*",
Expand Down
217 changes: 215 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions config/packages/mailer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
mailer:
dsn: 'null://null' # Disable until further notice '%env(MAILER_DSN)%'
3 changes: 2 additions & 1 deletion config/packages/sentry.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
sentry:
dsn: "%env(SENTRY_DSN)%"
options:
environment: "%env(APP_ENV)%"
before_send: 'sentry.callback.before_send'
# send_default_pii: true
send_default_pii: true

services:
sentry.callback.before_send:
Expand Down
18 changes: 18 additions & 0 deletions config/routes/app_routes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,21 @@ quap:
resource: "apps/quap.yml"
prefix: /quap
name_prefix: quap_

# General routes
general:
resource: "apps/general.yml"
prefix: /general
name_prefix: general_

# Census
census:
resource: "apps/census.yml"
prefix: /census
name_prefix: census_

# Gamification
gamification:
resource: "apps/gamification.yml"
prefix: /gamification
name_prefix: gamification_
14 changes: 14 additions & 0 deletions config/routes/apps/census.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
preview:
path: /preview
methods: GET
controller: App\Controller\Api\Apps\CensusController::getPreview

getFilter:
path: /filter
methods: GET
controller: App\Controller\Api\Apps\CensusController:getFilterData

postFilter:
path: /filter
methods: POST
controller: App\Controller\Api\Apps\CensusController:postFilterData
34 changes: 34 additions & 0 deletions config/routes/apps/gamification.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
groupChange:
path: /group-change
methods: POST
controller: App\Controller\Api\GamificationController::postGroupChange

logCardLayer:
path: /card-layer
methods: PATCH
controller: App\Controller\Api\GamificationController::usedCardLayer

logDataFilter:
path: /data-filter
methods: PATCH
controller: App\Controller\Api\GamificationController::usedDataFilter

logTimeFilter:
path: /time-filter
methods: PATCH
controller: App\Controller\Api\GamificationController::usedTimeFilter

getPersonProfile:
path: /person
methods: GET
controller: App\Controller\Api\GamificationController::getUserProfile

reset:
path: /reset
methods: POST
controller: App\Controller\Api\GamificationController::resetGamification

betaAccess:
path: /beta
methods: PATCH
controller: App\Controller\Api\GamificationController::requestBetaAccess
Loading
Loading