workers-control 0.2.0__tar.gz → 0.2.2__tar.gz

{workers_control-0.2.0/src/workers_control.egg-info → workers_control-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-control
-Version: 0.2.0
+Version: 0.2.2
 Summary: A flask app for labour time accounting.
 License-Expression: AGPL-3.0-or-later
 Project-URL: Source, https://github.com/ida-arbeitszeit/workers-control
@@ -20,7 +20,7 @@ Requires-Dist: flask-babel==4.0.0
 Requires-Dist: flask-talisman==1.1.0
 Requires-Dist: flask-login==0.6.3
 Requires-Dist: flask-wtf==1.2.2
-Requires-Dist: matplotlib<=3.10.8,>=3.10.5
+Requires-Dist: matplotlib<=3.10.9,>=3.10.5
 Provides-Extra: profiling
 Requires-Dist: flask_profiler; extra == "profiling"
 Dynamic: license-file

{workers_control-0.2.0 → workers_control-0.2.2}/pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "workers-control"
-version = "0.2.0"
+version = "0.2.2"
 description = "A flask app for labour time accounting."
 license = "AGPL-3.0-or-later"
 requires-python = ">=3.12"
@@ -26,7 +26,7 @@ dependencies = [
     "flask-talisman==1.1.0",
     "flask-login==0.6.3",
     "flask-wtf==1.2.2",
-    "matplotlib>=3.10.5, <=3.10.8" # different versions in stable/unstable nixpkgs
+    "matplotlib>=3.10.5, <=3.10.9" # different versions in stable/unstable nixpkgs
 ]
 
 [project.optional-dependencies]

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/core/email_notifications.py

@@ -57,6 +57,12 @@ class EmailChangeConfirmation:
     new_email_address: str
 
 
+@dataclass
+class NameChangeConfirmation:
+    email_address: str
+    new_name: str
+
+
 @dataclass
 class CooperationRequestEmail:
     coordinator_email_address: str
@@ -102,6 +108,7 @@ Message: TypeAlias = Union[
     EmailChangeWarning,
     EmailChangeConfirmation,
     MemberRegistration,
+    NameChangeConfirmation,
     RejectedPlanNotification,
     ResetPasswordConfirmation,
     ResetPasswordRequest,

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/core/interactors/change_user_email_address.py

@@ -31,6 +31,9 @@ class ChangeUserEmailAddressInteractor:
             account_credentials.update().change_email_address(
                 request.new_email
             ).perform()
+            self.database.get_password_reset_requests().with_email_address(
+                old_email
+            ).delete()
             self.database.get_email_addresses().with_address(old_email).delete()
             self.database.get_email_addresses().with_address(
                 request.new_email

workers_control-0.2.2/src/workers_control/core/interactors/change_user_name.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+import enum
+from dataclasses import dataclass
+from uuid import UUID
+
+from workers_control.core.email_notifications import (
+    EmailSender,
+    NameChangeConfirmation,
+)
+from workers_control.core.password_hasher import PasswordHasher
+from workers_control.core.repositories import DatabaseGateway
+
+MAX_NAME_LENGTH = 150
+
+
+@dataclass
+class Request:
+    user_id: UUID
+    new_name: str
+    current_password: str
+
+
+@dataclass
+class Response:
+    class RejectionReason(Exception, enum.Enum):
+        invalid_name = enum.auto()
+        user_not_found = enum.auto()
+        incorrect_password = enum.auto()
+
+    rejection_reason: RejectionReason | None
+
+
+@dataclass
+class ChangeUserNameInteractor:
+    database: DatabaseGateway
+    email_sender: EmailSender
+    password_hasher: PasswordHasher
+
+    def change_user_name(self, request: Request) -> Response:
+        if not request.new_name or len(request.new_name) > MAX_NAME_LENGTH:
+            return Response(rejection_reason=Response.RejectionReason.invalid_name)
+
+        member_query = self.database.get_members().with_id(request.user_id)
+        company_query = self.database.get_companies().with_id(request.user_id)
+        accountant_query = self.database.get_accountants().with_id(request.user_id)
+        matching_query = member_query or company_query or accountant_query
+
+        record = matching_query.joined_with_email_address().first()
+        if not record:
+            return Response(rejection_reason=Response.RejectionReason.user_not_found)
+
+        _, email = record
+        credentials = (
+            self.database.get_account_credentials()
+            .with_email_address(email.address)
+            .first()
+        )
+        if not credentials or not self.password_hasher.is_password_matching_hash(
+            request.current_password, credentials.password_hash
+        ):
+            return Response(
+                rejection_reason=Response.RejectionReason.incorrect_password
+            )
+
+        matching_query.update().set_name(request.new_name).perform()
+        self.email_sender.send_email(
+            NameChangeConfirmation(
+                email_address=email.address,
+                new_name=request.new_name,
+            )
+        )
+        return Response(rejection_reason=None)

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/core/interactors/show_basic_service.py

@@ -18,6 +18,7 @@ class ShowBasicServiceResponse:
     @dataclass
     class Details:
         provider_name: str
+        provider_email: str
         name: str
         description: str
         created_on: datetime
@@ -39,13 +40,18 @@ class ShowBasicServiceInteractor:
         )
         if basic_service is None:
             return ShowBasicServiceResponse(details=None)
-        member = (
-            self.database_gateway.get_members().with_id(basic_service.provider).first()
+        result = (
+            self.database_gateway.get_members()
+            .with_id(basic_service.provider)
+            .joined_with_email_address()
+            .first()
         )
-        assert member
+        assert result
+        member, email = result
         return ShowBasicServiceResponse(
             details=ShowBasicServiceResponse.Details(
                 provider_name=member.name,
+                provider_email=email.address,
                 name=basic_service.name,
                 description=basic_service.description,
                 created_on=basic_service.created_on,

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/core/records.py

@@ -360,3 +360,13 @@ class RegisteredHoursWorked:
     transfer_of_work_certificates: UUID
     transfer_of_taxes: UUID
     registered_on: datetime
+
+
+@dataclass
+class Email:
+    id: UUID
+    created_at: datetime
+    recipient: str
+    sender: str
+    subject: str
+    html: str

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/core/repositories.py

@@ -244,6 +244,12 @@ class MemberResult(QueryResult[records.Member], Protocol):
         self,
     ) -> QueryResult[Tuple[records.Member, records.EmailAddress]]: ...
 
+    def update(self) -> MemberUpdate: ...
+
+
+class MemberUpdate(DatabaseUpdate, Protocol):
+    def set_name(self, name: str) -> Self: ...
+
 
 class PrivateConsumptionResult(QueryResult[records.PrivateConsumption], Protocol):
     def ordered_by_creation_date(self, *, ascending: bool = ...) -> Self: ...
@@ -374,6 +380,12 @@ class CompanyResult(QueryResult[records.Company], Protocol):
         self,
     ) -> QueryResult[Tuple[records.Company, records.EmailAddress]]: ...
 
+    def update(self) -> CompanyUpdate: ...
+
+
+class CompanyUpdate(DatabaseUpdate, Protocol):
+    def set_name(self, name: str) -> Self: ...
+
 
 class AccountantResult(QueryResult[records.Accountant], Protocol):
     def with_email_address(self, email: str) -> Self: ...
@@ -384,6 +396,12 @@ class AccountantResult(QueryResult[records.Accountant], Protocol):
         self,
     ) -> QueryResult[Tuple[records.Accountant, records.EmailAddress]]: ...
 
+    def update(self) -> AccountantUpdate: ...
+
+
+class AccountantUpdate(DatabaseUpdate, Protocol):
+    def set_name(self, name: str) -> Self: ...
+
 
 class TransferResult(QueryResult[records.Transfer], Protocol):
     def where_account_is_debtor(self, *account: UUID) -> Self: ...
@@ -518,6 +536,8 @@ class PasswordResetRequestResult(QueryResult[records.PasswordResetRequest], Prot
 
     def with_creation_date_after(self, creation_threshold: datetime) -> Self: ...
 
+    def delete(self) -> None: ...
+
 
 class LanguageRepository(Protocol):
     def get_available_language_codes(self) -> Iterable[str]: ...
@@ -577,6 +597,24 @@ class BasicServiceUpdate(DatabaseUpdate, Protocol):
     def set_deactivated_on(self, deactivated_on: datetime) -> Self: ...
 
 
+class EmailResult(QueryResult[records.Email], Protocol):
+    def with_id(self, id_: UUID) -> Self: ...
+
+    def that_have_not_been_sent(self) -> Self: ...
+
+    def ordered_by_creation_date(self, ascending: bool = ...) -> Self: ...
+
+    def update(self) -> EmailUpdate: ...
+
+
+class EmailUpdate(DatabaseUpdate, Protocol):
+    def set_sent_at(self, sent_at: datetime) -> Self: ...
+
+    def set_last_error(self, message: str) -> Self: ...
+
+    def increment_retry_count(self) -> Self: ...
+
+
 class DatabaseGateway(Protocol):
     def create_private_consumption(
         self,
@@ -777,3 +815,9 @@ class DatabaseGateway(Protocol):
     ) -> records.BasicService: ...
 
     def get_basic_services(self) -> BasicServiceResult: ...
+
+    def create_email(
+        self, created_at: datetime, recipient: str, sender: str, subject: str, html: str
+    ) -> records.Email: ...
+
+    def get_emails(self) -> EmailResult: ...

workers_control-0.2.2/src/workers_control/db/migrations/versions/68ac7ccf6086_create_table_emailoutbox.py

@@ -0,0 +1,34 @@
+"""Create table EmailOutbox
+
+Revision ID: 68ac7ccf6086
+Revises: 17911726c134
+Create Date: 2026-01-31 07:42:03.847387
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '68ac7ccf6086'
+down_revision: Union[str, None] = '17911726c134'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table('email_outbox',
+    sa.Column('id', sa.UUID(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.Column('recipient', sa.String(length=1000), nullable=False),
+    sa.Column('sender', sa.String(length=1000), nullable=False),
+    sa.Column('subject', sa.String(length=1000), nullable=False),
+    sa.Column('html', sa.Text(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+
+
+def downgrade() -> None:
+    op.drop_table('email_outbox')

workers_control-0.2.2/src/workers_control/db/migrations/versions/c9f2e1a4b8d7_add_outbox_status_columns.py

@@ -0,0 +1,43 @@
+"""Add status columns to email_outbox
+
+Revision ID: c9f2e1a4b8d7
+Revises: 68ac7ccf6086
+Create Date: 2026-05-09 16:55:00.000000
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'c9f2e1a4b8d7'
+down_revision: Union[str, Sequence[str], None] = '68ac7ccf6086'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        'email_outbox',
+        sa.Column('sent_at', sa.DateTime(), nullable=True),
+    )
+    op.add_column(
+        'email_outbox',
+        sa.Column(
+            'retry_count',
+            sa.Integer(),
+            nullable=False,
+            server_default=sa.text('0'),
+        ),
+    )
+    op.add_column(
+        'email_outbox',
+        sa.Column('last_error', sa.Text(), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column('email_outbox', 'last_error')
+    op.drop_column('email_outbox', 'retry_count')
+    op.drop_column('email_outbox', 'sent_at')

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/db/models.py

@@ -16,6 +16,7 @@ from sqlalchemy import (
     ForeignKey,
     String,
     Table,
+    Text,
     TypeDecorator,
     Uuid,
     event,
@@ -390,3 +391,17 @@ class BasicService(Base):
     provider: Mapped[UUID] = mapped_column(Uuid, ForeignKey("member.id"))
     created_on: Mapped[datetime] = mapped_column(TZDateTime)
     deactivated_on: Mapped[datetime | None] = mapped_column(TZDateTime)
+
+
+class EmailOutbox(Base):
+    __tablename__ = "email_outbox"
+
+    id: Mapped[UUID] = mapped_column(Uuid, primary_key=True, default=uuid4)
+    created_at: Mapped[datetime] = mapped_column(TZDateTime)
+    recipient: Mapped[str] = mapped_column(String(1000))
+    sender: Mapped[str] = mapped_column(String(1000))
+    subject: Mapped[str] = mapped_column(String(1000))
+    html: Mapped[str] = mapped_column(Text)
+    sent_at: Mapped[datetime | None] = mapped_column(TZDateTime)
+    retry_count: Mapped[int] = mapped_column(default=0)
+    last_error: Mapped[str | None] = mapped_column(Text)

{workers_control-0.2.0 → workers_control-0.2.2}/src/workers_control/db/repositories.py

@@ -691,6 +691,36 @@ class MemberQueryResult(SqlQueryResult[records.Member]):
             .with_entities(models.Member, email),
         )
 
+    def update(self) -> MemberUpdate:
+        return MemberUpdate(db=self.db, query=self.query)
+
+
+@dataclass
+class MemberUpdate:
+    db: Database
+    query: Query
+    changes: Dict[str, Any] = field(default_factory=dict)
+
+    def set_name(self, name: str) -> Self:
+        return replace(self, changes=dict(self.changes, name=name))
+
+    def perform(self) -> int:
+        if not self.changes:
+            return 0
+        sql_statement = (
+            update(models.Member)
+            .where(
+                models.Member.id.in_(
+                    self.query.with_entities(models.Member.id).scalar_subquery()
+                )
+            )
+            .values(**self.changes)
+            .execution_options(synchronize_session="fetch")
+        )
+        rowcount = cast(CursorResult, self.db.session.execute(sql_statement)).rowcount
+        self.db.session.flush()
+        return rowcount
+
 
 class CompanyQueryResult(SqlQueryResult[records.Company]):
     def with_id(self, id_: UUID) -> Self:
@@ -788,6 +818,36 @@ class CompanyQueryResult(SqlQueryResult[records.Company]):
             .with_entities(models.Company, email),
         )
 
+    def update(self) -> CompanyUpdate:
+        return CompanyUpdate(db=self.db, query=self.query)
+
+
+@dataclass
+class CompanyUpdate:
+    db: Database
+    query: Query
+    changes: Dict[str, Any] = field(default_factory=dict)
+
+    def set_name(self, name: str) -> Self:
+        return replace(self, changes=dict(self.changes, name=name))
+
+    def perform(self) -> int:
+        if not self.changes:
+            return 0
+        sql_statement = (
+            update(models.Company)
+            .where(
+                models.Company.id.in_(
+                    self.query.with_entities(models.Company.id).scalar_subquery()
+                )
+            )
+            .values(**self.changes)
+            .execution_options(synchronize_session="fetch")
+        )
+        rowcount = cast(CursorResult, self.db.session.execute(sql_statement)).rowcount
+        self.db.session.flush()
+        return rowcount
+
 
 class AccountantResult(SqlQueryResult[records.Accountant]):
     def with_email_address(self, email: str) -> Self:
@@ -826,6 +886,36 @@ class AccountantResult(SqlQueryResult[records.Accountant]):
             mapper=mapper,
         )
 
+    def update(self) -> AccountantUpdate:
+        return AccountantUpdate(db=self.db, query=self.query)
+
+
+@dataclass
+class AccountantUpdate:
+    db: Database
+    query: Query
+    changes: Dict[str, Any] = field(default_factory=dict)
+
+    def set_name(self, name: str) -> Self:
+        return replace(self, changes=dict(self.changes, name=name))
+
+    def perform(self) -> int:
+        if not self.changes:
+            return 0
+        sql_statement = (
+            update(models.Accountant)
+            .where(
+                models.Accountant.id.in_(
+                    self.query.with_entities(models.Accountant.id).scalar_subquery()
+                )
+            )
+            .values(**self.changes)
+            .execution_options(synchronize_session="fetch")
+        )
+        rowcount = cast(CursorResult, self.db.session.execute(sql_statement)).rowcount
+        self.db.session.flush()
+        return rowcount
+
 
 class TransferQueryResult(SqlQueryResult[records.Transfer]):
     def where_account_is_debtor(self, *account: UUID) -> Self:
@@ -2349,6 +2439,10 @@ class PasswordResetRequestResult(SqlQueryResult[records.PasswordResetRequest]):
             )
         )
 
