Skip to content

Commit 04872db

Browse files
committed
✅ test: fix all PascalCase function tests
1 parent 8b9eb40 commit 04872db

36 files changed

+466
-475
lines changed

sources/moderations/api/src/:id/context.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import type { App_Context } from "@~/app.middleware/context";
44
import { urls } from "@~/app.urls";
55
import type { GetModerationWithDetailsDto } from "@~/moderations.repository";
6-
import type { GetOrganizationMemberDto } from "@~/organizations.repository";
76
import type { GetFicheOrganizationByIdHandler } from "@~/organizations.lib/usecase";
8-
import { type get_domain_count_dto } from "@~/organizations.repository/get_domain_count";
9-
import { type get_organization_members_count_dto } from "@~/organizations.repository/get_organization_members_count";
7+
import {
8+
type GetDomainCountDto,
9+
type GetOrganizationMemberDto,
10+
type GetOrganizationMembersCountDto,
11+
} from "@~/organizations.repository";
1012
import type { Env, InferRequestType } from "hono";
1113
import { useRequestContext } from "hono/jsx-renderer";
1214

@@ -23,8 +25,8 @@ export interface ContextVariablesType extends Env {
2325
moderation: GetModerationWithDetailsDto;
2426
organization_member: GetOrganizationMemberDto;
2527
organization_fiche: Awaited<ReturnType<GetFicheOrganizationByIdHandler>>;
26-
query_organization_members_count: Promise<get_organization_members_count_dto>;
27-
query_domain_count: Promise<get_domain_count_dto>;
28+
query_organization_members_count: Promise<GetOrganizationMembersCountDto>;
29+
query_domain_count: Promise<GetDomainCountDto>;
2830
};
2931
}
3032
export type ContextType = App_Context & ContextVariablesType;
@@ -44,4 +46,3 @@ export const usePageRequestContext = useRequestContext<
4446
>;
4547

4648
//
47-

sources/moderations/api/src/:id/duplicate_warning/Duplicate_Warning.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ import {
1212
GetDuplicateModerations,
1313
type GetDuplicateModerationsDto,
1414
} from "@~/moderations.repository";
15-
import {
16-
get_user_by_id,
17-
type get_user_by_id_dto,
18-
} from "@~/users.repository/get_user_by_id";
15+
import { GetUserById, type GetUserByIdDto } from "@~/users.repository";
1916
import { get_zammad_mail } from "@~/zammad.lib/get_zammad_mail";
2017
import { to } from "await-to-js";
2118
import { and, asc, eq, ilike, not, or } from "drizzle-orm";
@@ -43,7 +40,8 @@ export async function Duplicate_Warning({
4340
user_id,
4441
});
4542

46-
const user = await get_user_by_id(identite_pg, { id: user_id });
43+
const get_user_by_id = GetUserById(identite_pg);
44+
const user = await get_user_by_id(user_id);
4745
if (!user) return <p>Utilisateur introuvable</p>;
4846

4947
return (
@@ -63,7 +61,7 @@ export async function Duplicate_Warning({
6361
Duplicate_Warning.Context = createContext({
6462
moderation_id: NaN,
6563
moderations: {} as GetDuplicateModerationsDto,
66-
user: {} as NonNullable<Awaited<get_user_by_id_dto>>,
64+
user: {} as NonNullable<GetUserByIdDto>,
6765
});
6866

6967
//

sources/moderations/api/src/:id/index.tsx

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ import { Main_Layout } from "@~/app.layout/index";
88
import type { App_Context } from "@~/app.middleware/context";
99
import { set_context_variables } from "@~/app.middleware/set_context_variables";
1010
import { moderation_type_to_title } from "@~/moderations.lib/moderation_type.mapper";
11+
import { GetModerationWithDetails } from "@~/moderations.repository";
1112
import { GetFicheOrganizationById } from "@~/organizations.lib/usecase";
12-
import { get_domain_count } from "@~/organizations.repository/get_domain_count";
13-
import { get_organization_members_count } from "@~/organizations.repository/get_organization_members_count";
13+
import {
14+
GetDomainCount,
15+
GetOrganizationMember,
16+
GetOrganizationMembersCount,
17+
} from "@~/organizations.repository";
1418
import { to } from "await-to-js";
1519
import { Hono } from "hono";
1620
import { getContext } from "hono/context-storage";
1721
import { jsxRenderer } from "hono/jsx-renderer";
1822
import moderation_procedures_router from "./$procedures";
19-
import { GetModerationWithDetails } from "@~/moderations.repository";
20-
import { GetOrganizationMember } from "@~/organizations.repository";
21-
import {
22-
type ContextType,
23-
type ContextVariablesType,
24-
} from "./context";
23+
import { type ContextType, type ContextVariablesType } from "./context";
2524
import duplicate_warning_router from "./duplicate_warning";
2625
import moderation_email_router from "./email/index";
2726
import { Moderation_NotFound } from "./not-found";
@@ -78,6 +77,9 @@ export default new Hono<ContextType>()
7877
const organization_fiche = await get_fiche_organization_by_id(
7978
moderation.organization_id,
8079
);
80+
const get_organization_members_count =
81+
GetOrganizationMembersCount(identite_pg);
82+
const get_domain_count = GetDomainCount(identite_pg);
8183

8284
//
8385

@@ -86,14 +88,9 @@ export default new Hono<ContextType>()
8688
moderation,
8789
organization_fiche,
8890
organization_member,
89-
query_domain_count: get_domain_count(identite_pg, {
90-
organization_id: moderation.organization_id,
91-
}),
91+
query_domain_count: get_domain_count(moderation.organization_id),
9292
query_organization_members_count: get_organization_members_count(
93-
identite_pg,
94-
{
95-
organization_id: moderation.organization_id,
96-
},
93+
moderation.organization_id,
9794
),
9895
};
9996
}),

