From 3fd7c7746931aebc98ff7bcdc5742bc897618d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Mon, 19 Jan 2026 13:36:37 -0300 Subject: [PATCH] update block --- .../app/routes/enrollments/enroll.py | 4 +- .../app/routes/orgs/__init__.py | 4 +- .../app/routes/orgs/subscription.py | 18 +- .../tests/routes/orgs/test_address.py | 22 --- .../tests/routes/orgs/test_scheduled.py | 16 ++ .../tests/routes/orgs/test_subscription.py | 8 +- .../tests/routes/test_orgs.py | 21 +-- api.saladeaula.digital/tests/seeds.jsonl | 37 ++-- .../app/middleware/workspace.ts | 2 +- .../routes/_.$orgid.enrollments.add/route.tsx | 2 +- .../_.$orgid.enrollments.buy/review.tsx | 49 +++--- .../app/routes/_app.orgs.$id._index/route.tsx | 32 +++- .../routes/_app.orgs.$id.address/route.tsx | 162 ++++++++++++++++- .../_app.orgs.$id.subscription/route.tsx | 163 +++++++++++++++--- .../app/routes/_app.orgs.$id/route.tsx | 10 +- enrollments-events/app/enrollment.py | 4 +- 16 files changed, 421 insertions(+), 133 deletions(-) delete mode 100644 api.saladeaula.digital/tests/routes/orgs/test_address.py diff --git a/api.saladeaula.digital/app/routes/enrollments/enroll.py b/api.saladeaula.digital/app/routes/enrollments/enroll.py index d5cc4ae..0d3f39d 100644 --- a/api.saladeaula.digital/app/routes/enrollments/enroll.py +++ b/api.saladeaula.digital/app/routes/enrollments/enroll.py @@ -171,7 +171,7 @@ def enroll_now(enrollment: Enrollment, context: Context): ) transact.condition( key=KeyPair( - pk='SUBSCRIPTION#FREEZE', + pk='SUBSCRIPTION#FROZEN', sk=f'ORG#{org.id}', ), cond_expr='attribute_not_exists(sk)', @@ -288,7 +288,7 @@ def enroll_later(enrollment: Enrollment, context: Context): ) transact.condition( key=KeyPair( - pk='SUBSCRIPTION#FREEZE', + pk='SUBSCRIPTION#FROZEN', sk=f'ORG#{org.id}', ), cond_expr='attribute_not_exists(sk)', diff --git a/api.saladeaula.digital/app/routes/orgs/__init__.py b/api.saladeaula.digital/app/routes/orgs/__init__.py index b01ed28..9044b90 100644 --- a/api.saladeaula.digital/app/routes/orgs/__init__.py +++ b/api.saladeaula.digital/app/routes/orgs/__init__.py @@ -45,8 +45,8 @@ def get_org(org_id: str): + SortKey('METADATA#ADDRESS', rename_key='address') + SortKey('METADATA#SUBSCRIPTION', rename_key='subscription') + KeyPair( - pk='SUBSCRIPTION#FREEZE', + pk='SUBSCRIPTION#FROZEN', sk=SortKey(f'ORG#{org_id}'), - rename_key='subscription_freeze', + rename_key='subscription_frozen', ) ) diff --git a/api.saladeaula.digital/app/routes/orgs/subscription.py b/api.saladeaula.digital/app/routes/orgs/subscription.py index 2fa73d6..6ca360b 100644 --- a/api.saladeaula.digital/app/routes/orgs/subscription.py +++ b/api.saladeaula.digital/app/routes/orgs/subscription.py @@ -31,6 +31,7 @@ def add( name: Annotated[str, Body(embed=True)], billing_day: Annotated[int, Body(embed=True, ge=1, le=31)], payment_method: Annotated[PaymentMethod, Body(embed=True)], + subscription_frozen: Annotated[bool, Body(embed=True)] = False, ): now_ = now() @@ -71,6 +72,15 @@ def add( exc_cls=SubscriptionConflictError, ) + if subscription_frozen: + transact.put( + item={ + 'id': 'SUBSCRIPTION#FROZEN', + 'sk': f'ORG#{org_id}', + 'created_at': now_, + } + ) + return JSONResponse(status_code=HTTPStatus.CREATED) @@ -100,19 +110,19 @@ def edit( ':now': now_, }, cond_expr='attribute_exists(sk)', - exc_cls=OrgNotFoundError, + exc_cls=SubscriptionRequiredError, ) if subscription_frozen: transact.put( item={ - 'id': 'SUBSCRIPTION#FREEZE', + 'id': 'SUBSCRIPTION#FROZEN', 'sk': f'ORG#{org_id}', 'created_at': now_, } ) else: - transact.delete(key=KeyPair('SUBSCRIPTION#FREEZE', f'ORG#{org_id}')) + transact.delete(key=KeyPair('SUBSCRIPTION#FROZEN', f'ORG#{org_id}')) return JSONResponse(status_code=HTTPStatus.NO_CONTENT) @@ -133,6 +143,6 @@ def remove(org_id: str): ) transact.delete(key=KeyPair(org_id, 'METADATA#SUBSCRIPTION')) transact.delete(key=KeyPair('SUBSCRIPTION', f'ORG#{org_id}')) - transact.delete(key=KeyPair('SUBSCRIPTION#FREEZE', f'ORG#{org_id}')) + transact.delete(key=KeyPair('SUBSCRIPTION#FROZEN', f'ORG#{org_id}')) return JSONResponse(status_code=HTTPStatus.NO_CONTENT) diff --git a/api.saladeaula.digital/tests/routes/orgs/test_address.py b/api.saladeaula.digital/tests/routes/orgs/test_address.py deleted file mode 100644 index 4d9ddcc..0000000 --- a/api.saladeaula.digital/tests/routes/orgs/test_address.py +++ /dev/null @@ -1,22 +0,0 @@ -from http import HTTPMethod, HTTPStatus - -from layercake.dynamodb import DynamoDBPersistenceLayer - -from ...conftest import HttpApiProxy, LambdaContext - - -def test_address( - app, - seeds, - http_api_proxy: HttpApiProxy, - dynamodb_persistence_layer: DynamoDBPersistenceLayer, - lambda_context: LambdaContext, -): - r = app.lambda_handler( - http_api_proxy( - raw_path='/orgs/cJtK9SsnJhKPyxESe7g3DG/address', - method=HTTPMethod.GET, - ), - lambda_context, - ) - assert r['statusCode'] == HTTPStatus.OK diff --git a/api.saladeaula.digital/tests/routes/orgs/test_scheduled.py b/api.saladeaula.digital/tests/routes/orgs/test_scheduled.py index 7210da4..abd9988 100644 --- a/api.saladeaula.digital/tests/routes/orgs/test_scheduled.py +++ b/api.saladeaula.digital/tests/routes/orgs/test_scheduled.py @@ -5,6 +5,22 @@ from layercake.dynamodb import DynamoDBPersistenceLayer from ...conftest import HttpApiProxy, LambdaContext +def test_get_scheduled( + app, + seeds, + http_api_proxy: HttpApiProxy, + lambda_context: LambdaContext, +): + r = app.lambda_handler( + http_api_proxy( + raw_path='/orgs/cJtK9SsnJhKPyxESe7g3DG/enrollments/scheduled', + method=HTTPMethod.GET, + ), + lambda_context, + ) + assert r['statusCode'] == HTTPStatus.OK + + def test_scheduled_proceed( app, seeds, diff --git a/api.saladeaula.digital/tests/routes/orgs/test_subscription.py b/api.saladeaula.digital/tests/routes/orgs/test_subscription.py index 8f06fe5..0434a8c 100644 --- a/api.saladeaula.digital/tests/routes/orgs/test_subscription.py +++ b/api.saladeaula.digital/tests/routes/orgs/test_subscription.py @@ -17,7 +17,7 @@ def test_subscription( ): r = app.lambda_handler( http_api_proxy( - raw_path='/orgs/2a8963fc-4694-4fe2-953a-316d1b10f1f5', + raw_path='/orgs/e63a579a-4719-4d64-816f-f1650ca73753', method=HTTPMethod.GET, ), lambda_context, @@ -32,13 +32,13 @@ def test_add_subscription( dynamodb_persistence_layer: DynamoDBPersistenceLayer, lambda_context: LambdaContext, ): - org_id = 'f6000f79-6e5c-49a0-952f-3bda330ef278' + org_id = 'e63a579a-4719-4d64-816f-f1650ca73753' r = app.lambda_handler( http_api_proxy( raw_path=f'/orgs/{org_id}/subscription', method=HTTPMethod.POST, body={ - 'name': 'Banco do Brasil', + 'name': 'pytest subscribed', 'billing_day': 1, 'payment_method': 'MANUAL', }, @@ -55,4 +55,4 @@ def test_add_subscription( assert r['metadata']['billing_day'] == 1 assert r['metadata']['payment_method'] == 'MANUAL' - assert r['subscription']['name'] == 'Banco do Brasil' + assert r['subscription']['name'] == 'pytest subscribed' diff --git a/api.saladeaula.digital/tests/routes/test_orgs.py b/api.saladeaula.digital/tests/routes/test_orgs.py index 40ceb9b..6282c37 100644 --- a/api.saladeaula.digital/tests/routes/test_orgs.py +++ b/api.saladeaula.digital/tests/routes/test_orgs.py @@ -15,14 +15,15 @@ def test_get_org( ): r = app.lambda_handler( http_api_proxy( - raw_path='/orgs/2a8963fc-4694-4fe2-953a-316d1b10f1f5', + raw_path='/orgs/7362ce9e-9dad-4483-a28b-fff4034a17a5', method=HTTPMethod.GET, ), lambda_context, ) body = json.loads(r['body']) - assert 'subscription_freeze' in body + assert 'address' in body + assert 'subscription_frozen' in body def test_add_org( @@ -93,19 +94,3 @@ def test_revoke( lambda_context, ) assert r['statusCode'] == HTTPStatus.NO_CONTENT - - -def test_get_scheduled( - app, - seeds, - http_api_proxy: HttpApiProxy, - lambda_context: LambdaContext, -): - r = app.lambda_handler( - http_api_proxy( - raw_path='/orgs/1234/enrollments/scheduled', - method=HTTPMethod.GET, - ), - lambda_context, - ) - assert r['statusCode'] == HTTPStatus.OK diff --git a/api.saladeaula.digital/tests/seeds.jsonl b/api.saladeaula.digital/tests/seeds.jsonl index cc4626a..52318d5 100644 --- a/api.saladeaula.digital/tests/seeds.jsonl +++ b/api.saladeaula.digital/tests/seeds.jsonl @@ -1,5 +1,5 @@ -// Users {"id": "213a6682-2c59-4404-9189-12eec0a846d4", "sk": "orgs#f6000f79-6e5c-49a0-952f-3bda330ef278", "name": "Banco do Brasil", "cnpj": "00000000000191"} +// Users {"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "0", "name": "Sérgio R Siqueira", "email": "sergio@somosbeta.com.br", "emails": ["osergiosiqueira@gmail.com", "sergio@somosbeta.combr"], "cpf": "07879819908"} {"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "emails#sergio@somosbeta.com.br", "email_primary": true, "mx_record_exists": true} {"id": "15bacf02-1535-4bee-9022-19d106fd7518", "sk": "emails#osergiosiqueira@gmail.com", "email_verified": false, "mx_record_exists": true} @@ -12,33 +12,42 @@ {"id": "578ec87f-94c7-4840-8780-bb4839cc7e64", "sk": "0", "course": {"id": "af3258f0-bccf-4781-aec6-d4c618d234a7", "name": "pytest", "access_period": 180}, "user": {"id": "068b4600-cc36-4b55-b832-bb620021705a", "name": "Benjamin Burnley", "email": "burnley@breakingbenjamin.com"}} {"id": "9c166c5e-890f-4e77-9855-769c29aaeb2e", "sk": "0", "course": {"id": "c27d1b4f-575c-4b6b-82a1-9b91ff369e0b", "name": "pytest", "access_period": 180, "scormset": "76c75561-d972-43ef-9818-497d8fc6edbe"}, "user": {"id": "068b4600-cc36-4b55-b832-bb620021705a", "name": "Layne Staley", "email": "layne@aliceinchains.com"}} -// Scheduled -{"id": "SCHEDULED#ORG#cJtK9SsnJhKPyxESe7g3DG", "sk": "2028-12-16T00:00:00-03:06#981ddaa78ffaf9a1074ab1169893f45d", "org_name": "Beta Educação", "scheduled_at": "2025-12-15T17:09:39.398009-03:00", "user": { "name": "Maitê Laurenti Siqueira", "cpf": "02186829991", "id": "87606a7f-de56-4198-a91d-b6967499d382", "email": "osergiosiqueira+maite@gmail.com" }, "ttl": 1765854360, "subscription_billing_day": 5, "created_by": { "name": "Sérgio Rafael de Siqueira", "id": "5OxmMjL-ujoR5IMGegQz" }, "course": { "name": "Reciclagem em NR-10 Básico (20 horas)", "id": "c01ec8a2-0359-4351-befb-76c3577339e0", "access_period": 360}} - -// Orgs +// Seeds for Org {"id": "2a8963fc-4694-4fe2-953a-316d1b10f1f5", "sk": "0", "name": "pytest", "cnpj": "04978826000180"} {"id": "2a8963fc-4694-4fe2-953a-316d1b10f1f5", "sk": "METADATA#SUBSCRIPTION", "billing_day": 6} {"id": "2a8963fc-4694-4fe2-953a-316d1b10f1f5", "sk": "METADATA#PAYMENT_POLICY", "due_days": 30, "created_at": "2025-07-15T15:04:36.369323-03:00"} +{"id": "SUBSCRIPTION", "sk": "ORG#2a8963fc-4694-4fe2-953a-316d1b10f1f5"} +{"id": "cnpj", "sk": "04978826000180", "org_id": "2a8963fc-4694-4fe2-953a-316d1b10f1f5"} + +// Seeds for Org {"id": "f6000f79-6e5c-49a0-952f-3bda330ef278", "sk": "0", "name": "Banco do Brasil", "cnpj": "00000000000191"} - -// Org admins {"id": "f6000f79-6e5c-49a0-952f-3bda330ef278", "sk": "admins#15bacf02-1535-4bee-9022-19d106fd7518", "name": "Chester Bennington", "email": "chester@linkinpark.com"} - {"id": "orgmembers#f6000f79-6e5c-49a0-952f-3bda330ef278", "sk": "15bacf02-1535-4bee-9022-19d106fd7518"} +// Seeds for Org +{"id": "cJtK9SsnJhKPyxESe7g3DG", "sk": "0", "name": "Beta Educação", "cnpj": "15608435000190"} +{"id": "SUBSCRIPTION", "sk": "ORG#cJtK9SsnJhKPyxESe7g3DG"} +{"id": "SCHEDULED#ORG#cJtK9SsnJhKPyxESe7g3DG", "sk": "2028-12-16T00:00:00-03:06#981ddaa78ffaf9a1074ab1169893f45d", "org_name": "Beta Educação", "scheduled_at": "2025-12-15T17:09:39.398009-03:00", "user": { "name": "Maitê Laurenti Siqueira", "cpf": "02186829991", "id": "87606a7f-de56-4198-a91d-b6967499d382", "email": "osergiosiqueira+maite@gmail.com" }, "ttl": 1765854360, "subscription_billing_day": 5, "created_by": { "name": "Sérgio Rafael de Siqueira", "id": "5OxmMjL-ujoR5IMGegQz" }, "course": { "name": "Reciclagem em NR-10 Básico (20 horas)", "id": "c01ec8a2-0359-4351-befb-76c3577339e0", "access_period": 360}} + +// Seeds for Org +// file: tests/routes/orgs/test_subscription.py +{"id": "e63a579a-4719-4d64-816f-f1650ca73753", "sk": "0", "name": "pytest", "cnpj": "89329353000143"} +{"id": "cnpj", "sk": "89329353000143", "org_id": "f6000f79-6e5c-49a0-952f-3bda330ef278"} + +// Seeds for Org with subscription +// file: tests/routes/test_orgs.py::test_get_org +{"id": "7362ce9e-9dad-4483-a28b-fff4034a17a5", "sk": "METADATA#ADDRESS", "state": "SC", "postcode": "88101001", "address1": "Avenida Presidente Kennedy", "city": "São José", "address2": "1", "neighborhood": "Campinas"} +{"id": "SUBSCRIPTION#FROZEN", "sk": "ORG#7362ce9e-9dad-4483-a28b-fff4034a17a5", "created_at": "2025-12-24T00:05:27-03:00"} +{"id": "SUBSCRIPTION", "sk": "ORG#7362ce9e-9dad-4483-a28b-fff4034a17a5", "created_at": "2025-12-24T00:05:27-03:00"} + + // Seeds for Order // file: tests/routes/orders/test_payment_retries.py {"id": "4b23f6f5-5377-476b-b1de-79427c0295f6", "sk": "0", "installments": 3, "status": "PENDING"} {"id": "4b23f6f5-5377-476b-b1de-79427c0295f6", "sk": "INVOICE", "invoice_id": "123"} {"id": "4b23f6f5-5377-476b-b1de-79427c0295f6", "sk": "TRANSACTION#STATS", "last_attempt_succeeded": false} -// Indicies -// CNPJs -{"id": "cnpj", "sk": "04978826000180", "org_id": "2a8963fc-4694-4fe2-953a-316d1b10f1f5"} {"id": "cnpj", "sk": "00000000000191", "org_id": "6000f79-6e5c-49a0-952f-3bda330ef278"} -{"id": "SUBSCRIPTION", "sk": "ORG#2a8963fc-4694-4fe2-953a-316d1b10f1f5"} -{"id": "SUBSCRIPTION", "sk": "ORG#cJtK9SsnJhKPyxESe7g3DG"} -{"id": "SUBSCRIPTION#FREEZE", "sk": "ORG#2a8963fc-4694-4fe2-953a-316d1b10f1f5", "created_at": "2025-12-24T00:05:27-03:00"} // CPFs {"id": "cpf", "sk": "07879819908", "user_id": "15bacf02-1535-4bee-9022-19d106fd7518"} diff --git a/apps/admin.saladeaula.digital/app/middleware/workspace.ts b/apps/admin.saladeaula.digital/app/middleware/workspace.ts index ecc1c8f..f45ac4d 100644 --- a/apps/admin.saladeaula.digital/app/middleware/workspace.ts +++ b/apps/admin.saladeaula.digital/app/middleware/workspace.ts @@ -66,7 +66,7 @@ export const workspaceMiddleware = async ( workspaces, subscription: org?.['subscription'] || null, address: org?.['address'] || null, - blocked: 'subscription_freeze' in org + blocked: 'subscription_frozen' in org }) return await next() diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx index dd12476..958c277 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx @@ -127,7 +127,7 @@ export async function action({ params, request, context }: Route.ActionArgs) { }) const data = (await r.json()) as { sk: string } - return redirect(`/${params.orgid}/enrollments/${data.sk}/submitted`) + return redirect(`/${org_id}/enrollments/${data.sk}/submitted`) } export default function Route({ diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx index ebdabf3..06d8313 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx @@ -5,8 +5,10 @@ import valid from 'card-validator' import { ExternalLinkIcon, PencilIcon, SearchIcon } from 'lucide-react' import { Controller, useForm } from 'react-hook-form' import { PatternFormat } from 'react-number-format' +import { useParams } from 'react-router' import { z } from 'zod' +import { useWizard } from '@/components/wizard' import { Abbr } from '@repo/ui/components/abbr' import { Currency } from '@repo/ui/components/currency' import { Button } from '@repo/ui/components/ui/button' @@ -20,6 +22,28 @@ import { DialogTitle, DialogTrigger } from '@repo/ui/components/ui/dialog' +import { + Empty, + EmptyContent, + EmptyDescription, + EmptyHeader, + EmptyTitle +} from '@repo/ui/components/ui/empty' +import { + Field, + FieldDescription, + FieldError, + FieldGroup, + FieldLabel, + FieldSet +} from '@repo/ui/components/ui/field' +import { Input } from '@repo/ui/components/ui/input' +import { + InputGroup, + InputGroupAddon, + InputGroupButton, + InputGroupInput +} from '@repo/ui/components/ui/input-group' import { Item, ItemActions, @@ -42,31 +66,6 @@ import { } from '@repo/ui/components/ui/table' import { paymentMethods } from '@repo/ui/routes/orders/data' -import { useWizard } from '@/components/wizard' -import { - Field, - FieldDescription, - FieldError, - FieldGroup, - FieldLabel, - FieldSet -} from '@repo/ui/components/ui/field' -import { Input } from '@repo/ui/components/ui/input' -import { - InputGroup, - InputGroupAddon, - InputGroupButton, - InputGroupInput -} from '@repo/ui/components/ui/input-group' - -import { - Empty, - EmptyContent, - EmptyDescription, - EmptyHeader, - EmptyTitle -} from '@repo/ui/components/ui/empty' -import { useParams } from 'react-router' import { useWizardStore } from './store' type ReviewProps = { diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id._index/route.tsx index de2c102..7e9fee4 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id._index/route.tsx @@ -1,6 +1,7 @@ import type { Route } from './+types/route' import { useForm } from 'react-hook-form' +import { PatternFormat } from 'react-number-format' import { useOutletContext } from 'react-router' import { Button } from '@repo/ui/components/ui/button' @@ -22,10 +23,12 @@ import { } from '@repo/ui/components/ui/form' import { Input } from '@repo/ui/components/ui/input' +import type { Org } from '../_app.orgs.$id/data' + export default function Route({}: Route.ComponentProps) { - const { org } = useOutletContext() + const { org } = useOutletContext() as { org: Org } const form = useForm({ defaultValues: org }) - const { handleSubmit, formState } = form + const { handleSubmit, control } = form const onSubmit = async () => {} @@ -45,7 +48,7 @@ export default function Route({}: Route.ComponentProps) {
( @@ -59,7 +62,7 @@ export default function Route({}: Route.ComponentProps) { /> ( @@ -73,13 +76,28 @@ export default function Route({}: Route.ComponentProps) { /> ( + render={({ + field: { onChange, ref, ...field }, + fieldState + }) => ( CNPJ - + { + onChange(value) + }} + {...field} + /> diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.address/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.address/route.tsx index 05c7eef..0bb2a26 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.address/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.address/route.tsx @@ -1,11 +1,165 @@ import type { Route } from './+types/route' -import { Card, CardContent } from '@repo/ui/components/ui/card' +import { Controller, useForm } from 'react-hook-form' +import { useOutletContext } from 'react-router' + +import { Button } from '@repo/ui/components/ui/button' +import { + Card, + CardContent, + CardDescription, + CardHeader, + CardTitle +} from '@repo/ui/components/ui/card' +import { + Field, + FieldError, + FieldGroup, + FieldLabel, + FieldSet +} from '@repo/ui/components/ui/field' +import { Input } from '@repo/ui/components/ui/input' + +import type { Org } from '../_app.orgs.$id/data' export default function Route({}: Route.ComponentProps) { + const { org } = useOutletContext() as { org: Org } + const { handleSubmit, control } = useForm({ defaultValues: org?.address }) + + const onSubmit = async () => {} + return ( - - address - +
+ + + + Editar endereço + + + Este endereço será usado automaticamente sempre que for necessário + informar um endereço. + + + + +
+ ( + + Endereço + + + {fieldState.invalid && ( + + )} + + )} + /> + + ( + + + Complemento{' '} + (opcional) + + + + {fieldState.invalid && ( + + )} + + )} + /> + + + {/* Neighborhood */} + ( + + Bairro + + + {fieldState.invalid && ( + + )} + + )} + /> + {/* City */} + ( + + Cidade + + + {fieldState.invalid && ( + + )} + + )} + /> + {/* State */} + ( + + Estado + + + {fieldState.invalid && ( + + )} + + )} + /> + +
+ + + + +
) } diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.subscription/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.subscription/route.tsx index f9c57d6..d71bd06 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.subscription/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id.subscription/route.tsx @@ -1,7 +1,9 @@ import type { Route } from './+types/route' +import { zodResolver } from '@hookform/resolvers/zod' import { useForm } from 'react-hook-form' -import { useOutletContext } from 'react-router' +import { useFetcher, useOutletContext } from 'react-router' +import { z } from 'zod' import { Button } from '@repo/ui/components/ui/button' import { @@ -11,6 +13,7 @@ import { CardHeader, CardTitle } from '@repo/ui/components/ui/card' +import { Checkbox } from '@repo/ui/components/ui/checkbox' import { FieldGroup, FieldLegend, FieldSet } from '@repo/ui/components/ui/field' import { Form, @@ -27,23 +30,87 @@ import { NativeSelectOption } from '@repo/ui/components/ui/native-select' import { RadioGroup, RadioGroupItem } from '@repo/ui/components/ui/radio-group' +import { Spinner } from '@repo/ui/components/ui/spinner' +import { HttpMethod, request as req } from '@repo/util/request' + +import type { Org, Subscription } from '../_app.orgs.$id/data' + +const formSchema = z.object({ + plan: z.enum(['NOTHING', 'FLEXIVEL']), + billing_day: z.number({ error: 'Deve estar entre 1 e 31' }).min(1).max(31), + payment_method: z.enum(['BANK_SLIP', 'MANUAL'], { + error: 'Selecione uma opção' + }), + subscription_frozen: z.boolean().optional() +}) + +type Schema = Subscription & z.infer + +export async function action({ params, request, context }: Route.ActionArgs) { + const method = request.method + + if (method === 'DELETE') { + await req({ + url: `orgs/${params.id}/subscription`, + method: HttpMethod.DELETE, + request, + context + }) + + return { ok: true } + } + + const r = await req({ + url: `orgs/${params.id}/subscription`, + headers: new Headers({ 'Content-Type': 'application/json' }), + method: method as HttpMethod, + body: JSON.stringify(await request.json()), + request, + context + }) + + console.log(r) + + return { ok: true } +} export default function Route({}: Route.ComponentProps) { - const { org } = useOutletContext() - const form = useForm({ defaultValues: org?.subscription }) - const { handleSubmit, formState } = form + const fetcher = useFetcher() + const { org } = useOutletContext() as { org: Org } + const subscribed = !!org?.subscription + const form = useForm({ + defaultValues: { + plan: subscribed ? 'FLEXIVEL' : 'NOTHING', + ...org?.subscription + }, + resolver: zodResolver(formSchema) + }) + const { handleSubmit, formState, watch } = form + const plan = watch('plan') - const onSubmit = async (data) => { - console.log(data) + const onSubmit = async ({ plan, ...data }: Schema) => { + if (plan === 'NOTHING') { + fetcher.submit(null, { + method: 'DELETE' + }) + return + } + + fetcher.submit(JSON.stringify({ name: org.name, ...data }), { + method: subscribed ? 'PUT' : 'POST', + encType: 'application/json' + }) } + console.log(org) + return (
- Escolha seu plano + Escolha um plano Escolha o plano que será utilizado para configurar o funcionamento @@ -52,33 +119,57 @@ export default function Route({}: Route.ComponentProps) { - - - - + ( + + + + -
+ + + + + + + )} + /> + +
Configurações do plano ( + render={({ field: { onChange, ...field } }) => ( Dia para faturar - + onChange(Number(e.target.value))} + {...field} + /> @@ -93,6 +184,9 @@ export default function Route({}: Route.ComponentProps) { Forma de pagamento + + Selecione + Boleto bancário @@ -105,6 +199,26 @@ export default function Route({}: Route.ComponentProps) { )} /> + + ( + + + + + + Suspender temporariamente o funcionamento do plano + + + )} + />
@@ -113,6 +227,7 @@ export default function Route({}: Route.ComponentProps) { className="cursor-pointer" disabled={formState.isSubmitting} > + {formState.isSubmitting ? : null} Atualizar plano diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id/route.tsx index a88bc2e..2fa1b04 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs.$id/route.tsx @@ -21,10 +21,12 @@ import { initials } from '@repo/ui/lib/utils' import { request as req } from '@repo/util/request' import { BadgeCheckIcon } from 'lucide-react' +import type { Org } from './data' + const links = [ { to: '', title: 'Perfil', end: true }, - { to: 'subscription', title: 'Plano' }, - { to: 'address', title: 'Endereço' } + { to: 'address', title: 'Endereço' }, + { to: 'subscription', title: 'Plano' } ] export function meta() { @@ -46,7 +48,9 @@ export async function loader({ params, request, context }: Route.LoaderArgs) { throw new Response(null, { status: r.status }) } - return { org: await r.json() } as { org: any } + return { org: await r.json() } as { + org: Org + } } export function shouldRevalidate({ diff --git a/enrollments-events/app/enrollment.py b/enrollments-events/app/enrollment.py index f9703c9..a1015b8 100644 --- a/enrollments-events/app/enrollment.py +++ b/enrollments-events/app/enrollment.py @@ -194,7 +194,7 @@ def enroll( ) transact.condition( key=KeyPair( - pk='SUBSCRIPTION#FREEZE', + pk='SUBSCRIPTION#FROZEN', sk=f'ORG#{org_id}', ), cond_expr='attribute_not_exists(sk)', @@ -245,7 +245,7 @@ def enroll( }, ) - # The deduplication window can be recalculated based on user settings. + # The deduplication window can be recalculated based on settings. if deduplication_window: transact.put( item={