sergio/saladeaula.digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update table

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2025-12-13 00:14:24 -03:00
parent 72f049babd
commit a1c0e3dcd5
6 changed files with 191 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.saladeaula.digital/app/routes/enrollments/cancel.py
View File

@@ -48,7 +48,7 @@ def cancel(
transact.put(
item={
'id': enrollment_id,
'sk': 'CANCELED_BY',
'sk': 'CANCELED',
'canceled_by': {
'id': canceled_by.id,
'name': canceled_by.name,

6
api.saladeaula.digital/app/routes/enrollments/enroll.py
View File

@@ -221,10 +221,8 @@ def enroll_now(enrollment: Enrollment, context: Context):
item={
'id': enrollment.id,
'sk': 'CREATED_BY',
'created_by': {
'id': created_by.id,
'name': created_by.name,
},
'name': created_by.name,
'user_id': created_by.id,
'created_at': now_,
}
)

235
apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx
View File

@@ -2,12 +2,11 @@ import type { Route } from './+types/route'
import { DateTime } from 'luxon'
import { Suspense } from 'react'
import { ClockIcon } from 'lucide-react'
import { BanIcon } from 'lucide-react'
import { request as req } from '@repo/util/request'
import { Skeleton } from '@repo/ui/components/skeleton'
import { Await } from 'react-router'
import { billingPeriod, formatDate } from './util'
import { Card, CardContent } from '@repo/ui/components/ui/card'
import {
Table,
@@ -20,10 +19,18 @@ import {
} from '@repo/ui/components/ui/table'
import { Abbr } from '@repo/ui/components/abbr'
import { Button } from '@repo/ui/components/ui/button'
import { cn } from '@repo/ui/lib/utils'
import {
Empty,
EmptyDescription,
EmptyHeader,
EmptyMedia,
EmptyTitle
} from '@repo/ui/components/ui/empty'
import { billingPeriod, formatDate } from './util'
import { RangePeriod } from './range-period'
import { statuses } from './data'
import { cn } from '@repo/ui/lib/utils'
export function meta({}) {
return [{ title: 'Resumo de cobranças' }]
@@ -81,9 +88,16 @@ export default function Route({
label: status,
color
} = statuses?.[billing?.status || 'CLOSED']
const charges = items
?.filter((item) => 'course' in item && item?.unit_price > 0)
?.sort(sortBy('enrolled_at'))
const credits = items
?.filter((item) => 'course' in item && item?.unit_price < 0)
?.sort(sortBy('created_at'))
return (
<Card>
<CardContent className="space-y-2.5">
<CardContent className="space-y-4">
<div className="flex max-lg:flex-col gap-2.5">
<Button
className={cn('pointer-events-none', color)}
@@ -98,82 +112,148 @@ export default function Route({
<RangePeriod
startDate={startDate}
endDate={endDate}
billingDay={subscription.billing_day || 1}
billingDay={subscription?.billing_day || 1}
/>
</div>
<Table className="table-auto w-full">
<TableHeader>
<TableRow className="hover:bg-transparent">
<TableHead>Colaborador</TableHead>
<TableHead>Curso</TableHead>
<TableHead>Matriculado por</TableHead>
<TableHead>Matriculado em</TableHead>
<TableHead>Valor unit.</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{items
?.filter((item) => 'course' in item)
?.map(
(
{
user,
course,
author: created_by,
unit_price,
enrolled_at
},
index
) => (
<TableRow key={index}>
<TableCell>
<Abbr>{user.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>{course.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>
{created_by ? created_by.name : 'N/A'}
</Abbr>
</TableCell>
<TableCell>
{datetime.format(new Date(enrolled_at))}
</TableCell>
<TableCell>
{currency.format(unit_price)}
</TableCell>
</TableRow>
)
)}
{items.length ? (
<>
<Table className="table-auto w-full">
{charges.length ? (
<>
<TableHeader>
<TableRow className="bg-muted-foreground/15 pointer-events-none">
<TableHead>Colaborador</TableHead>
<TableHead>Curso</TableHead>
<TableHead>Matriculado por</TableHead>
<TableHead>Matriculado em</TableHead>
<TableHead>Valor unit.</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{charges?.map(
(
{
user,
course,
author: created_by,
unit_price,
enrolled_at
},
index
) => (
<TableRow key={index}>
<TableCell>
<Abbr>{user.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>{course.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>
{created_by ? created_by.name : 'N/A'}
</Abbr>
</TableCell>
<TableCell>
{datetime.format(new Date(enrolled_at))}
</TableCell>
<TableCell>
{currency.format(unit_price)}
</TableCell>
</TableRow>
)
)}
</TableBody>
</>
) : null}
{items.length === 0 && (
<TableRow className="hover:bg-transparent">
<TableCell colSpan={5} className="h-24 text-center">
Nenhum resultado.
</TableCell>
</TableRow>
)}
</TableBody>
<TableFooter>
<TableRow className="hover:bg-transparent">
<TableCell colSpan={4} className="text-right">
Total
</TableCell>
<TableCell>
{currency.format(
items
?.filter((item) => 'course' in item)
?.reduce(
(acc, { unit_price }) => acc + unit_price,
0
)
)}
</TableCell>
</TableRow>
</TableFooter>
</Table>
{credits.length ? (
<>
<TableRow className="pointer-events-none">
<TableCell colSpan={5}></TableCell>
</TableRow>
<TableHeader>
<TableRow className="bg-muted-foreground/15 pointer-events-none">
<TableHead>Colaborador</TableHead>
<TableHead>Curso</TableHead>
<TableHead>Cancelado por</TableHead>
<TableHead>Cancelado em</TableHead>
<TableHead>Valor unit.</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{credits?.map(
(
{
user,
course,
author: canceled_by,
unit_price,
created_at
},
index
) => (
<TableRow key={index}>
<TableCell>
<Abbr>{user.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>{course.name}</Abbr>
</TableCell>
<TableCell>
<Abbr>
{canceled_by ? canceled_by.name : 'N/A'}
</Abbr>
</TableCell>
<TableCell>
{datetime.format(new Date(created_at))}
</TableCell>
<TableCell>
{currency.format(unit_price)}
</TableCell>
</TableRow>
)
)}
</TableBody>
</>
) : null}
<TableFooter>
<TableRow>
<TableCell
colSpan={4}
className="text-right pointer-events-none"
>
Total
</TableCell>
<TableCell>
{currency.format(
items
?.filter((x) => 'course' in x)
.reduce(
(acc, { unit_price }) => acc + unit_price,
0
)
)}
</TableCell>
</TableRow>
</TableFooter>
</Table>
</>
) : (
<Empty className="border border-dashed">
<EmptyHeader>
<EmptyMedia variant="icon">
<BanIcon />
</EmptyMedia>
<EmptyTitle>Nenhuma cobrança encontrada</EmptyTitle>
<EmptyDescription>
Não há nenhuma cobrança para este período.
</EmptyDescription>
</EmptyHeader>
</Empty>
)}
</CardContent>
</Card>
)
@@ -195,3 +275,6 @@ const datetime = new Intl.DateTimeFormat('pt-BR', {
hour: '2-digit',
minute: '2-digit'
})
const sortBy = (field: 'enrolled_at' | 'created_at') => (a: any, b: any) =>
new Date(a[field]).getTime() - new Date(b[field]).getTime()

13
enrollments-events/app/enrollment.py
View File

@@ -94,6 +94,7 @@ def enroll(
enrollment: Enrollment,
*,
org: Org | None = None,
cancel_policy: bool = False,
subscription: Subscription | None = None,
created_by: CreatedBy | None = None,
scheduled_at: datetime | None = None,
@@ -120,6 +121,15 @@ def enroll(
| ({'scheduled_at': scheduled_at} if scheduled_at else {})
)
if cancel_policy:
transact.put(
item={
'id': enrollment.id,
'sk': 'CANCEL_POLICY',
'created_at': now_,
}
)
# Relationships between this enrollment and its related entities
for entity in linked_entities:
# Parent knows the child
@@ -168,7 +178,8 @@ def enroll(
item={
'id': enrollment.id,
'sk': 'CREATED_BY',
'created_by': created_by,
'name': created_by['name'],
'user_id': created_by['id'],
'created_at': now_,
}
)

20
enrollments-events/app/events/enroll_scheduled.py
View File

@@ -12,7 +12,7 @@ from layercake.funcs import pick
from boto3clients import dynamodb_client
from config import ENROLLMENT_TABLE
from enrollment import Enrollment, enroll
from enrollment import Enrollment, Subscription, enroll
logger = Logger(__name__)
dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
@@ -33,6 +33,14 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
course=old_image['course'],
user=old_image['user'],
)
subscription: Subscription | None = (
{
'org_id': org_id,
'billing_day': int(billing_day),
}
if billing_day
else None
)
try:
enroll(
@@ -41,14 +49,8 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
'org_id': org_id,
'name': old_image['org_name'],
},
subscription=(
{
'org_id': org_id,
'billing_day': int(billing_day),
}
if billing_day
else None
),
subscription=subscription,
cancel_policy=bool(subscription),
created_by=created_by,
scheduled_at=datetime.fromisoformat(old_image['created_at']),
# Transfer the deduplication window if it exists

10
orders-events/app/events/billing/append_enrollment.py
View File

@@ -43,9 +43,11 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
now_ = now()
org_id = new_image['org_id']
enrollment = enrollment_layer.collection.get_items(
TransactKey(new_image['id']) + SortKey('0') + SortKey('author')
# Post-migration: uncomment the following line
# + SortKey('CREATED_BY')
TransactKey(new_image['id'])
+ SortKey('0')
+ SortKey('CREATED_BY', rename_key='created_by', path_spec='created_by')
# Post-migration: remove the following line
+ SortKey('author', rename_key='created_by')
)
if not enrollment:
@@ -99,7 +101,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
# Add enrollment entry to billing
try:
created_by = enrollment.get('author')
created_by = enrollment.get('created_by')
course_id = enrollment['course']['id']
course = course_layer.collection.get_items(
KeyPair(