Skip to content

Conversation

@strautvetter
Copy link

No description provided.

mpfeil and others added 30 commits October 5, 2023 08:44
* Fix local development docker image

* Update production docker image
* Install uwsgi by requirements.txt

* Multi stage build and least privileges
* add build action

* move Dockerfile to root level

* add dependabot

* copy default settings file

* fix wrong folder
Mainly added necessary fields, removed some old tests and added instructions on how to run server tests.

---

* Tests seem to run but take forever

Adjust the configuration of `settings_tests.py` to use the MySQL
instance on the other docker container (similarly to how the dev setup
does it). Also copy the `tox` file(s) to the docker server container, so
that tox can be run from within it.

To run the tests, start the container (`docker compose up`),  enter an
interactive shell in the container (`docker exec -it <id of badgr
server> bash`) and run `tox` there.

Currently I'm not sure, if the tests *actually* run, because they don't
seem to complete ever.

* Fix tests so that also flake runs

* Add test instructions to README

* Comment out unsuccessful facebook tests

I don't think we're using facebook login anymore, but if so those tests
need to be fixed (apparently the url can't be resolved, so probably in a
`urls.py` something would have to be changed). Otherwise, this file
should be deleted.

* Add description of how to run a single test

* Add example to run single test to README

* Fix issuer tests

Add 'category' string in object to fulfil the required field.

* Add category to fix assertion issuer update test

* Comment out test because it *seems* to be intended behavior now

* Add category to fix updating issuer cache test

---------

Authored-by: Timber Borner <timber@opensenselab.org>
…#6)

The error is prevented by updating the relevant entity if it already exists, instead of always trying to create a new one. This does not yet solve unexpected behavior when changing the role of the issuer staff that created the issuer: When changing it it persists that change, but when saving again afterwards, it switches back to "Owner". It's probably best to prohibit changes to the role of the creator of an issuer altogether. For that I've created a new issue.

---

* Fix IntegrityError

The error is prevented by updating the relevant entity if it already
exists, instead of always trying to create a new one. This does not yet
solve unexpected behavior when changing the role of the issuer staff
that created the issuer: When changing it it persists that change, but
when saving again afterwards, it switches back to "Owner". It's probably
best to prohibit changes to the role of the creator of an issuer
altogether.

* Add documentation

---------

Authored-by: Timber Borner <timber@opensenselab.org>
* Add information on NOUNPROJECT API settings to README

* Don't return 403 when authentication to thenounproject failed, thus not logging the user out of the mint-o-badges session

* Use thenounproject api v2

---------

Authored-by: Timber Borner <timber@opensenselab.org>
* Adjust expected flake8 behavior

* Fix some flake8 warnings

* Autoformat with autopep8 (not aggressive)

* Fixed last flake8 warnings

* Undo too much deletion

* Fix test

---------

Authored-by: Timber Borner <timber@opensenselab.org>
* update email templates

* update domain name and other updates

* update site ID

* unify project name - open educational badges
* Remove best practices

* Change extension urls

* Revert "Remove best practices"

This reverts commit d12853e.

* Document script

---------

Authored-by: Timber Borner <timber@opensenselab.org>
* Set SITE_ID to 2 again

* Make site ID visible in admin interface

---------

Authored-by: Timber Borner <timber@opensenselab.org>
* add superbadge model and register in admin panel

* add collectionbadge model identical to superbadges

* add images to superbadges and collectionbadges model

* create new collectionbadge with badgeclasses

* fetch more than entity_id from collectionbadges

* add v1 endpoints for authenticated users

* improve superbadge serializer v1

* add post for collectionbadgeclasslist in public api

* add v2 serializers for collectionbadge and superbadge, but without badges array yet

* add assertions to collectionbadge serializer v2

* add assertions to api spec

* add assertions to superbadge serializer v2

* serialize badges array correctly

* not working yet: endpoint to query single superbadges and collectionbadges

* adjust permissions to fetch single collection- and superbadges

* specify v2 serializers

* remove unnecessary comments

* add slug field for routing in frontend

* remove some unnecessary properties

* remove duplicated class

* update source for badge assertions

* remove comment and update short image description

* update scopes, tags and uncomment collectionbadgeclass serializer for v2

* remove comment

* delete unused endpoints

* remove comments

* add TODO to clarify comment

* remove unnecessary extra space

* add comments to document the ModifiedRelatedField class

* remove parameters for post_operation of collectionbadge classes

* change expected format of badges
* Add script to automate deployment

* Deploy latest version from remote main by default and restart all containers

---------

Authored-by: Timber <timber@opensenselab.org>
* Add parantheses to fix unary plus error for issuer editing

* Prevent similar situation

---------

Authored-by: Timber <timber@opensenselab.org>
Co-authored-by: Timber <timber@opensenselab.org>
Co-authored-by: umut <u.tas@reedu.de>
#33)

* add mailhog to docker compose and use smtp email backend in local dev with mailhog configuration

* revert accidental change

---------

Co-authored-by: umut <u.tas@reedu.de>
Co-authored-by: Timber <timber@systemli.org>
* new competency extension schema

* context and schema for competency extension

* esco id should not be required for manual addition of competencies

* remove extra line

* fix typo

* use production url

