diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index b324d37c..97358d2d 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -18,7 +18,7 @@ A clear and concise description of what you expected to happen (or code). 3. And then the bug happens! **Environment** -- Impress version: +- Meet version: - Platform: **Possible Solution** diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md index 14bb7caf..306b1057 100644 --- a/.github/ISSUE_TEMPLATE/Support_question.md +++ b/.github/ISSUE_TEMPLATE/Support_question.md @@ -9,9 +9,9 @@ We primarily use GitHub as an issue tracker. If however you're encountering an i --- -Please make sure you have read our [main Readme](https://github.com/numerique-gouv/impress). +Please make sure you have read our [main Readme](https://github.com/numerique-gouv/meet). -Also make sure it was not already answered in [an open or close issue](https://github.com/numerique-gouv/impress/issues). +Also make sure it was not already answered in [an open or close issue](https://github.com/numerique-gouv/meet/issues). If your question was not covered, and you feel like it should be, fire away! We'd love to improve our docs! 👌 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 287db564..0d2229f0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: app-id: ${{ secrets.APP_ID }} private-key: ${{ secrets.PRIVATE_KEY }} owner: ${{ github.repository_owner }} - repositories: "impress,secrets" + repositories: "meet,secrets" - name: Checkout repository uses: actions/checkout@v2 @@ -29,7 +29,7 @@ jobs: name: Load sops secrets uses: rouja/actions-sops@main with: - secret-file: secrets/numerique-gouv/impress/secrets.enc.env + secret-file: secrets/numerique-gouv/meet/secrets.enc.env age-key: ${{ secrets.SOPS_PRIVATE }} - name: Call argocd github webhook diff --git a/.github/workflows/impress.yml b/.github/workflows/meet.yml similarity index 97% rename from .github/workflows/impress.yml rename to .github/workflows/meet.yml index ad180cc5..cf4386bb 100644 --- a/.github/workflows/impress.yml +++ b/.github/workflows/meet.yml @@ -1,4 +1,4 @@ -name: impress Workflow +name: meet Workflow on: push: @@ -21,7 +21,7 @@ jobs: run: git log - name: Enforce absence of print statements in code run: | - ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/impress.yml' | grep "print(" + ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/meet.yml' | grep "print(" - name: Check absence of fixup commits run: | ! git log | grep 'fixup!' @@ -129,7 +129,7 @@ jobs: postgres: image: postgres:16 env: - POSTGRES_DB: impress + POSTGRES_DB: meet POSTGRES_USER: dinum POSTGRES_PASSWORD: pass ports: @@ -139,11 +139,11 @@ jobs: env: DJANGO_CONFIGURATION: Test - DJANGO_SETTINGS_MODULE: impress.settings + DJANGO_SETTINGS_MODULE: meet.settings DJANGO_SECRET_KEY: ThisIsAnExampleKeyForTestPurposeOnly OIDC_OP_JWKS_ENDPOINT: /endpoint-for-test-purpose-only DB_HOST: localhost - DB_NAME: impress + DB_NAME: meet DB_USER: dinum DB_PASSWORD: pass DB_PORT: 5432 diff --git a/Dockerfile b/Dockerfile index fce18ac7..7785dc7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Django impress +# Django Meet # ---- base image to inherit from ---- FROM python:3.10-slim-bullseye as base @@ -36,7 +36,7 @@ RUN yarn install --frozen-lockfile && \ # ---- static link collector ---- FROM base as link-collector -ARG IMPRESS_STATIC_ROOT=/data/static +ARG MEET_STATIC_ROOT=/data/static # Install libpangocairo & rdfind RUN apt-get update && \ @@ -48,7 +48,7 @@ RUN apt-get update && \ # Copy installed python dependencies COPY --from=back-builder /install /usr/local -# Copy impress application (see .dockerignore) +# Copy Meet application (see .dockerignore) COPY ./src/backend /app/ WORKDIR /app @@ -59,7 +59,7 @@ RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \ # Replace duplicated file by a symlink to decrease the overall size of the # final image -RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${IMPRESS_STATIC_ROOT} +RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${MEET_STATIC_ROOT} # ---- Core application image ---- FROM base as core @@ -89,7 +89,7 @@ RUN chmod g=u /etc/passwd # Copy installed python dependencies COPY --from=back-builder /install /usr/local -# Copy impress application (see .dockerignore) +# Copy Meet application (see .dockerignore) COPY ./src/backend /app/ WORKDIR /app @@ -110,9 +110,9 @@ RUN apt-get update && \ apt-get install -y postgresql-client && \ rm -rf /var/lib/apt/lists/* -# Uninstall impress and re-install it in editable mode along with development +# Uninstall Meet and re-install it in editable mode along with development # dependencies -RUN pip uninstall -y impress +RUN pip uninstall -y meet RUN pip install -e .[dev] # Restore the un-privileged user running the application @@ -130,21 +130,21 @@ CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] # ---- Production image ---- FROM core as backend-production -ARG IMPRESS_STATIC_ROOT=/data/static +ARG MEET_STATIC_ROOT=/data/static # Gunicorn RUN mkdir -p /usr/local/etc/gunicorn -COPY docker/files/usr/local/etc/gunicorn/impress.py /usr/local/etc/gunicorn/impress.py +COPY docker/files/usr/local/etc/gunicorn/meet.py /usr/local/etc/gunicorn/meet.py # Un-privileged user running the application ARG DOCKER_USER USER ${DOCKER_USER} # Copy statics -COPY --from=link-collector ${IMPRESS_STATIC_ROOT} ${IMPRESS_STATIC_ROOT} +COPY --from=link-collector ${MEET_STATIC_ROOT} ${MEET_STATIC_ROOT} -# Copy impress mails +# Copy Meet mails COPY --from=mail-builder /mail/backend/core/templates/mail /app/core/templates/mail -# The default command runs gunicorn WSGI server in impress's main module -CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"] +# The default command runs gunicorn WSGI server in Meet's main module +CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/meet.py", "meet.wsgi:application"] diff --git a/Makefile b/Makefile index aa742898..b0011a69 100644 --- a/Makefile +++ b/Makefile @@ -159,14 +159,14 @@ test-back-parallel: ## run all back-end tests in parallel bin/pytest -n auto $${args:-${1}} .PHONY: test-back-parallel -makemigrations: ## run django makemigrations for the impress project. +makemigrations: ## run django makemigrations for the Meet project. @echo "$(BOLD)Running makemigrations$(RESET)" @$(COMPOSE) up -d postgresql @$(WAIT_DB) @$(MANAGE) makemigrations .PHONY: makemigrations -migrate: ## run django migrations for the impress project. +migrate: ## run django migrations for the Meet project. @echo "$(BOLD)Running migrations$(RESET)" @$(COMPOSE) up -d postgresql @$(WAIT_DB) @@ -290,7 +290,7 @@ clean: ## restore repository state as it was freshly cloned .PHONY: clean help: - @echo "$(BOLD)impress Makefile" + @echo "$(BOLD)Meet Makefile" @echo "Please use 'make $(BOLD)target$(RESET)' where $(BOLD)target$(RESET) is one of:" @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(GREEN)%-30s$(RESET) %s\n", $$1, $$2}' .PHONY: help diff --git a/bin/_config.sh b/bin/_config.sh index fe9eaf89..455c3b62 100644 --- a/bin/_config.sh +++ b/bin/_config.sh @@ -7,7 +7,7 @@ UNSET_USER=0 TERRAFORM_DIRECTORY="./env.d/terraform" COMPOSE_FILE="${REPO_DIR}/docker-compose.yml" -COMPOSE_PROJECT="impress" +COMPOSE_PROJECT="meet" # _set_user: set (or unset) default user id used to run docker commands diff --git a/bin/update_openapi_schema b/bin/update_openapi_schema index 23514907..1e704c7e 100755 --- a/bin/update_openapi_schema +++ b/bin/update_openapi_schema @@ -7,6 +7,6 @@ _dc_run \ app-dev \ python manage.py spectacular \ --api-version 'v1.0' \ - --urlconf 'impress.api_urls' \ + --urlconf 'meet.api_urls' \ --format openapi-json \ --file /app/core/tests/swagger/swagger.json diff --git a/crowdin/config.yml b/crowdin/config.yml index 4f167ff6..c0436bf1 100644 --- a/crowdin/config.yml +++ b/crowdin/config.yml @@ -17,7 +17,7 @@ preserve_hierarchy: true files: [ { source : "/backend/locale/django.pot", - dest: "/backend-impress.pot", + dest: "/backend-meet.pot", translation : "/backend/locale/%locale_with_underscore%/LC_MESSAGES/django.po" }, { diff --git a/docker-compose.yml b/docker-compose.yml index 9e521e1f..098e0845 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: args: DOCKER_USER: ${DOCKER_USER:-1000} user: ${DOCKER_USER:-1000} - image: impress:backend-development + image: meet:backend-development environment: - PYLINTHOME=/app/.pylint.d - DJANGO_CONFIGURATION=Development @@ -44,8 +44,8 @@ services: celery-dev: user: ${DOCKER_USER:-1000} - image: impress:backend-development - command: ["celery", "-A", "impress.celery_app", "worker", "-l", "DEBUG"] + image: meet:backend-development + command: ["celery", "-A", "meet.celery_app", "worker", "-l", "DEBUG"] environment: - DJANGO_CONFIGURATION=Development env_file: @@ -64,7 +64,7 @@ services: args: DOCKER_USER: ${DOCKER_USER:-1000} user: ${DOCKER_USER:-1000} - image: impress:backend-production + image: meet:backend-production environment: - DJANGO_CONFIGURATION=Demo env_file: @@ -77,8 +77,8 @@ services: celery: user: ${DOCKER_USER:-1000} - image: impress:backend-production - command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"] + image: meet:backend-production + command: ["celery", "-A", "meet.celery_app", "worker", "-l", "INFO"] environment: - DJANGO_CONFIGURATION=Demo env_file: diff --git a/env.d/development/common.dist b/env.d/development/common.dist index 2856aff6..f591ed7e 100644 --- a/env.d/development/common.dist +++ b/env.d/development/common.dist @@ -1,25 +1,25 @@ # Django DJANGO_ALLOWED_HOSTS=* DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly -DJANGO_SETTINGS_MODULE=impress.settings +DJANGO_SETTINGS_MODULE=meet.settings DJANGO_SUPERUSER_PASSWORD=admin # Python PYTHONPATH=/app -# impress settings +# Meet settings # Mail DJANGO_EMAIL_HOST="mailcatcher" DJANGO_EMAIL_PORT=1025 # Backend url -IMPRESS_BASE_URL="http://localhost:8072" +MEET_BASE_URL="http://localhost:8072" # Media STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage AWS_S3_ENDPOINT_URL=http://minio:9000 -AWS_S3_ACCESS_KEY_ID=impress +AWS_S3_ACCESS_KEY_ID=meet AWS_S3_SECRET_ACCESS_KEY=password # OIDC diff --git a/env.d/development/postgresql.dist b/env.d/development/postgresql.dist index a5817257..b1c3e338 100644 --- a/env.d/development/postgresql.dist +++ b/env.d/development/postgresql.dist @@ -1,11 +1,11 @@ # Postgresql db container configuration -POSTGRES_DB=impress +POSTGRES_DB=meet POSTGRES_USER=dinum POSTGRES_PASSWORD=pass # App database configuration DB_HOST=postgresql -DB_NAME=impress +DB_NAME=meet DB_USER=dinum DB_PASSWORD=pass DB_PORT=5432 \ No newline at end of file diff --git a/src/backend/MANIFEST.in b/src/backend/MANIFEST.in index 999508bf..2785e896 100644 --- a/src/backend/MANIFEST.in +++ b/src/backend/MANIFEST.in @@ -1,3 +1,3 @@ include LICENSE include README.md -recursive-include src/backend/impress *.html *.png *.gif *.css *.ico *.jpg *.jpeg *.po *.mo *.eot *.svg *.ttf *.woff *.woff2 +recursive-include src/backend/meet *.html *.png *.gif *.css *.ico *.jpg *.jpeg *.po *.mo *.eot *.svg *.ttf *.woff *.woff2 diff --git a/src/backend/core/api/__init__.py b/src/backend/core/api/__init__.py index c8152ab5..e825f838 100644 --- a/src/backend/core/api/__init__.py +++ b/src/backend/core/api/__init__.py @@ -1,4 +1,4 @@ -"""Impress core API endpoints""" +"""Meet core API endpoints""" from django.conf import settings from django.core.exceptions import ValidationError diff --git a/src/backend/core/api/permissions.py b/src/backend/core/api/permissions.py index ca3e256c..805bc13e 100644 --- a/src/backend/core/api/permissions.py +++ b/src/backend/core/api/permissions.py @@ -1,4 +1,4 @@ -"""Permission handlers for the impress core app.""" +"""Permission handlers for the Meet core app.""" from rest_framework import permissions from ..models import RoleChoices diff --git a/src/backend/core/api/serializers.py b/src/backend/core/api/serializers.py index cb696896..9e822388 100644 --- a/src/backend/core/api/serializers.py +++ b/src/backend/core/api/serializers.py @@ -1,4 +1,4 @@ -"""Client serializers for the impress core app.""" +"""Client serializers for the Meet core app.""" from django.utils.translation import gettext_lazy as _ from rest_framework import serializers diff --git a/src/backend/core/apps.py b/src/backend/core/apps.py index bba7de0f..3708bbb0 100644 --- a/src/backend/core/apps.py +++ b/src/backend/core/apps.py @@ -1,11 +1,11 @@ -"""Impress Core application""" +"""Meet Core application""" # from django.apps import AppConfig # from django.utils.translation import gettext_lazy as _ # class CoreConfig(AppConfig): -# """Configuration class for the impress core app.""" +# """Configuration class for the Meet core app.""" # name = "core" # app_label = "core" -# verbose_name = _("impress core application") +# verbose_name = _("meet core application") diff --git a/src/backend/core/authentication/backends.py b/src/backend/core/authentication/backends.py index bfa2c107..a4576916 100644 --- a/src/backend/core/authentication/backends.py +++ b/src/backend/core/authentication/backends.py @@ -1,4 +1,4 @@ -"""Authentication Backends for the Impress core app.""" +"""Authentication Backends for the Meet core app.""" from django.core.exceptions import SuspiciousOperation from django.utils.translation import gettext_lazy as _ diff --git a/src/backend/core/migrations/0001_initial.py b/src/backend/core/migrations/0001_initial.py index 38bdb4f3..13d21fe9 100644 --- a/src/backend/core/migrations/0001_initial.py +++ b/src/backend/core/migrations/0001_initial.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Document', 'verbose_name_plural': 'Documents', - 'db_table': 'impress_document', + 'db_table': 'meet_document', 'ordering': ('title',), }, ), @@ -49,7 +49,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Template', 'verbose_name_plural': 'Templates', - 'db_table': 'impress_template', + 'db_table': 'meet_template', 'ordering': ('title',), }, ), @@ -76,7 +76,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'user', 'verbose_name_plural': 'users', - 'db_table': 'impress_user', + 'db_table': 'meet_user', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), @@ -96,7 +96,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Document/user relation', 'verbose_name_plural': 'Document/user relations', - 'db_table': 'impress_document_access', + 'db_table': 'meet_document_access', 'ordering': ('-created_at',), }, ), @@ -114,7 +114,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Document invitation', 'verbose_name_plural': 'Document invitations', - 'db_table': 'impress_invitation', + 'db_table': 'meet_invitation', }, ), migrations.CreateModel( @@ -131,7 +131,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Template/user relation', 'verbose_name_plural': 'Template/user relations', - 'db_table': 'impress_template_access', + 'db_table': 'meet_template_access', 'ordering': ('-created_at',), }, ), diff --git a/src/backend/core/migrations/0003_resource_remove_documentaccess_document_and_more.py b/src/backend/core/migrations/0003_resource_remove_documentaccess_document_and_more.py index ea0481f4..9d494208 100644 --- a/src/backend/core/migrations/0003_resource_remove_documentaccess_document_and_more.py +++ b/src/backend/core/migrations/0003_resource_remove_documentaccess_document_and_more.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', - 'db_table': 'impress_resource', + 'db_table': 'meet_resource', }, ), migrations.RemoveField( @@ -62,12 +62,12 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=500)), ('resource', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.resource')), ('slug', models.SlugField(blank=True, max_length=100, null=True, unique=True)), - ('configuration', models.JSONField(blank=True, default={}, help_text='Values for Magnify parameters to configure the room.', verbose_name='Magnify room configuration')), + ('configuration', models.JSONField(blank=True, default={}, help_text='Values for Meet parameters to configure the room.', verbose_name='Meet room configuration')), ], options={ 'verbose_name': 'Room', 'verbose_name_plural': 'Rooms', - 'db_table': 'impress_room', + 'db_table': 'meet_room', 'ordering': ('name',), }, bases=('core.resource',), @@ -85,7 +85,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Resource access', 'verbose_name_plural': 'Resource accesses', - 'db_table': 'impress_resource_access', + 'db_table': 'meet_resource_access', }, ), migrations.AddField( diff --git a/src/backend/core/models.py b/src/backend/core/models.py index 71a36517..86110011 100644 --- a/src/backend/core/models.py +++ b/src/backend/core/models.py @@ -1,5 +1,5 @@ """ -Declare and configure the models for the impress core application +Declare and configure the models for the Meet core application """ import uuid from logging import getLogger @@ -142,7 +142,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin): REQUIRED_FIELDS = [] class Meta: - db_table = "impress_user" + db_table = "meet_user" verbose_name = _("user") verbose_name_plural = _("users") @@ -175,7 +175,7 @@ class Resource(BaseModel): ) class Meta: - db_table = "impress_resource" + db_table = "meet_resource" verbose_name = _("Resource") verbose_name_plural = _("Resources") @@ -229,7 +229,7 @@ class ResourceAccess(BaseModel): ) class Meta: - db_table = "impress_resource_access" + db_table = "meet_resource_access" verbose_name = _("Resource access") verbose_name_plural = _("Resource accesses") constraints = [ @@ -294,7 +294,7 @@ class Room(Resource): ) class Meta: - db_table = "impress_room" + db_table = "meet_room" ordering = ("name",) verbose_name = _("Room") verbose_name_plural = _("Rooms") diff --git a/src/backend/core/tests/authentication/test_backends.py b/src/backend/core/tests/authentication/test_backends.py index c18635f2..f35d51c0 100644 --- a/src/backend/core/tests/authentication/test_backends.py +++ b/src/backend/core/tests/authentication/test_backends.py @@ -64,7 +64,7 @@ def test_authentication_getter_new_user_with_email(monkeypatch): """ klass = OIDCAuthenticationBackend() - email = "impress@example.com" + email = "meet@example.com" def get_userinfo_mocked(*args): return {"sub": "123", "email": email, "first_name": "John", "last_name": "Doe"} diff --git a/src/backend/core/tests/conftest.py b/src/backend/core/tests/conftest.py index 5a6a3e4a..c95c94fc 100644 --- a/src/backend/core/tests/conftest.py +++ b/src/backend/core/tests/conftest.py @@ -1,4 +1,4 @@ -"""Fixtures for tests in the impress core application""" +"""Fixtures for tests in the Meet core application""" from unittest import mock import pytest diff --git a/src/backend/core/tests/rooms/test_api_rooms_create.py b/src/backend/core/tests/rooms/test_api_rooms_create.py index 78e0e34d..c8b19161 100644 --- a/src/backend/core/tests/rooms/test_api_rooms_create.py +++ b/src/backend/core/tests/rooms/test_api_rooms_create.py @@ -1,5 +1,5 @@ """ -Test rooms API endpoints in the impress core app: create. +Test rooms API endpoints in the Meet core app: create. """ import pytest from rest_framework.test import APIClient diff --git a/src/backend/core/tests/rooms/test_api_rooms_delete.py b/src/backend/core/tests/rooms/test_api_rooms_delete.py index a37640a2..9924d824 100644 --- a/src/backend/core/tests/rooms/test_api_rooms_delete.py +++ b/src/backend/core/tests/rooms/test_api_rooms_delete.py @@ -1,5 +1,5 @@ """ -Test rooms API endpoints in the impress core app: delete. +Test rooms API endpoints in the Meet core app: delete. """ import pytest from rest_framework.test import APIClient diff --git a/src/backend/core/tests/rooms/test_api_rooms_list.py b/src/backend/core/tests/rooms/test_api_rooms_list.py index 0b5aa8ff..3777217b 100644 --- a/src/backend/core/tests/rooms/test_api_rooms_list.py +++ b/src/backend/core/tests/rooms/test_api_rooms_list.py @@ -1,5 +1,5 @@ """ -Test rooms API endpoints in the impress core app: list. +Test rooms API endpoints in the Meet core app: list. """ from unittest import mock diff --git a/src/backend/core/tests/rooms/test_api_rooms_retrieve.py b/src/backend/core/tests/rooms/test_api_rooms_retrieve.py index 71ef6674..8c5b5d9e 100644 --- a/src/backend/core/tests/rooms/test_api_rooms_retrieve.py +++ b/src/backend/core/tests/rooms/test_api_rooms_retrieve.py @@ -1,5 +1,5 @@ """ -Test rooms API endpoints in the impress core app: retrieve. +Test rooms API endpoints in the Meet core app: retrieve. """ import random from unittest import mock diff --git a/src/backend/core/tests/rooms/test_api_rooms_update.py b/src/backend/core/tests/rooms/test_api_rooms_update.py index bc83658e..cfd4f69c 100644 --- a/src/backend/core/tests/rooms/test_api_rooms_update.py +++ b/src/backend/core/tests/rooms/test_api_rooms_update.py @@ -1,5 +1,5 @@ """ -Test rooms API endpoints in the impress core app: update. +Test rooms API endpoints in the Meet core app: update. """ import random diff --git a/src/backend/core/tests/test_api_resource_accesses.py b/src/backend/core/tests/test_api_resource_accesses.py index 2653c495..522fe42b 100644 --- a/src/backend/core/tests/test_api_resource_accesses.py +++ b/src/backend/core/tests/test_api_resource_accesses.py @@ -1,5 +1,5 @@ """ -Test resource accesses API endpoints in the impress core app. +Test resource accesses API endpoints in the Meet core app. """ import random from unittest import mock diff --git a/src/backend/core/tests/test_api_users.py b/src/backend/core/tests/test_api_users.py index f746dbb4..2061db70 100644 --- a/src/backend/core/tests/test_api_users.py +++ b/src/backend/core/tests/test_api_users.py @@ -1,5 +1,5 @@ """ -Test users API endpoints in the impress core app. +Test users API endpoints in the Meet core app. """ import pytest from rest_framework.test import APIClient diff --git a/src/backend/core/tests/test_models_resource_accesses.py b/src/backend/core/tests/test_models_resource_accesses.py index df3e117d..ffcf85c8 100644 --- a/src/backend/core/tests/test_models_resource_accesses.py +++ b/src/backend/core/tests/test_models_resource_accesses.py @@ -14,40 +14,38 @@ def test_models_resource_accesses_user_str_member_room(): """The str representation should consist in the room and usernames.""" room = RoomFactory(name="my room") access = UserResourceAccessFactory( - resource=room, user__email="john.doe@impress.com", role="member" + resource=room, user__email="john.doe@meet.com", role="member" ) - assert str(access) == "Member role for john.doe@impress.com on my room" + assert str(access) == "Member role for john.doe@meet.com on my room" def test_models_resource_accesses_user_str_member_resource(): """The str representation should consist in the resource id and username.""" - access = UserResourceAccessFactory( - user__email="john.doe@impress.com", role="member" - ) + access = UserResourceAccessFactory(user__email="john.doe@meet.com", role="member") assert ( str(access) - == f"Member role for john.doe@impress.com on resource {access.resource_id!s}" + == f"Member role for john.doe@meet.com on resource {access.resource_id!s}" ) def test_models_resource_accesses_user_str_admin(): """The str representation for an admin user should include the role.""" access = UserResourceAccessFactory( - user__email="john.doe@impress.com", role="administrator" + user__email="john.doe@meet.com", role="administrator" ) assert ( str(access) - == f"Administrator role for john.doe@impress.com on resource {access.resource_id!s}" + == f"Administrator role for john.doe@meet.com on resource {access.resource_id!s}" ) def test_models_resource_accesses_user_str_owner(): """The str representation for an admin user should include the role.""" - access = UserResourceAccessFactory(user__email="john.doe@impress.com", role="owner") + access = UserResourceAccessFactory(user__email="john.doe@meet.com", role="owner") assert ( str(access) - == f"Owner role for john.doe@impress.com on resource {access.resource_id!s}" + == f"Owner role for john.doe@meet.com on resource {access.resource_id!s}" ) diff --git a/src/backend/demo/management/commands/create_demo.py b/src/backend/demo/management/commands/create_demo.py index d1ed5e21..b0ef890e 100644 --- a/src/backend/demo/management/commands/create_demo.py +++ b/src/backend/demo/management/commands/create_demo.py @@ -18,7 +18,7 @@ from demo import defaults fake = Faker() -logger = logging.getLogger("impress.commands.demo.create_demo") +logger = logging.getLogger("meet.commands.demo.create_demo") def random_true_with_probability(probability): diff --git a/src/backend/locale/en_US/LC_MESSAGES/django.po b/src/backend/locale/en_US/LC_MESSAGES/django.po index 1f30e5f9..710b7dc2 100644 --- a/src/backend/locale/en_US/LC_MESSAGES/django.po +++ b/src/backend/locale/en_US/LC_MESSAGES/django.po @@ -199,10 +199,10 @@ msgstr "" msgid "Either user or team must be set, not both." msgstr "" -#: impress/settings.py:134 +#: meet/settings.py:134 msgid "English" msgstr "" -#: impress/settings.py:135 +#: meet/settings.py:135 msgid "French" msgstr "" diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.po b/src/backend/locale/fr_FR/LC_MESSAGES/django.po index 1f30e5f9..710b7dc2 100644 --- a/src/backend/locale/fr_FR/LC_MESSAGES/django.po +++ b/src/backend/locale/fr_FR/LC_MESSAGES/django.po @@ -199,10 +199,10 @@ msgstr "" msgid "Either user or team must be set, not both." msgstr "" -#: impress/settings.py:134 +#: meet/settings.py:134 msgid "English" msgstr "" -#: impress/settings.py:135 +#: meet/settings.py:135 msgid "French" msgstr "" diff --git a/src/backend/manage.py b/src/backend/manage.py index 78b98ee5..e1e11f02 100644 --- a/src/backend/manage.py +++ b/src/backend/manage.py @@ -1,12 +1,12 @@ #!/usr/bin/env python """ -impress's sandbox management script. +meet's sandbox management script. """ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "impress.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meet.settings") os.environ.setdefault("DJANGO_CONFIGURATION", "Development") from configurations.management import execute_from_command_line diff --git a/src/backend/impress/__init__.py b/src/backend/meet/__init__.py similarity index 100% rename from src/backend/impress/__init__.py rename to src/backend/meet/__init__.py diff --git a/src/backend/impress/celery_app.py b/src/backend/meet/celery_app.py similarity index 81% rename from src/backend/impress/celery_app.py rename to src/backend/meet/celery_app.py index 1cf11953..925c0d11 100644 --- a/src/backend/impress/celery_app.py +++ b/src/backend/meet/celery_app.py @@ -1,16 +1,16 @@ -"""Impress celery configuration file.""" +"""Meet celery configuration file.""" import os from celery import Celery from configurations.importer import install # Set the default Django settings module for the 'celery' program. -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "impress.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meet.settings") os.environ.setdefault("DJANGO_CONFIGURATION", "Development") install(check_options=True) -app = Celery("impress") +app = Celery("meet") # Using a string here means the worker doesn't have to serialize # the configuration object to child processes. diff --git a/src/backend/impress/settings.py b/src/backend/meet/settings.py similarity index 96% rename from src/backend/impress/settings.py rename to src/backend/meet/settings.py index 9fb70b2d..29d5b3c6 100755 --- a/src/backend/impress/settings.py +++ b/src/backend/meet/settings.py @@ -1,5 +1,5 @@ """ -Django settings for impress project. +Django settings for Meet project. Generated by 'django-admin startproject' using Django 3.1.5. @@ -72,8 +72,8 @@ class Base(Configuration): SECRET_KEY = values.Value(None) # Application definition - ROOT_URLCONF = "impress.urls" - WSGI_APPLICATION = "impress.wsgi.application" + ROOT_URLCONF = "meet.urls" + WSGI_APPLICATION = "meet.wsgi.application" # Database DATABASES = { @@ -83,9 +83,7 @@ class Base(Configuration): environ_name="DB_ENGINE", environ_prefix=None, ), - "NAME": values.Value( - "impress", environ_name="DB_NAME", environ_prefix=None - ), + "NAME": values.Value("meet", environ_name="DB_NAME", environ_prefix=None), "USER": values.Value("dinum", environ_name="DB_USER", environ_prefix=None), "PASSWORD": values.Value( "pass", environ_name="DB_PASSWORD", environ_prefix=None @@ -132,7 +130,7 @@ class Base(Configuration): environ_name="AWS_S3_REGION_NAME", environ_prefix=None ) AWS_STORAGE_BUCKET_NAME = values.Value( - "impress-media-storage", + "meet-media-storage", environ_name="AWS_STORAGE_BUCKET_NAME", environ_prefix=None, ) @@ -211,7 +209,7 @@ class Base(Configuration): # Django applications from the highest priority to the lowest INSTALLED_APPS = [ - # impress + # Meet "core", "demo", "drf_spectacular", @@ -256,8 +254,8 @@ class Base(Configuration): } SPECTACULAR_SETTINGS = { - "TITLE": "Impress API", - "DESCRIPTION": "This is the impress API schema.", + "TITLE": "Meet API", + "DESCRIPTION": "This is the Meet API schema.", "VERSION": "1.0.0", "SERVE_INCLUDE_SCHEMA": False, "ENABLE_DJANGO_DEPLOY_CHECK": values.BooleanValue( @@ -376,10 +374,10 @@ class Base(Configuration): ), } DEFAULT_ROOM_IS_PUBLIC = values.BooleanValue( - True, environ_name="MAGNIFY_DEFAULT_ROOM_IS_PUBLIC", environ_prefix=None + True, environ_name="DEFAULT_ROOM_IS_PUBLIC", environ_prefix=None ) ALLOW_UNREGISTERED_ROOMS = values.BooleanValue( - True, environ_name="MAGNIFY_ALLOW_UNREGISTERED_ROOMS", environ_prefix=None + True, environ_name="ALLOW_UNREGISTERED_ROOMS", environ_prefix=None ) # pylint: disable=invalid-name @@ -465,7 +463,7 @@ class Development(Base): CSRF_TRUSTED_ORIGINS = ["http://localhost:8072", "http://localhost:3000"] DEBUG = True - SESSION_COOKIE_NAME = "impress_sessionid" + SESSION_COOKIE_NAME = "meet_sessionid" USE_SWAGGER = True @@ -487,7 +485,7 @@ class Test(Base): }, }, "loggers": { - "impress": { + "meet": { "handlers": ["console"], "level": "DEBUG", }, diff --git a/src/backend/impress/urls.py b/src/backend/meet/urls.py similarity index 96% rename from src/backend/impress/urls.py rename to src/backend/meet/urls.py index 5dc490ac..2bb20d06 100644 --- a/src/backend/impress/urls.py +++ b/src/backend/meet/urls.py @@ -1,4 +1,4 @@ -"""URL configuration for the impress project""" +"""URL configuration for the Meet project""" from django.conf import settings from django.conf.urls.static import static diff --git a/src/backend/impress/wsgi.py b/src/backend/meet/wsgi.py similarity index 77% rename from src/backend/impress/wsgi.py rename to src/backend/meet/wsgi.py index 6076021c..19835f8c 100644 --- a/src/backend/impress/wsgi.py +++ b/src/backend/meet/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for the impress project. +WSGI config for the Meet project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,7 +11,7 @@ import os from configurations.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "impress.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meet.settings") os.environ.setdefault("DJANGO_CONFIGURATION", "Development") application = get_wsgi_application() diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index f243bb52..59b2cfa8 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -1,12 +1,12 @@ # -# impress package +# Meet package # [build-system] requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] -name = "impress" +name = "meet" version = "0.1.0" authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }] classifiers = [ @@ -123,8 +123,8 @@ select = [ ] [tool.ruff.lint.isort] -section-order = ["future","standard-library","django","third-party","impress","first-party","local-folder"] -sections = { impress=["core"], django=["django"] } +section-order = ["future","standard-library","django","third-party","meet","first-party","local-folder"] +sections = { meet=["core"], django=["django"] } [tool.ruff.per-file-ignores] "**/tests/*" = ["S", "SLF"] diff --git a/src/backend/setup.py b/src/backend/setup.py index 8dcbc647..928355c4 100644 --- a/src/backend/setup.py +++ b/src/backend/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -"""Setup file for the impress module. All configuration stands in the setup.cfg file.""" +"""Setup file for the meet module. All configuration stands in the setup.cfg file.""" # coding: utf-8 from setuptools import setup