[4108] Сервис подписок: админка промокодов #72

sipmine · 2025-09-22T14:00:28Z

ссылка на таск: https://github.com/xi-effect/xi.progress/issues/14

taaylor

Оставил комменты, если будут вопросы - спрашивай и пингуй в дс

app/subscriptions/routes/promocodes_mub.py

app/subscriptions/routes/promocode_mub.py

tests/subscriptions/conftest.py

tests/subscriptions/functional/test_promocode_creation.py

tests/subscriptions/functional/test_promocode_mub.py

tests/subscriptions/functional/test_promocode_creation.py

tests/subscriptions/functional/test_promocode_mub.py

ByrDen

Выглядит неплохо :)
Старался подробно расписывать, если что-то не понятно, буду рад объяснить в треде таски

app/subscriptions/main.py

app/subscriptions/models/promocodes_db.py

app/subscriptions/routes/promocodes_mub.py

app/subscriptions/routes/promocode_mub.py

tests/subscriptions/functional/test_promocode_mub.py

taaylor

Кайф! У меня усе :)

ByrDen

Хорошо идём :)

app/subscriptions/dependencies/promocodes_dep.py

app/subscriptions/routes/promocodes_mub.py

tests/subscriptions/functional/test_promocodes_creation.py

tests/subscriptions/functional/test_promocodes_mub.py

ByrDen

чуть-чуть нашлось новенького)

tests/subscriptions/functional/test_promocodes_creation.py

tests/subscriptions/factories.py

app/subscriptions/routes/promocodes_mub.py

ByrDen

забыл моментик

tests/subscriptions/functional/test_promocodes_mub.py

ByrDen

Финишная прямая)

app/subscriptions/routes/promocodes_mub.py

ByrDen

Один тест тебя подвёл, но больше вопросов у меня точно к тебе не будет:)

tests/subscriptions/functional/test_promocodes_mub.py

ByrDen

Со старыми коментами - всё супер. И парочка последних, которые я мог написать раньше, но не подумал (не заметил этого), сори)
Для консистентности с другими сервисами, есть предложение сделать фикстуру promocode - параметризованной, как это сделано с фикстурой file из сервиса storage_v2, чтобы не делать параметризацию для каждого теста, где у тебя используется promocode

tests/subscriptions/functional/test_promocodes_mub.py

ByrDen

Всё круто, больше комментов нет)

niqzart

Для начала так, после этих фиксов можно будет просмотреть и тесты

app/subscriptions/dependencies/promocodes_dep.py

app/subscriptions/main.py

app/subscriptions/models/promocodes_db.py

app/subscriptions/routes/promocodes_mub.py

niqzart

В тестах тоже много осталось

niqzart · 2025-11-12T14:13:31Z

tests/subscriptions/conftest.py

+@pytest.fixture()
+def promocode_id(promocode: Promocode) -> int:
+    return promocode.id


issue: Неконсистентно с другими частями проекта, лишняя фикстура

niqzart · 2025-11-12T14:15:47Z

tests/subscriptions/factories.py

+
+class InvalidPromocodePeriodInputFactory(BaseModelFactory[PromocodeInputSchema]):


polish: "период с невалидный промокодом". Правильно: "промокод с невалидным периодом", т.е. InvalidPeriodPromocode, а не наоборот

tests/subscriptions/factories.py

niqzart · 2025-11-12T14:17:19Z

tests/subscriptions/functional/test_promocodes_list_mub.py

+                **PromocodeInputFactory.build_python(code=faker.pystr(max_chars=4 + i))
+            )


issue: max_chars не гарантирует защиту от коллиции, т.к. может сгенерить и меньше, а там и совпасть просто

niqzart · 2025-11-12T14:18:12Z

tests/subscriptions/factories.py

+
+class PromocodeInputFactory(BaseModelFactory[PromocodeInputSchema]):


polish: не логично, что одна просто, другая — unlimited. Значит первая — limited

niqzart · 2025-11-12T14:21:24Z

tests/subscriptions/functional/test_promocodes_mub.py