---------

Co-authored-by: Timber <timber@systemli.org>
Authored-by: Timber <timber@opensenselab.org>
* send email to issuer on verification

* clean method, add comments

---------

Authored-by: umut <u.tas@reedu.de>
* Add debugging functionality

* Instantiate logger to fix the error of not being able to view issuers

---------

Authored-by: Timber <timber@opensenselab.org>
* Add AI skills endpoint

* Add searchterm payload

* Fix AI requests

* Add TODO

* Decode base64

---------

Co-authored-by: Timber Borner <timber@opensenselab.org>
* Add logs

* Disable badgerank

* Remove url

* Force disable badgerank

* Revert "Force disable badgerank"

This reverts commit 80e78f8.

* Revert "Remove url"

This reverts commit 486d538.

* Revert "Disable badgerank"

This reverts commit a5dbecd.

* Revert "Add logs"

This reverts commit 6bba233.

* Remove badgerank stuff

---------

Co-authored-by: Timber <timber@opensenselab.org>
* Decode url safe base64 string

* Fix replacement

---------

Co-authored-by: Timber <timber@opensenselab.org>
* upgrade to django version 3, upgrade some deps, install pyopenssl

* use render instead of deprecated render_to_response

* use loadstatic instead of deprecated loadstaticfiles

* upgrade deps

* add context processor

* migrate to django 3.2

* update import from django.conf.urls from url to re_path due to url being deprecated in django 4

* fix auto-created primary key warning

* fix deprecated api name

* update deprecated api name

* revert to import url

* revert change to settings

* add settings field again to fix warning

* revert import change

* revert import change

* revert import change
Co-authored-by: Timber <timber@opensenselab.org>
Co-authored-by: Timber <timber@opensenselab.org>
jona159 and others added 30 commits April 25, 2025 14:35
* feat(admin): add info columns to backend models and view

* fix(admin): restrict assertion count column to non-revoked

---------

Co-authored-by: jona159 <65068389+jona159@users.noreply.github.com>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.13.0 to 6.16.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.13.0...v6.16.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 6.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jona159 <65068389+jona159@users.noreply.github.com>
* feat: wip

* feat: model, helper serializer

* feat: add migration

* feat: extensions, admin

* fix: remove duplicate migration

* fix: migrations

* fix: migration after develop merge

---------

Co-authored-by: Stefan Trautvetter <stefan.trautvetter@esirion.de>
* feat: add management command to clean existing criteria text

* feat: add custom criteria field

* feat: create criteria_text at runtime

* feat: call get_criteria on serializer

* fix: migrations, adjust serializer

* feat: adjust serializers, add migrtaion command

* feat:minor adjustments

* fix: admin, remove migrations
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.16.0...v6.17.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 6.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(pdfs): allow non square issuer images to be placed correctly

* refactor: remove unnecessary print statement

* fix(pdfs): scale non-square pngs as well
* feat: start collection pdf

* feat: add badge cards to pdf

* feat: finalize collection pdf

* fix: rm logger

* refactor(pdf): remove unused response

---------

Co-authored-by: David Scheidt <david.scheidt@opensenselab.org>
* feat: wip

* fix: remove redis port mapping

* fix: remove logs, comments

* feat(docker): add docker config for celery in prod

* feat: dont run celery as root in prod

* fix: pass user via context

---------

Co-authored-by: David Scheidt <david.scheidt@opensenselab.org>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.17.0 to 6.18.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.17.0...v6.18.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 6.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add basic openbadges v3_0 handling

* feat(ob30): update json representations

* feat(ob30): add 1EdTechRevocationList revocation list

* fix(ob30): force backpack api to continue using 2_0 for badgr-ui compatibility

* feat(ob30): allow importing of OB30 badges with basic checks

* fix(ob30): fix badgeclass and issuer @context

* fix(ob30): json changes, use 30 assertions for badgr-ui api

* fix(ob30): assertion get_json cleanup

* fix(ob30): update requirements.txt

* feat(ob30): pull openbadges and openbadges_bakery into project

* feat(ob30): updates to openbadges and openbadges_bakery to work with OB30

* feat(ob30): update docker files

* fix(openbadges): expose load_store function

* fix(ob30): remove wrong duplicate type property on assertion json

* fix(ob30): clean up comments

* fix(ob30): cleanup comments part 2

* fix(ob30): force add version parameter to newly created 2.0 assertions

---------

Co-authored-by: David Scheidt <david.scheidt@opensenselab.org>
* fix: geocode on issuer creation

* feat: add management command
* feat: verify issuer automatically when new email matches"

* refactor: remove duplicate if statement

---------

Co-authored-by: David Scheidt <david.scheidt@opensenselab.org>
* feat: add mysql config, adjust docker compose and init command

* feat: adjust settings.py examples

* fix: use general, not unicode

* feat: adjust mysql config

* feat(scripts): add migration script for mysql utf8mb4 migration

* fix: adjust settings_local.py.example accordingly

* feat(scripts): add alter database to sql script

* fix(script): pass params properly to migration script

---------

Co-authored-by: David Scheidt <david.scheidt@opensenselab.org>
* fix: add hyphen

* fix: dont trigger email on every save

* fix: from email, template
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.

8 participants