sources/organizations/api/src/:id/context.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import type { App_Context } from "@~/app.middleware/context";
44
import { urls } from "@~/app.urls";
55
import type { Organization } from "@~/organizations.lib/entities/Organization";
66
import type { GetFicheOrganizationByIdHandler } from "@~/organizations.lib/usecase";
7-
import { type GetDomainCountDto } from "@~/organizations.repository/GetDomainCount";
8-
import { type GetOrganizationMembersCountDto } from "@~/organizations.repository/GetOrganizationMembersCount";
7+
import {
8+
type GetDomainCountDto,
9+
type GetOrganizationMembersCountDto,
10+
} from "@~/organizations.repository";
911
import type { Env, InferRequestType } from "hono";
1012
import { useRequestContext } from "hono/jsx-renderer";
1113
//

sources/organizations/api/src/:id/index.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import { Entity_Schema } from "@~/app.core/schema";
66
import { Main_Layout } from "@~/app.layout";
77
import { set_context_variables } from "@~/app.middleware/set_context_variables";
88
import { GetFicheOrganizationById } from "@~/organizations.lib/usecase";
9-
import { GetOrganizationById } from "@~/organizations.repository";
10-
import { GetDomainCount } from "@~/organizations.repository/GetDomainCount";
11-
import { GetOrganizationMembersCount } from "@~/organizations.repository/GetOrganizationMembersCount";
9+
import {
10+
GetDomainCount,
11+
GetOrganizationById,
12+
GetOrganizationMembersCount,
13+
} from "@~/organizations.repository";
1214
import { to as await_to } from "await-to-js";
1315
import { Hono } from "hono";
1416
import { getContext } from "hono/context-storage";
@@ -73,9 +75,7 @@ export default new Hono<ContextType>()
7375
) {
7476
set(
7577
"query_organization_members_count",
76-
GetOrganizationMembersCount(identite_pg)({
77-
organization_id: organization.id,
78-
}),
78+
GetOrganizationMembersCount(identite_pg)(organization.id),
7979
);
8080
return next();
8181
},
@@ -89,9 +89,8 @@ export default new Hono<ContextType>()
8989
});
9090
const organization_fiche =
9191
await get_fiche_organization_by_id(organization_id);
92-
const query_organization_domains_count = GetDomainCount(identite_pg)({
93-
organization_id,
94-
});
92+
const query_organization_domains_count =
93+
GetDomainCount(identite_pg)(organization_id);
9594
return set_context_variables<ContextVariablesType>(() => ({
9695
organization_fiche,
9796
organization: ctx.var.organization,
@@ -101,7 +100,10 @@ export default new Hono<ContextType>()
101100
}))(ctx as any, next);
102101
},
103102
async function GET({ render, set, var: { organization } }) {
104-
set("page_title", `Organisation ${organization.cached_libelle} (${organization.siret})`);
103+
set(
104+
"page_title",
105+
`Organisation ${organization.cached_libelle} (${organization.siret})`,
106+
);
105107
return render(<Organization_Page />);
106108
},
107109
)

sources/organizations/api/src/:id/members/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface ContextVariablesType extends Env {
2020
Variables: {
2121
organization_id: number;
2222
pagination: Pagination;
23-
query_members_collection: GetUsersByOrganizationIdDto;
23+
query_members_collection: Promise<GetUsersByOrganizationIdDto>;
2424
};
2525
}
2626
export type ContextType = App_Context & ContextVariablesType;

sources/organizations/api/src/domaines/Page.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import { copy_value_to_clipboard } from "@~/app.ui/button/scripts";
44
import { Foot } from "@~/app.ui/hx_table";
55
import { row } from "@~/app.ui/table";
66
import { urls } from "@~/app.urls";
7-
import type { get_unverified_domains_dto } from "@~/organizations.repository/get_unverified_domains";
7+
import {
8+
GetUnverifiedDomains,
9+
type GetUnverifiedDomainsDto,
10+
} from "@~/organizations.repository";
811
import { match } from "ts-pattern";
912
import { query_schema, usePageRequestContext } from "./context";
1013