+@freeze_time()
+async def test_promocode_requesting_exist_code(


issue: невалидный нейминг

issue: бесполезная заморозка времени

niqzart · 2025-11-12T14:21:37Z

tests/subscriptions/functional/test_promocodes_mub.py

+    async with active_session():
+        existing_promocode: Promocode = await Promocode.create(**promocode_put_data)


issue: для такого существуют фикстуры

niqzart · 2025-11-12T14:22:19Z

tests/subscriptions/functional/test_promocodes_mub.py

+@pytest.mark.parametrize(
+    ("method", "path", "body_factory"),
+    [
+        pytest.param("POST", "", PromocodeInputFactory, id="create_promocode"),
+        pytest.param(
+            "POST", "", UnlimitedPromocodeInputFactory, id="create_unlimited_promocode"
+        ),
+        pytest.param(
+            "PUT",
+            lfc(lambda promocode_id: f"{promocode_id}/"),
+            PromocodeInputFactory,
+            id="update_promocode",
+        ),
+        pytest.param(
+            "PUT",
+            lfc(lambda promocode_id: f"{promocode_id}/"),
+            UnlimitedPromocodeInputFactory,
+            id="update_unlimited_promocode",
+        ),
+    ],
+)


issue: период никак не влияет на ошибку коллизии кода

issue: переусложнённая параметризация. Куда проще сделать два теста

niqzart · 2025-11-12T14:22:40Z

tests/subscriptions/functional/test_promocodes_mub.py

+@pytest.mark.parametrize(
+    ("path", "deleted_field"),
+    [
+        pytest.param("by-id", lf("deleted_promocode_id"), id="promocode_by_id"),
+        pytest.param("by-code", lf("deleted_promocode_code"), id="promocode_by_code"),
+    ],
+)
+async def test_promocode_retrieving_not_finding(
+    mub_client: TestClient, path: str, deleted_field: str
+) -> None:
+    assert_response(
+        mub_client.get(
+            f"/mub/subscription-service/promocodes/{path}/{deleted_field}/",
+        ),
+        expected_code=status.HTTP_404_NOT_FOUND,
+        expected_json={"detail": "Promocode not found"},
+    )


issue: невалидное название теста, некорректный нейминг

niqzart · 2025-11-12T14:23:21Z

tests/subscriptions/functional/test_promocodes_mub.py

issue: неконсистентный порядок тестов

sipmine self-assigned this Sep 22, 2025

sipmine added ci:covered If coverage checks should be run on the PR ci:deployable If deployment of the PR should be attempted ci:migrated If migration checks should be run on the PR labels Sep 22, 2025

sipmine force-pushed the feat/subscription-service branch 2 times, most recently from ae7b5d2 to bd0fb09 Compare September 23, 2025 13:41

sipmine had a problem deploying to manual-staging September 23, 2025 13:44 — with GitHub Actions Failure

sipmine requested review from ByrDen, niqzart and taaylor September 23, 2025 13:47

sipmine force-pushed the feat/subscription-service branch from bd0fb09 to 6bf3c9c Compare September 23, 2025 14:42

sipmine had a problem deploying to manual-staging September 27, 2025 05:32 — with GitHub Actions Failure

taaylor reviewed Sep 27, 2025

View reviewed changes

ByrDen reviewed Sep 29, 2025

View reviewed changes

sipmine had a problem deploying to manual-staging September 29, 2025 12:09 — with GitHub Actions Failure

sipmine had a problem deploying to manual-staging September 30, 2025 12:16 — with GitHub Actions Failure

taaylor self-requested a review October 1, 2025 11:02

taaylor approved these changes Oct 1, 2025

View reviewed changes

ByrDen reviewed Oct 2, 2025

View reviewed changes

sipmine force-pushed the feat/subscription-service branch from 42c024e to 6f05218 Compare October 11, 2025 04:03

sipmine had a problem deploying to manual-staging October 11, 2025 04:06 — with GitHub Actions Failure

ByrDen reviewed Oct 12, 2025

View reviewed changes

tests/subscriptions/functional/test_promocodes_mub.py Outdated Show resolved Hide resolved

sipmine force-pushed the feat/subscription-service branch 2 times, most recently from 57f39b9 to 4dc388c Compare October 18, 2025 02:20

sipmine had a problem deploying to manual-staging October 18, 2025 02:25 — with GitHub Actions Failure

ByrDen reviewed Oct 18, 2025

View reviewed changes

app/subscriptions/routes/promocodes_mub.py Show resolved Hide resolved

app/subscriptions/routes/promocodes_mub.py Show resolved Hide resolved

app/subscriptions/routes/promocodes_mub.py Outdated Show resolved Hide resolved

sipmine force-pushed the feat/subscription-service branch 2 times, most recently from 05fb9ab to b513496 Compare October 25, 2025 05:16

sipmine had a problem deploying to manual-staging October 25, 2025 05:20 — with GitHub Actions Failure

sipmine force-pushed the feat/subscription-service branch from a612b74 to 09635bc Compare November 3, 2025 04:51

sipmine had a problem deploying to manual-staging November 3, 2025 04:56 — with GitHub Actions Failure

ByrDen reviewed Nov 4, 2025

View reviewed changes

tests/subscriptions/functional/test_promocodes_mub.py Show resolved Hide resolved

sipmine force-pushed the feat/subscription-service branch from 09635bc to 2866825 Compare November 4, 2025 06:18

sipmine had a problem deploying to manual-staging November 4, 2025 06:23 — with GitHub Actions Failure

sipmine force-pushed the feat/subscription-service branch from 2866825 to 9c31fea Compare November 4, 2025 06:24

sipmine had a problem deploying to manual-staging November 4, 2025 06:29 — with GitHub Actions Failure

ByrDen reviewed Nov 5, 2025

View reviewed changes

sipmine force-pushed the feat/subscription-service branch 2 times, most recently from dfaf1ae to ee36b16 Compare November 5, 2025 13:07

sipmine had a problem deploying to manual-staging November 5, 2025 13:12 — with GitHub Actions Failure

ByrDen approved these changes Nov 7, 2025

View reviewed changes

niqzart reviewed Nov 10, 2025

View reviewed changes

sipmine force-pushed the feat/subscription-service branch from ee36b16 to bec016a Compare November 10, 2025 14:29

sipmine had a problem deploying to manual-staging November 10, 2025 14:33 — with GitHub Actions Failure

sipmine force-pushed the feat/subscription-service branch 3 times, most recently from 51e5e18 to 6f3020f Compare November 11, 2025 16:25

sipmine had a problem deploying to manual-staging November 11, 2025 16:29 — with GitHub Actions Failure

sipmine force-pushed the feat/subscription-service branch from 6f3020f to 7eaed2d Compare November 11, 2025 16:38

sipmine had a problem deploying to manual-staging November 11, 2025 16:42 — with GitHub Actions Failure

sipmine force-pushed the feat/subscription-service branch 2 times, most recently from 59243bd to c1a8ac5 Compare November 12, 2025 12:49

sipmine had a problem deploying to manual-staging November 12, 2025 12:53 — with GitHub Actions Failure

niqzart removed the ci:deployable If deployment of the PR should be attempted label Nov 12, 2025

niqzart force-pushed the feat/subscription-service branch from c1a8ac5 to 6d72584 Compare November 12, 2025 14:10

niqzart reviewed Nov 12, 2025

View reviewed changes

sipmine force-pushed the feat/subscription-service branch from 6d72584 to e783caf Compare December 6, 2025 05:49

feat: subscription service: promocode mub interface

1ee4ca9

sipmine force-pushed the feat/subscription-service branch from e783caf to 1ee4ca9 Compare December 29, 2025 14:59


		class InvalidPromocodePeriodInputFactory(BaseModelFactory[PromocodeInputSchema]):

		**PromocodeInputFactory.build_python(code=faker.pystr(max_chars=4 + i))
		)


		class PromocodeInputFactory(BaseModelFactory[PromocodeInputSchema]):

		@freeze_time()
		async def test_promocode_requesting_exist_code(

		async with active_session():
		existing_promocode: Promocode = await Promocode.create(**promocode_put_data)

[4108] Сервис подписок: админка промокодов #72

Are you sure you want to change the base?

[4108] Сервис подписок: админка промокодов #72

Uh oh!

Conversation

sipmine commented Sep 22, 2025

Uh oh!

taaylor left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

taaylor left a comment

Choose a reason for hiding this comment

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ByrDen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!