Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1657717
chore: add pytest/ruff/coverage config, fixtures, and __pycache__ ignore
annaputilovskaya Oct 18, 2026
8bdc389
fix: correct recipients swagger decorator method name
annaputilovskaya Oct 18, 2026
f7234ab
fix: env-driven settings, pagination, and real Swagger metadata
annaputilovskaya Oct 18, 2026
5a9160f
fix: hash passwords via serializer, add email-based UserManager
annaputilovskaya Oct 18, 2026
9a140b8
fix: add type hints to user manager and serializer, apply ruff format
annaputilovskaya Oct 18, 2026
2c6065d
test: add auth smoke tests (register/login/refresh)
annaputilovskaya Oct 18, 2026
43c41e2
test: add recipient CRUD and validation tests
annaputilovskaya Oct 18, 2026
09bca58
fix: add Notification.owner and safe __str__
annaputilovskaya Oct 18, 2026
9cde813
fix: scope notifications to owner and repair retrieve route
annaputilovskaya Oct 18, 2026
58d8958
fix: configurable SMS test flag, use logger instead of print
annaputilovskaya Oct 18, 2026
2558060
fix: restore original settings import in strategies
annaputilovskaya Oct 18, 2026
bbc7aa6
fix: symmetric retry handling and single terminal retry in send_notif…
annaputilovskaya Oct 18, 2026
37f7f8f
fix: ensure MaxRetriesExceededError surfaces on retry exhaustion
annaputilovskaya Oct 18, 2026
1a4d5a3
fix: drop process-wide socket timeout in email check
annaputilovskaya Oct 18, 2026
1667ca8
fix: require env credentials for csu superuser
annaputilovskaya Oct 18, 2026
11996bd
test: add swagger smoke test; apply ruff format and lint
annaputilovskaya Oct 18, 2026
929d674
fix: surface SMTP check errors, retry on transient DB errors, make st…
annaputilovskaya Oct 18, 2026
b52ec23
Merge pull request #12 from annaputilovskaya/feature/notificationserv…
annaputilovskaya Oct 18, 2026
f8ab142
docs: add MIT license
annaputilovskaya Oct 18, 2026
6fef473
ci: add ruff + pytest workflow with self-generated coverage badge
annaputilovskaya Oct 18, 2026
648ff2c
docs: add Russian README per standard template
annaputilovskaya Oct 18, 2026
d05d133
docs: rewrite README (EN) per standard template
annaputilovskaya Oct 18, 2026
26162aa
chore: set real gist id for coverage badge
annaputilovskaya Oct 18, 2026
b898bec
fix: quote mermaid node labels for GitHub rendering
annaputilovskaya Oct 18, 2026
7a04d83
docs: update notifications screenshot in READMEs
annaputilovskaya Oct 18, 2026
97b9b88
fix: create logs directory on settings import for fresh checkouts
annaputilovskaya Oct 18, 2026
bd4f4a9
Merge pull request #13 from annaputilovskaya/feature/notificationserv…
annaputilovskaya Oct 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
SECRET_KEY=

# Django
DEBUG=False
ALLOWED_HOSTS=localhost,127.0.0.1
CORS_ALLOWED_ORIGINS=http://localhost:8000

# Database
POSTGRES_DB=
POSTGRES_USER=
Expand Down Expand Up @@ -32,3 +37,4 @@ TELEGRAM_TOKEN=
# SMS
SMS_API_KEY=
SMS_SENDER=
SMS_TEST=0
75 changes: 75 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: CI

on:
push:
branches: [main]
pull_request:

jobs:
test:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:17
env:
POSTGRES_USER: test
POSTGRES_PASSWORD: test
POSTGRES_DB: test
ports:
- 5432:5432
options: >-
--health-cmd "pg_isready -U test"
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
SECRET_KEY: ci-secret-key
DEBUG: "False"
ALLOWED_HOSTS: localhost,127.0.0.1
POSTGRES_DB: test
POSTGRES_USER: test
POSTGRES_PASSWORD: test
POSTGRES_HOST: localhost
POSTGRES_PORT: "5432"
CELERY_BROKER_URL: amqp://guest:guest@localhost:5672//
CELERY_RESULT_BACKEND: rpc://
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt -r requirements-dev.txt
- name: Migrate
run: python manage.py migrate
- name: Lint
run: ruff check .
- name: Format check
run: ruff format --check .
- name: Tests
run: pytest --cov --cov-report=term-missing --cov-fail-under=55
- name: Coverage badge data
id: coverage
run: |
coverage json -o coverage.json
python - <<'PY' >> "$GITHUB_OUTPUT"
import json

totals = json.load(open("coverage.json"))["totals"]
percent = totals["percent_covered"]
color = "green" if percent >= 80 else "yellow" if percent >= 55 else "red"
print(f"total={totals['percent_covered_display']}%")
print(f"color={color}")
PY
- name: Update coverage badge
uses: schneegans/dynamic-badges-action@v1.7.0
continue-on-error: true
with:
auth: ${{ secrets.GIST_TOKEN }}
gistID: 097e2cc0afbb6ee7fdbfb4d2d67bb87d
filename: coverage.json
label: coverage
message: ${{ steps.coverage.outputs.total }}
color: ${{ steps.coverage.outputs.color }}
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,7 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.idea/
# Python
__pycache__/

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2026 Anna Putilovskaya

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
238 changes: 127 additions & 111 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,111 +1,127 @@
# Сервис уведомлений

### Задача:

Создать сервис для отправки уведомлений пользователям.
Пользователь может получать уведомления через:
- Email
- SMS
- Telegram

Нужно обеспечить надежную доставку - если один способ не сработал, попробовать другой.

---
### Технический требования:

- Язык программирования:
- Python 3.12
- Фреймворк:
- Django Rest Framework
- ORM:
- Django ORM
- Хранение данных:
- PostgreSQL 17
- Очереди сообщений:
- Celery + RabbitMQ

---
### Запуск проекта:

- Клонируйте проект:
```python
git clone https://github.com/annaputilovskaya/NotificationService.git
```
- Создайте файл .env в корне проекта по образцу (Файл .env.example) и заполните его данными.

Команда для Unix-подобных систем для копирования файла:
```python
cp .env.example .env
```
- Убедитесь, что на Вашем устройстве установлен Docker.

Проверка версии Docker:
```python
docker --version
```
Если докер не установлен, [осуществите его установку по инструкции с официального сайта](https://www.docker.com/)

- Осуществите сборку образов и запуск контейнеров:
```python
docker compose up -d --build
```

---
### Структура базы данных:

<img width="1189" height="757" alt="image" src="https://github.com/user-attachments/assets/7cfac615-f570-4744-85db-69e529d4a3b6" />

---
### Функционал и бизнес-логика

1. Пользователи:
- Регистрация с email и паролем
- Получение токена для авторизация
- ОБновление токена авторизации

<img width="1283" height="181" alt="image" src="https://github.com/user-attachments/assets/7e4815d7-6b3d-4df3-8355-7259a6694f6e" />



2. Получатели
- Создание получателя
- Просмотр получателя
- Просмотр списка получателей
- Изменение получтаеля
- Удаление получателя

<img width="1285" height="324" alt="image" src="https://github.com/user-attachments/assets/0b7015b5-3b83-481f-9e83-4d3cc3b31d81" />



3. Уведомления
- Создание уведомления
- Просмотр уведомления
- Просмотр списка уведомлений

<img width="1283" height="177" alt="image" src="https://github.com/user-attachments/assets/4724f16d-c9ef-469c-bcaf-f63bb1f97a3d" />


При создания уведомления создается задача по отправке уведомления.
Происходит выбор стратегии отпраки уведомления в следующем порядке:
- Email
- Telegram
- SMS

В случае, если первая стратегия не сработала, переходим ко второй, далее к третьей.
Если ни одна страегия отправки для каких-либо получателей не сработала, повторяем попытку отправки для этих получателей через определенный временной интервал.

---
Сервис подходит для отправки разовых уведомлений. Если нужны повторяющиеся уведомления, возможна доработка.

В проекте настроено логирование отправки уведомлений с отправкой логов в консоль и с сохранением в файл.

Проведено ручное тестирование проекта с помощью Postman.

Автоматизированное тестирование не проводилось.

Для более подробной информации об API ознакомьтесь с интерактивной документацией.

Если проект запущен на localhost, пройдите по [ссылке](http://localhost:8000/swagger/)


# Notification Service

[![CI](https://github.com/annaputilovskaya/NotificationService/actions/workflows/ci.yml/badge.svg)](https://github.com/annaputilovskaya/NotificationService/actions/workflows/ci.yml)
[![coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/annaputilovskaya/097e2cc0afbb6ee7fdbfb4d2d67bb87d/raw/coverage.json)](https://github.com/annaputilovskaya/NotificationService/actions/workflows/ci.yml)
[![License](https://img.shields.io/badge/License-MIT-yellow.svg)](./LICENSE)
[![Python](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/)

An API for reliable delivery of notifications to users across multiple channels — Email, SMS, and Telegram — with automatic failover between channels.

[Русская версия](README.ru.md)

## Features

- **Users** — email/password sign-up, issuing and refreshing JWT access tokens.

<img width="1283" height="181" alt="Users" src="https://github.com/user-attachments/assets/7e4815d7-6b3d-4df3-8355-7259a6694f6e" />

- **Recipients** — create, view, update, and delete recipients.

<img width="1285" height="324" alt="Recipients" src="https://github.com/user-attachments/assets/0b7015b5-3b83-481f-9e83-4d3cc3b31d81" />

- **Notifications** — create a notification, view a single notification and a list.

<img width="1077" height="153" alt="Notifications" src="https://github.com/user-attachments/assets/ffaec4e6-269d-45a7-94ec-140b19d542f5" />

- **Reliable delivery (failover)** — creating a notification enqueues a Celery task. Strategies are tried in order **Email → Telegram → SMS**: when a channel fails, the next one is used. If no strategy succeeds for some recipients, delivery to those recipients is retried after a delay.
- **Pagination** — list endpoints return a paginated `{"count": ..., "results": [...]}` payload (the `?page=` parameter).
- **Logging** — delivery logs go to the console and to a file.
- The service targets one-off notifications; recurring notifications are a possible extension.

## Stack

- Python 3.12
- Django REST Framework (Django ORM)
- PostgreSQL 17
- Celery + RabbitMQ
- drf-yasg (Swagger/Redoc)

## Architecture

```mermaid
flowchart LR
Client["Client"] --> API["Django REST API"]
API -->|create notification| Task["Celery: send_notification"]
Task --> Email["Email strategy"]
Email -->|fail| Telegram["Telegram strategy"]
Telegram -->|fail| SMS["SMS strategy"]
Email --> SMTP[("SMTP")]
Telegram --> TG[("Telegram API")]
SMS --> SMSAPI[("sms.ru")]
Task --> DB[("PostgreSQL")]
```

## Data model

<img width="1189" height="757" alt="Database schema" src="https://github.com/user-attachments/assets/7cfac615-f570-4744-85db-69e529d4a3b6" />

## Getting started

### Prerequisites

- Docker and Docker Compose

### Configuration

Copy `.env.example` to `.env` and fill in the values:

```bash
cp .env.example .env
```

| Variable | Description | Example |
|---|---|---|
| `SECRET_KEY` | Django secret key | `django-insecure-...` |
| `DEBUG` | Debug mode | `False` |
| `ALLOWED_HOSTS` | Allowed hosts (comma-separated) | `localhost,127.0.0.1` |
| `CORS_ALLOWED_ORIGINS` | Allowed CORS origins | `http://localhost:8000` |
| `POSTGRES_*` | Database connection settings | `POSTGRES_DB=notifications` |
| `CELERY_BROKER_URL` | Celery broker URL (RabbitMQ) | `amqp://user:pass@rabbitmq:5672//` |
| `EMAIL_*` | Mail server settings | `EMAIL_HOST=smtp.example.com` |
| `TELEGRAM_TOKEN` | Telegram bot token | `123456:ABC` |
| `SMS_API_KEY` / `SMS_SENDER` | sms.ru credentials | `SMS_SENDER=Service` |
| `SMS_TEST` | sms.ru test mode (does not send SMS) | `0` |

### Install & run

Clone the repository and start the services:

```bash
git clone https://github.com/annaputilovskaya/NotificationService.git
cd NotificationService
docker compose up -d --build
```

Verify Docker is installed (otherwise follow the [official instructions](https://www.docker.com/)):

```bash
docker --version
```

Interactive API documentation (Swagger): http://localhost:8000/swagger/

## Tests

Tests run against PostgreSQL. Start the database and run:

```bash
docker compose up -d db
python -m pytest --cov
```

External services (SMTP, Telegram, sms.ru) are mocked. The project was originally checked manually via Postman; automated core and smoke tests are now in place.

## Project structure

```
config/ # Django settings, Celery, urls
notifications/ # notifications: model, strategies, Celery task
recipients/ # recipients
users/ # users, JWT
conftest.py # shared pytest fixtures
pyproject.toml # ruff/pytest/coverage config
```

## License

Released under the MIT License — see [LICENSE](LICENSE).
Loading
Loading