+    def delete(self) -> None:
+        self.query.delete()
+        self.db.session.flush()
+
 
 class BasicServiceResult(SqlQueryResult[records.BasicService]):
     def with_id(self, id_: UUID) -> Self:
@@ -2455,6 +2549,74 @@ class BasicServiceUpdate:
         return cast(CursorResult, result).rowcount
 
 
+class EmailResult(SqlQueryResult[records.Email]):
+    def with_id(self, id_: UUID) -> Self:
+        return self._with_modified_query(
+            lambda query: query.filter(models.EmailOutbox.id == id_)
+        )
+
+    def that_have_not_been_sent(self) -> Self:
+        return self._with_modified_query(
+            lambda query: query.filter(models.EmailOutbox.sent_at.is_(None))
+        )
+
+    def ordered_by_creation_date(self, ascending: bool = True) -> Self:
+        ordering = (
+            models.EmailOutbox.created_at.asc()
+            if ascending
+            else models.EmailOutbox.created_at.desc()
+        )
+        return self._with_modified_query(lambda query: query.order_by(ordering))
+
+    def update(self) -> EmailUpdate:
+        return EmailUpdate(query=self.query, db=self.db)
+
+
+@dataclass
+class EmailUpdate:
+    query: Query
+    db: Database
+    update_values: Dict[str, Any] = field(default_factory=dict)
+
+    def set_sent_at(self, sent_at: datetime) -> Self:
+        return replace(
+            self,
+            update_values=dict(self.update_values, sent_at=sent_at),
+        )
+
+    def set_last_error(self, message: str) -> Self:
+        return replace(
+            self,
+            update_values=dict(self.update_values, last_error=message),
+        )
+
+    def increment_retry_count(self) -> Self:
+        return replace(
+            self,
+            update_values=dict(
+                self.update_values,
+                retry_count=models.EmailOutbox.retry_count + 1,
+            ),
+        )
+
+    def perform(self) -> int:
+        if not self.update_values:
+            return 0
+        sql_statement = (
+            update(models.EmailOutbox)
+            .where(
+                models.EmailOutbox.id.in_(
+                    self.query.with_entities(models.EmailOutbox.id).scalar_subquery()
+                )
+            )
+            .values(**self.update_values)
+            .execution_options(synchronize_session="fetch")
+        )
+        result = self.db.session.execute(sql_statement)
+        self.db.session.flush()
+        return cast(CursorResult, result).rowcount
+
+
 @dataclass
 class DatabaseGatewayImpl:
     db: Database
