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

Insert raport 2021 data #58

Merged
merged 6 commits into from
Jun 12, 2021
Merged

Conversation

emilekm
Copy link
Contributor

@emilekm emilekm commented Jun 11, 2021

Ref #50

annkamsk
annkamsk previously approved these changes Jun 11, 2021
@emilekm emilekm force-pushed the insert_raport_2021 branch from 9393ea9 to 363537c Compare June 11, 2021 18:23
@micorix micorix self-requested a review June 12, 2021 16:01
@micorix micorix merged commit f62c88d into po8klasie:master Jun 12, 2021
mlazowik pushed a commit to mlazowik/warsawlo-django that referenced this pull request Jun 13, 2021
* Add insertion migration

* Fix small bug failing to determine bilinguality

* First try to find school by name

* Adjust styling

* Minor adjustments after - school creation, field names

* Ensure data is not null
mlazowik added a commit that referenced this pull request Jun 13, 2021
)

* Refactor insert high school classes from 2020/21 and insert statistics from 2020/21

* Update deployment to use the new subdir

* Make fields on Contact and PublicInstitutionData optional

* Add .idea to .gitignore

* Revert insert_profile_2020 and add updating school and insert scores from 2020

* Add CODEOWNERS file

* Add ssh keys cleaning

kyma-project/test-infra#93 (comment)

* Move turnstyle before the docker build (#41)

Explanation in comment

* Add choices on Language.name, ExtendedSubject.name, and HighSchoolClass.type fields

* Fix ExtendedSubject get_full_name method, add test

* Fix Language get_full_name method

* Delete pytest.ini

* Delete pytest

* Add GraphQL API (#42)

* Add experimental graphl endpoint

* Add experimental graphl endpoint

* Move graphql endpoint behind /api as other endpoints are not supported by uwsgi

* Add SearchNode to schema

* Revert "Add SearchNode to schema"

This reverts commit 3055c28.

* Change schema

* Change schema. Add missing features. (#39)

* Add SearchNode to schema

* Add schoolId field to SchoolNode

Co-authored-by: annkamsk <[email protected]>

* Add saving objects, update hsc name and change to removing old statistics

* Run linter and tests in test-building GitHub Action (#45)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Add latest tag to docker images (#51)

* Change GraphQL API to meet front-end needs (#54)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them (#55)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them

* Add StatisticsNode to GraphQL schema (#56)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them

* Add StatisticsNode to GraphQL schema

* Insert raport 2021 data (#58)

* Add insertion migration

* Fix small bug failing to determine bilinguality

* First try to find school by name

* Adjust styling

* Minor adjustments after - school creation, field names

* Ensure data is not null

* Add a build and push action on release

* Update docker action to v2, apply 'latest' docker tag to releases only

* Change RELAY_CONNECTION_MAX_LIMIT setting (#62)

* Change CURRENT_RECRUITMENT_YEAR to 2021 (#63)

* Add flake8 and migrations checks to entrypoint.ci.sh (#64)

* Update deployment to use the new subdir

* Make fields on Contact and PublicInstitutionData optional

* Add .idea to .gitignore

* Add CODEOWNERS file

* Add ssh keys cleaning

kyma-project/test-infra#93 (comment)

* Move turnstyle before the docker build (#41)

Explanation in comment

* Add choices on Language.name, ExtendedSubject.name, and HighSchoolClass.type fields

* Fix ExtendedSubject get_full_name method, add test

* Fix Language get_full_name method

* Add GraphQL API (#42)

* Add experimental graphl endpoint

* Add experimental graphl endpoint

* Move graphql endpoint behind /api as other endpoints are not supported by uwsgi

* Add SearchNode to schema

* Revert "Add SearchNode to schema"

This reverts commit 3055c28.

* Change schema

* Change schema. Add missing features. (#39)

* Add SearchNode to schema

* Add schoolId field to SchoolNode

Co-authored-by: annkamsk <[email protected]>

* Run linter and tests in test-building GitHub Action (#45)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Add latest tag to docker images (#51)

* Change GraphQL API to meet front-end needs (#54)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them (#55)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them

* Add StatisticsNode to GraphQL schema (#56)

* Run linter and tests in test-building GitHub Action

* Fix extended_subjects choices in search/filters.py
* Assert GrpahQL endpoint response status == 200
* Run linter and tests in test-building GitHub Actions

* Use build-and-push action for build

* Change command in docker-compose.ci.yml

* Migrate to docker/build-push-action@v2

* Add docker-compose.local.yml to .gitignore

* Use SHA in docker-compose.ci.yml

* Remove checkout action from test-bulding workflow

* Add checkout action to test-building workflow

* Fix SHA usage

* Use meta.outputs.tags in test-building workflow

* Add get-sha-tag step

* Migrate to google-github-actions/setup-gcloud

* Change GraphQL API to meet front-end needs

* Use distinct when filtering schools by extended subjects
* Use schoolId in SchoolNode (Query.school is no longer relay node field)
* Make SchoolNode return schoolId
* Ran ./manage.py makemigrations (did not run previously)

* Add year argument to resolve_classes

* Return extendedSubjects for given class, not all of them

* Add StatisticsNode to GraphQL schema

* Insert raport 2021 data (#58)

* Add insertion migration

* Fix small bug failing to determine bilinguality

* First try to find school by name

* Adjust styling

* Minor adjustments after - school creation, field names

* Ensure data is not null

* Add a build and push action on release

* Update docker action to v2, apply 'latest' docker tag to releases only

* Change RELAY_CONNECTION_MAX_LIMIT setting (#62)

* Change CURRENT_RECRUITMENT_YEAR to 2021 (#63)

* Add flake8 and migrations checks to entrypoint.ci.sh (#64)

* Re-add pandas to reqs

* "Rebase" migrations

* Switch python docker from alpine to default

Alpine does not have python wheels yet + there are other problems with
musl etc.

* [Dockerfile] Get rid of the builder image, not needed on debian

Co-authored-by: Michał Łazowik <[email protected]>
Co-authored-by: annkamsk <[email protected]>
Co-authored-by: Michał Oręziak <[email protected]>
Co-authored-by: Emil Maruszczak <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants