studio/meet
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚚(backend) rename Impress to Meet

Browse Source 
I have updated all references of "Impress" to "Meet".
Migrations were manually updated and not regenerated. Never-mind,
they all will be squashed before the first release.

I have also searched for reference to "Magnify", and replaced them
by "Meet".

While updating the backend sources, I have also fixed other parts of
the project, namely:
- Compose file
- Github documentation and CI
- Makefile commands
This commit is contained in:
lebaudantoine
2024-07-01 18:10:40 +02:00
committed by antoine lebaud
parent 78e6f26383
commit 64efcc1623
42 changed files with 111 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/MANIFEST.in
View File

@@ -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

2
src/backend/core/api/__init__.py
View File

@@ -1,4 +1,4 @@
"""Impress core API endpoints"""
"""Meet core API endpoints"""
from django.conf import settings
from django.core.exceptions import ValidationError

2
src/backend/core/api/permissions.py
View File

@@ -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

2
src/backend/core/api/serializers.py
View File

@@ -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

6
src/backend/core/apps.py
View File

@@ -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")

2
src/backend/core/authentication/backends.py
View File

@@ -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 _

12
src/backend/core/migrations/0001_initial.py
View File

@@ -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',),
},
),

8
src/backend/core/migrations/0003_resource_remove_documentaccess_document_and_more.py
View File

@@ -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(

10
src/backend/core/models.py
View File

@@ -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")

2
src/backend/core/tests/authentication/test_backends.py
View File

@@ -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"}

2
src/backend/core/tests/conftest.py
View File

@@ -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

2
src/backend/core/tests/rooms/test_api_rooms_create.py
View File

@@ -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

2
src/backend/core/tests/rooms/test_api_rooms_delete.py
View File

@@ -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

2
src/backend/core/tests/rooms/test_api_rooms_list.py
View File

@@ -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

2
src/backend/core/tests/rooms/test_api_rooms_retrieve.py
View File

@@ -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

2
src/backend/core/tests/rooms/test_api_rooms_update.py
View File

@@ -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

2
src/backend/core/tests/test_api_resource_accesses.py
View File

@@ -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

2
src/backend/core/tests/test_api_users.py
View File

@@ -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

18
src/backend/core/tests/test_models_resource_accesses.py
View File

@@ -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}"
)

2
src/backend/demo/management/commands/create_demo.py
View File

@@ -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):

4
src/backend/locale/en_US/LC_MESSAGES/django.po
View File

@@ -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 ""

4
src/backend/locale/fr_FR/LC_MESSAGES/django.po
View File

@@ -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 ""

4
src/backend/manage.py
View File

@@ -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

0
src/backend/impress/__init__.py → src/backend/meet/__init__.py
View File

6
src/backend/impress/celery_app.py → src/backend/meet/celery_app.py
View File

@@ -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.

26
src/backend/impress/settings.py → src/backend/meet/settings.py
View File

@@ -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",
},

2
src/backend/impress/urls.py → src/backend/meet/urls.py
View File

@@ -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

4
src/backend/impress/wsgi.py → src/backend/meet/wsgi.py
View File

@@ -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()

8
src/backend/pyproject.toml
View File

@@ -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"]

2
src/backend/setup.py
View File

@@ -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