@@ -3234,3 +3396,36 @@ class DatabaseGatewayImpl:
             query=self.db.session.query(models.BasicService),
             mapper=self.basic_service_from_orm,
         )
+
+    def create_email(
+        self, created_at: datetime, recipient: str, sender: str, subject: str, html: str
+    ) -> records.Email:
+        orm = models.EmailOutbox(
+            id=uuid4(),
+            created_at=created_at,
+            recipient=recipient,
+            sender=sender,
+            subject=subject,
+            html=html,
+        )
+        self.db.session.add(orm)
+        self.db.session.flush()
+        return self.email_from_orm(orm)
+
+    def get_emails(self) -> EmailResult:
+        return EmailResult(
+            db=self.db,
+            query=self.db.session.query(models.EmailOutbox),
+            mapper=self.email_from_orm,
+        )
+
+    @classmethod
+    def email_from_orm(cls, orm: models.EmailOutbox) -> records.Email:
+        return records.Email(
+            id=orm.id,
+            created_at=orm.created_at,
+            recipient=orm.recipient,
+            sender=orm.sender,
+            subject=orm.subject,
+            html=orm.html,
+        )

workers_control-0.2.2/src/workers_control/email_sending_worker/interface.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+
+
+class EmailSenderPlugin(ABC):
+    @abstractmethod
+    def send_message(
+        self,
+        subject: str,
+        recipient: list[str],
+        html: str,
+        sender: str,
+    ) -> None:
+        pass

