Skip to content

Notify Clients on Credit Limit Reached #2997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 28, 2025
Merged

Notify Clients on Credit Limit Reached #2997

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26cffab
chore: error message change
MatanYadaev Jan 28, 2025
0fbf2ee
fix: use displayDate instead of createdAt
MatanYadaev Jan 28, 2025
1623fef
Merge branch 'dev' into bal-3427
MatanYadaev Jan 28, 2025
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
1 change: 1 addition & 0 deletions apps/backoffice-v2/src/domains/business-reports/fetchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const BusinessReportSchema = z
reportType: z.enum([MERCHANT_REPORT_TYPES[0]!, ...MERCHANT_REPORT_TYPES.slice(1)]),
createdAt: z.string().datetime(),
updatedAt: z.string().datetime(),
displayDate: z.string().datetime(),
riskScore: z.number().nullable(),
status: z.enum([MERCHANT_REPORT_STATUSES[0]!, ...MERCHANT_REPORT_STATUSES.slice(1)]),
parentCompanyName: z.string().nullable(),
Expand Down
10 changes: 3 additions & 7 deletions ...backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,12 @@ export const columns = [
},
header: 'Alert',
}),
columnHelper.accessor('createdAt', {
columnHelper.accessor('displayDate', {
cell: info => {
const createdAt = info.getValue();

if (!createdAt) {
return <TextWithNAFallback>{createdAt}</TextWithNAFallback>;
}
const displayDate = info.getValue();

// Convert UTC time to local browser time
const localDateTime = dayjs.utc(createdAt).local();
const localDateTime = dayjs.utc(displayDate).local();

const date = localDateTime.format('MMM DD, YYYY');
const time = localDateTime.format('HH:mm');
Expand Down
4 changes: 2 additions & 2 deletions ...e-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ export const MerchantMonitoringBusinessReport: FunctionComponent = () => {
</div>
<div className={`text-sm`}>
<span className={`me-2 leading-6 text-slate-400`}>Created at</span>
{businessReport?.createdAt &&
dayjs(new Date(businessReport?.createdAt)).format('HH:mm MMM Do, YYYY')}
{businessReport?.displayDate &&
dayjs(new Date(businessReport?.displayDate)).format('HH:mm MMM Do, YYYY')}
Comment on lines +275 to +276
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Date formatting and timezone handling needs standardization

The current implementation has several issues:

  • The date format 'HH:mm MMM Do, YYYY' is inconsistent with other date formats in the codebase
  • Redundant new Date() wrapper is unnecessary as dayjs can parse the date string directly
  • Timezone handling should be explicitly defined (UTC vs local) for consistency

Suggested changes:

dayjs(businessReport?.displayDate).format('DD/MM/YYYY HH:mm')
🔗 Analysis chain

LGTM! Verify date handling across time zones.

The change from createdAt to displayDate is consistent with the schema updates. The date formatting remains correct.

Please ensure that:

  1. The date is correctly displayed across different time zones
  2. The format 'HH:mm MMM Do, YYYY' is consistently used across the application
  3. Dayjs plugins (utc, timezone) are properly configured
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for consistent date formatting across the codebase
echo "Checking for date format consistency:"
rg -l "dayjs\(.*\)\.format\(" | xargs rg "format\(['\"].*['\"]\)"

Length of output: 8189

</div>
<div className={`flex items-center space-x-2 text-sm`}>
<span className={`text-slate-400`}>Monitoring Status</span>
Expand Down
2 changes: 1 addition & 1 deletion services/workflows-service/src/business-report/business-report.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class BusinessReportService {

if (businessReportsCount >= maxBusinessReports) {
throw new BadRequestException(
`You have reached the maximum number of business reports allowed (${maxBusinessReports}).`,
`You've hit your reports limit. Talk to us to unlock additional features and continue effective risk management with Ballerine.`,
);
}
}
Expand Down
4 changes: 4 additions & 0 deletions services/workflows-service/src/business-report/merchant-monitoring-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ const ReportSchema = z.object({
.string()
.datetime()
.transform(value => new Date(value)),
displayDate: z
.string()
.datetime()
.transform(value => new Date(value)),
data: z.record(z.string(), z.unknown()).nullish(),
});

Expand Down