@@ -66,13 +69,7 @@ function Filter() {
6669
async function Table() {
6770
const {
6871
req,
69-
var: {
70-
$describedby,
71-
$table,
72-
hx_domains_query_props,
73-
query_unverified_domains,
74-
identite_pg,
75-
},
72+
var: { $describedby, $table, hx_domains_query_props, identite_pg },
7673
} = usePageRequestContext();
7774
const { q } = req.valid("query");
7875
const pagination = match(
@@ -81,7 +78,8 @@ async function Table() {
8178
.with({ success: true }, ({ data }) => data)
8279
.otherwise(() => Pagination_Schema.parse({}));
8380

84-
const { count, domains } = await query_unverified_domains(identite_pg, {
81+
const query_unverified_domains = GetUnverifiedDomains(identite_pg);
82+
const { count, domains } = await query_unverified_domains({
8583
pagination: { ...pagination, page: pagination.page - 1 },
8684
search: q ? String(q) : undefined,
8785
});
@@ -120,7 +118,7 @@ function Row({
120118
domains: { organization, domain },
121119
}: {
122120
key?: string;
123-
domains: get_unverified_domains_dto["domains"][number];
121+
domains: GetUnverifiedDomainsDto["domains"][number];
124122
}) {
125123
const $domain = hyper_ref();
126124
return (

sources/organizations/api/src/domaines/context.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Pagination_Schema, Search_Schema } from "@~/app.core/schema";
44
import type { App_Context } from "@~/app.middleware/context";
55
import { set_context_variables } from "@~/app.middleware/set_context_variables";
66
import type { urls } from "@~/app.urls";
7-
import type { get_unverified_domains } from "@~/organizations.repository/get_unverified_domains";
87
import { type Env, type InferRequestType } from "hono";
98
import { useRequestContext } from "hono/jsx-renderer";
109

@@ -20,7 +19,6 @@ export interface ContextVariablesType extends Env {
2019
$search: string;
2120
$table: string;
2221
hx_domains_query_props: Record<"hx-get", string>;
23-
query_unverified_domains: typeof get_unverified_domains;
2422
};
2523
}
2624

sources/organizations/api/src/domaines/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { hyper_ref } from "@~/app.core/html";
55
import { hx_include } from "@~/app.core/htmx";
66
import { Main_Layout } from "@~/app.layout";
77
import { hx_urls, urls } from "@~/app.urls";
8-
import { get_unverified_domains } from "@~/organizations.repository/get_unverified_domains";
98
import consola from "consola";
109
import { Hono } from "hono";
1110
import { jsxRenderer } from "hono/jsx-renderer";
@@ -43,7 +42,6 @@ export default new Hono<ContextType>().use("/", jsxRenderer(Main_Layout)).get(
4342
$search,
4443
$table,
4544
hx_domains_query_props,
46-
query_unverified_domains: get_unverified_domains,
4745
};
4846
}),
4947
async function GET({ render, set }) {

sources/organizations/api/src/page.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Foot } from "@~/app.ui/hx_table";
88
import { row } from "@~/app.ui/table";
99
import { Time } from "@~/app.ui/time";
1010
import { hx_urls, urls } from "@~/app.urls";
11-
import type { get_organizations_dto } from "@~/organizations.repository/get_organizations_list";
11+
import { type GetOrganizationsListDto } from "@~/organizations.repository";
1212
import { match } from "ts-pattern";
1313
import { PageQuery_Schema, usePageRequestContext } from "./context";
1414

@@ -71,7 +71,7 @@ function Filter() {
7171
async function Table() {
7272
const {
7373
req,
74-
var: { query_organizations, identite_pg },
74+
var: { query_organizations },
7575
} = usePageRequestContext();
7676
const { q } = req.valid("query");
7777
const pagination = match(
@@ -80,7 +80,7 @@ async function Table() {
8080
.with({ success: true }, ({ data }) => data)
8181
.otherwise(() => Pagination_Schema.parse({}));
8282

83-
const { count, organizations } = await query_organizations(identite_pg, {
83+
const { count, organizations } = await query_organizations({
8484
pagination: { ...pagination, page: pagination.page - 1 },
8585
search: q ? String(q) : undefined,
8686
});
@@ -121,7 +121,7 @@ function Row({
121121
organization,
122122
}: {
123123
key?: string;
124-
organization: get_organizations_dto["organizations"][number];
124+
organization: GetOrganizationsListDto["organizations"][number];
125125
}) {
126126
return (
127127
<tr

0 commit comments

Comments
 (0)