workers_control-0.2.0/src/workers_control/flask/mail_service/smtp_mail_service.py → workers_control-0.2.2/src/workers_control/email_sending_worker/smtp_service.py

@@ -1,19 +1,30 @@
 import email.utils
 from contextlib import contextmanager
+from dataclasses import dataclass
 from email.message import EmailMessage
 from smtplib import SMTP, SMTP_SSL
 from typing import Generator
 
-from flask import current_app
+from workers_control.email_sending_worker.interface import EmailSenderPlugin
 
-from .interface import EmailPlugin
 
+@dataclass
+class SmtpMailServerConfig:
+    mail_server: str
+    mail_port: int
+    encryption_type: str
+    username: str | None = None
+    password: str | None = None
+
+
+@dataclass
+class SmtpMailService(EmailSenderPlugin):
+    config: SmtpMailServerConfig
 
-class SmtpMailService(EmailPlugin):
     def send_message(
         self,
         subject: str,
-        recipients: list[str],
+        recipient: list[str],
         html: str,
         sender: str,
     ) -> None:
@@ -24,19 +35,15 @@ class SmtpMailService(EmailPlugin):
         message.set_content(html, subtype="html")
 
         with self.create_smtp_connection() as connection:
-            for recipient in recipients:
-                del message["Message-ID"]
-                del message["To"]
-                message["Message-ID"] = email.utils.make_msgid(domain="workers-control")
-                message["To"] = recipient
-                connection.send_message(message)
-
-    @classmethod
+            message["Message-ID"] = email.utils.make_msgid(domain="workers-control")
+            message["To"] = recipient
+            connection.send_message(message)
+
     @contextmanager
-    def create_smtp_connection(cls) -> Generator[SMTP | SMTP_SSL, None, None]:
-        server = current_app.config.get("MAIL_SERVER", "localhost")
-        port = current_app.config.get("MAIL_PORT", 587)
-        encryption_type = current_app.config.get("MAIL_ENCRYPTION_TYPE", "tls")
+    def create_smtp_connection(self) -> Generator[SMTP | SMTP_SSL, None, None]:
+        server = self.config.mail_server
+        port = self.config.mail_port
+        encryption_type = self.config.encryption_type
         connection: SMTP | SMTP_SSL
 
         if encryption_type == "ssl":
@@ -46,8 +53,8 @@ class SmtpMailService(EmailPlugin):
             connection.starttls()
 
         connection.ehlo()
-        username = current_app.config.get("MAIL_USERNAME", "")
-        password = current_app.config.get("MAIL_PASSWORD", "")
+        username = self.config.username
+        password = self.config.password
         if username and password:
             connection.login(username, password)
         yield connection