From bc5a1039f0c10fdeed8db9d5fca8ed1f4a035cb7 Mon Sep 17 00:00:00 2001
From: Gao Sun <gao@silverhand.io>
Date: Tue, 24 Oct 2023 15:44:00 +0800
Subject: [PATCH] refactor(core,console): fixing to-dos

---
 .../components/ItemPreview/index.module.scss  |  4 ++
 .../Members/AddMembersToOrganization.tsx      | 15 +++--
 .../OrganizationDetails/Members/index.tsx     | 28 ++++++++-
 .../OrganizationDetails/index.module.scss     |  5 ++
 .../src/pages/OrganizationDetails/index.tsx   |  2 +-
 .../core/src/database/find-all-entities.ts    |  4 +-
 packages/core/src/database/utils.ts           | 14 ++++-
 packages/core/src/queries/organizations.ts    | 59 ++++++++++++-------
 .../core/src/routes/organization/index.ts     | 14 ++++-
 .../core/src/routes/organization/utils.ts     |  2 +-
 packages/core/src/utils/RelationQueries.ts    | 35 ++++++-----
 .../src/tests/api/organization-role.test.ts   |  6 +-
 .../src/tests/api/organization-scope.test.ts  |  4 +-
 .../phrases/src/locales/de/errors/entity.ts   |  2 +-
 .../phrases/src/locales/en/errors/entity.ts   |  2 +-
 .../phrases/src/locales/es/errors/entity.ts   |  2 +-
 .../phrases/src/locales/fr/errors/entity.ts   |  2 +-
 .../phrases/src/locales/it/errors/entity.ts   |  2 +-
 .../phrases/src/locales/ja/errors/entity.ts   |  2 +-
 .../phrases/src/locales/ko/errors/entity.ts   |  2 +-
 .../src/locales/pl-pl/errors/entity.ts        |  2 +-
 .../src/locales/pt-br/errors/entity.ts        |  2 +-
 .../src/locales/pt-pt/errors/entity.ts        |  2 +-
 .../phrases/src/locales/ru/errors/entity.ts   |  2 +-
 .../src/locales/tr-tr/errors/entity.ts        |  2 +-
 .../src/locales/zh-cn/errors/entity.ts        |  2 +-
 .../src/locales/zh-hk/errors/entity.ts        |  2 +-
 .../src/locales/zh-tw/errors/entity.ts        |  2 +-
 packages/shared/src/database/types.ts         |  5 +-
 29 files changed, 153 insertions(+), 74 deletions(-)

diff --git a/packages/console/src/components/ItemPreview/index.module.scss b/packages/console/src/components/ItemPreview/index.module.scss
index d9493e114..3a09bf4d6 100644
--- a/packages/console/src/components/ItemPreview/index.module.scss
+++ b/packages/console/src/components/ItemPreview/index.module.scss
@@ -5,6 +5,10 @@
   align-items: center;
   white-space: nowrap;
 
+  > svg {
+    flex-shrink: 0;
+  }
+
   > div:not(:first-child) {
     margin-left: _.unit(3);
   }
diff --git a/packages/console/src/pages/OrganizationDetails/Members/AddMembersToOrganization.tsx b/packages/console/src/pages/OrganizationDetails/Members/AddMembersToOrganization.tsx
index b3b7f471c..7bae2e09f 100644
--- a/packages/console/src/pages/OrganizationDetails/Members/AddMembersToOrganization.tsx
+++ b/packages/console/src/pages/OrganizationDetails/Members/AddMembersToOrganization.tsx
@@ -47,12 +47,15 @@ function AddMembersToOrganization({ organization, isOpen, onClose }: Props) {
             userIds: data.users.map(({ id }) => id),
           },
         });
-        await api.post(`api/organizations/${organization.id}/users/roles`, {
-          json: {
-            userIds: data.users.map(({ id }) => id),
-            roleIds: data.scopes.map(({ value }) => value),
-          },
-        });
+
+        if (data.scopes.length > 0) {
+          await api.post(`api/organizations/${organization.id}/users/roles`, {
+            json: {
+              userIds: data.users.map(({ id }) => id),
+              roleIds: data.scopes.map(({ value }) => value),
+            },
+          });
+        }
         onClose();
       } finally {
         setIsLoading(false);
diff --git a/packages/console/src/pages/OrganizationDetails/Members/index.tsx b/packages/console/src/pages/OrganizationDetails/Members/index.tsx
index 398fa9ef2..86d6555c5 100644
--- a/packages/console/src/pages/OrganizationDetails/Members/index.tsx
+++ b/packages/console/src/pages/OrganizationDetails/Members/index.tsx
@@ -7,6 +7,7 @@ import Plus from '@/assets/icons/plus.svg';
 import ActionsButton from '@/components/ActionsButton';
 import DateTime from '@/components/DateTime';
 import UserPreview from '@/components/ItemPreview/UserPreview';
+import { defaultPageSize } from '@/consts';
 import Button from '@/ds-components/Button';
 import DangerousRaw from '@/ds-components/DangerousRaw';
 import Search from '@/ds-components/Search';
@@ -20,6 +21,8 @@ import AddMembersToOrganization from './AddMembersToOrganization';
 import EditOrganizationRolesModal from './EditOrganizationRolesModal';
 import * as styles from './index.module.scss';
 
+const pageSize = defaultPageSize;
+
 type Props = {
   organization: Organization;
 };
@@ -27,8 +30,17 @@ type Props = {
 function Members({ organization }: Props) {
   const api = useApi();
   const [keyword, setKeyword] = useState('');
-  const { data, error, mutate } = useSWR<UserWithOrganizationRoles[], RequestError>(
-    buildUrl(`api/organizations/${organization.id}/users`, { q: keyword })
+  const [page, setPage] = useState(1);
+  const {
+    data: response,
+    error,
+    mutate,
+  } = useSWR<[UserWithOrganizationRoles[], number], RequestError>(
+    buildUrl(`api/organizations/${organization.id}/users`, {
+      q: keyword,
+      page: String(page),
+      page_size: String(pageSize),
+    })
   );
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const tAction = useActionTranslation();
@@ -39,13 +51,21 @@ function Members({ organization }: Props) {
     return null; // TODO: error handling
   }
 
-  if (!data) {
+  if (!response) {
     return null; // TODO: loading
   }
 
+  const [data, totalCount] = response;
+
   return (
     <>
       <Table
+        pagination={{
+          page,
+          totalCount,
+          pageSize,
+          onChange: setPage,
+        }}
         rowGroups={[{ key: 'data', data }]}
         columns={[
           {
@@ -113,9 +133,11 @@ function Members({ organization }: Props) {
               placeholder={t('organization_details.search_user_placeholder')}
               onSearch={(value) => {
                 setKeyword(value);
+                setPage(1);
               }}
               onClearSearch={() => {
                 setKeyword('');
+                setPage(1);
               }}
             />
             <Button
diff --git a/packages/console/src/pages/OrganizationDetails/index.module.scss b/packages/console/src/pages/OrganizationDetails/index.module.scss
index 7d5a0009f..0a0fd546a 100644
--- a/packages/console/src/pages/OrganizationDetails/index.module.scss
+++ b/packages/console/src/pages/OrganizationDetails/index.module.scss
@@ -1,5 +1,10 @@
 @use '@/scss/underscore' as _;
 
+.page {
+  height: 100%;
+  padding-bottom: _.unit(6);
+}
+
 .header {
   display: flex;
   justify-content: space-between;
diff --git a/packages/console/src/pages/OrganizationDetails/index.tsx b/packages/console/src/pages/OrganizationDetails/index.tsx
index 166df5fee..8733ff2ec 100644
--- a/packages/console/src/pages/OrganizationDetails/index.tsx
+++ b/packages/console/src/pages/OrganizationDetails/index.tsx
@@ -61,7 +61,7 @@ function OrganizationDetails() {
   }
 
   return (
-    <DetailsPage backLink={pathname} backLinkTitle="organizations.title">
+    <DetailsPage backLink={pathname} backLinkTitle="organizations.title" className={styles.page}>
       <PageMeta titleKey="organization_details.page_title" />
       <Card className={styles.header}>
         <div className={styles.metadata}>
diff --git a/packages/core/src/database/find-all-entities.ts b/packages/core/src/database/find-all-entities.ts
index 0fd1cebe0..6da12f92b 100644
--- a/packages/core/src/database/find-all-entities.ts
+++ b/packages/core/src/database/find-all-entities.ts
@@ -2,7 +2,7 @@ import { type GeneratedSchema, type SchemaLike } from '@logto/schemas';
 import { conditionalSql, convertToIdentifiers, manyRows } from '@logto/shared';
 import { sql, type CommonQueryMethods } from 'slonik';
 
-import { buildSearchSql, type SearchOptions } from './utils.js';
+import { buildSearchSql, expandFields, type SearchOptions } from './utils.js';
 
 export const buildFindAllEntitiesWithPool =
   (pool: CommonQueryMethods) =>
@@ -26,7 +26,7 @@ export const buildFindAllEntitiesWithPool =
     ) =>
       manyRows(
         pool.query<Schema>(sql`
-          select ${sql.join(Object.values(fields), sql`, `)}
+          select ${expandFields(schema)}
           from ${table}
           ${buildSearchSql(schema, search)}
           ${conditionalSql(orderBy, (orderBy) => {
diff --git a/packages/core/src/database/utils.ts b/packages/core/src/database/utils.ts
index a53d379d3..4fc1f2a39 100644
--- a/packages/core/src/database/utils.ts
+++ b/packages/core/src/database/utils.ts
@@ -1,5 +1,5 @@
 import { type GeneratedSchema } from '@logto/schemas';
-import { type SchemaLike, conditionalSql, convertToIdentifiers } from '@logto/shared';
+import { type SchemaLike, conditionalSql, convertToIdentifiers, type Table } from '@logto/shared';
 import { type SqlSqlToken, sql } from 'slonik';
 
 /**
@@ -44,3 +44,15 @@ export const buildSearchSql = <
     return sql`${prefixSql}(${searchSql})`;
   });
 };
+
+/**
+ * Expand the fields of a schema into a SQL list. Useful for `select` statements.
+ *
+ * @param schema The schema to expand.
+ * @param tablePrefix Whether to prefix the fields with the table name.
+ * @returns The generated SQL list separated by `, `.
+ */
+export const expandFields = <Keys extends string>(schema: Table<Keys>, tablePrefix = false) => {
+  const { fields } = convertToIdentifiers(schema, tablePrefix);
+  return sql.join(Object.values(fields), sql`, `);
+};
diff --git a/packages/core/src/queries/organizations.ts b/packages/core/src/queries/organizations.ts
index 41e2922f1..60e68d1fc 100644
--- a/packages/core/src/queries/organizations.ts
+++ b/packages/core/src/queries/organizations.ts
@@ -19,8 +19,11 @@ import {
 import { conditionalSql, convertToIdentifiers } from '@logto/shared';
 import { sql, type CommonQueryMethods } from 'slonik';
 
-import { type SearchOptions, buildSearchSql } from '#src/database/utils.js';
-import RelationQueries, { TwoRelationsQueries } from '#src/utils/RelationQueries.js';
+import { type SearchOptions, buildSearchSql, expandFields } from '#src/database/utils.js';
+import RelationQueries, {
+  type GetEntitiesOptions,
+  TwoRelationsQueries,
+} from '#src/utils/RelationQueries.js';
 import SchemaQueries from '#src/utils/SchemaQueries.js';
 
 import { type userSearchKeys } from './user.js';
@@ -37,10 +40,9 @@ class UserRelationQueries extends TwoRelationsQueries<typeof Organizations, type
     const { fields } = convertToIdentifiers(OrganizationUserRelations, true);
     const relations = convertToIdentifiers(OrganizationRoleUserRelations, true);
 
-    // TODO: replace `.*` with explicit fields
     return this.pool.any<OrganizationWithRoles>(sql`
       select
-        ${organizations.table}.*,
+        ${expandFields(Organizations, true)},
         ${this.#aggregateRoles()}
       from ${this.table}
       left join ${organizations.table}
@@ -58,29 +60,44 @@ class UserRelationQueries extends TwoRelationsQueries<typeof Organizations, type
   /** Get the users in an organization and their roles. */
   async getUsersByOrganizationId(
     organizationId: string,
+    { limit, offset }: GetEntitiesOptions,
     search?: SearchOptions<(typeof userSearchKeys)[number]>
-  ): Promise<Readonly<UserWithOrganizationRoles[]>> {
+  ): Promise<[totalCount: number, entities: Readonly<UserWithOrganizationRoles[]>]> {
     const roles = convertToIdentifiers(OrganizationRoles, true);
     const users = convertToIdentifiers(Users, true);
     const { fields } = convertToIdentifiers(OrganizationUserRelations, true);
     const relations = convertToIdentifiers(OrganizationRoleUserRelations, true);
 
-    return this.pool.any<UserWithOrganizationRoles>(sql`
-      select
-        ${users.table}.*,
-        ${this.#aggregateRoles()}
-      from ${this.table}
-      left join ${users.table}
-        on ${fields.userId} = ${users.fields.id}
-      left join ${relations.table}
-        on ${fields.userId} = ${relations.fields.userId}
-        and ${fields.organizationId} = ${relations.fields.organizationId}
-      left join ${roles.table}
-        on ${relations.fields.organizationRoleId} = ${roles.fields.id}
-      where ${fields.organizationId} = ${organizationId}
-      ${buildSearchSql(Users, search, sql`and `)}
-      group by ${users.table}.id
-    `);
+    const [{ count }, entities] = await Promise.all([
+      this.pool.one<{ count: string }>(sql`
+        select count(*)
+        from ${this.table}
+        left join ${users.table}
+          on ${fields.userId} = ${users.fields.id}
+        where ${fields.organizationId} = ${organizationId}
+        ${buildSearchSql(Users, search, sql`and `)}
+      `),
+      this.pool.any<UserWithOrganizationRoles>(sql`
+        select
+          ${users.table}.*,
+          ${this.#aggregateRoles()}
+        from ${this.table}
+        left join ${users.table}
+          on ${fields.userId} = ${users.fields.id}
+        left join ${relations.table}
+          on ${fields.userId} = ${relations.fields.userId}
+          and ${fields.organizationId} = ${relations.fields.organizationId}
+        left join ${roles.table}
+          on ${relations.fields.organizationRoleId} = ${roles.fields.id}
+        where ${fields.organizationId} = ${organizationId}
+        ${buildSearchSql(Users, search, sql`and `)}
+        group by ${users.table}.id
+        limit ${limit}
+        offset ${offset}
+      `),
+    ]);
+
+    return [Number(count), entities];
   }
 
   /**
diff --git a/packages/core/src/routes/organization/index.ts b/packages/core/src/routes/organization/index.ts
index e44ca961a..48db4af8a 100644
--- a/packages/core/src/routes/organization/index.ts
+++ b/packages/core/src/routes/organization/index.ts
@@ -32,7 +32,7 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
 
   router.get(
     '/:id/users',
-    // TODO: support pagination
+    koaPagination(),
     koaGuard({
       query: z.object({ q: z.string().optional() }),
       params: z.object({ id: z.string().min(1) }),
@@ -47,10 +47,16 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
           keyword: q,
         }
       );
-      ctx.body = await organizations.relations.users.getUsersByOrganizationId(
+
+      const [totalCount, entities] = await organizations.relations.users.getUsersByOrganizationId(
         ctx.guard.params.id,
+        ctx.pagination,
         search
       );
+
+      ctx.pagination.totalCount = totalCount;
+      ctx.body = entities;
+
       return next();
     }
   );
@@ -85,6 +91,9 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
   const params = Object.freeze({ id: z.string().min(1), userId: z.string().min(1) } as const);
   const pathname = '/:id/users/:userId/roles';
 
+  // The pathname of `.use()` will not match the end of the path, for example:
+  // `.use('/foo', ...)` will match both `/foo` and `/foo/bar`.
+  // See https://github.com/koajs/router/blob/02ad6eedf5ced6ec1eab2138380fd67c63e3f1d7/lib/router.js#L330-L333
   router.use(pathname, koaGuard({ params: z.object(params) }), async (ctx, next) => {
     const { id, userId } = ctx.guard.params;
 
@@ -160,7 +169,6 @@ export default function organizationRoutes<T extends AuthedRouter>(...args: Rout
     }
   );
 
-  // TODO: check if membership is required in this route
   router.delete(
     `${pathname}/:roleId`,
     koaGuard({
diff --git a/packages/core/src/routes/organization/utils.ts b/packages/core/src/routes/organization/utils.ts
index 009f76230..7c0ff480a 100644
--- a/packages/core/src/routes/organization/utils.ts
+++ b/packages/core/src/routes/organization/utils.ts
@@ -7,7 +7,7 @@ import RequestError from '#src/errors/RequestError/index.js';
 
 export const errorHandler = (error: unknown) => {
   if (error instanceof UniqueIntegrityConstraintViolationError) {
-    throw new RequestError({ code: 'entity.duplicate_value_of_unique_field', field: 'name' }); // TODO: specify field
+    throw new RequestError({ code: 'entity.unique_integrity_violation', status: 422 });
   }
 
   if (error instanceof ForeignKeyIntegrityConstraintViolationError) {
diff --git a/packages/core/src/utils/RelationQueries.ts b/packages/core/src/utils/RelationQueries.ts
index 14790a195..2810d0c7b 100644
--- a/packages/core/src/utils/RelationQueries.ts
+++ b/packages/core/src/utils/RelationQueries.ts
@@ -1,28 +1,34 @@
-import { conditionalSql } from '@logto/shared';
+import { type Table, conditionalSql } from '@logto/shared';
 import { type KeysToCamelCase } from '@silverhand/essentials';
 import { sql, type CommonQueryMethods } from 'slonik';
 import snakecaseKeys from 'snakecase-keys';
 import { type z } from 'zod';
 
+import { expandFields } from '#src/database/utils.js';
 import { DeletionError } from '#src/errors/SlonikError/index.js';
 
 type AtLeast2<T extends unknown[]> = `${T['length']}` extends '0' | '1' ? never : T;
 
-type TableInfo<Table, TableSingular, Schema> = {
-  table: Table;
+type TableInfo<
+  TableName extends string,
+  TableSingular extends string,
+  Key extends string,
+  Schema,
+> = Table<Key, TableName> & {
   tableSingular: TableSingular;
   guard: z.ZodType<Schema, z.ZodTypeDef, unknown>;
 };
 
-type InferSchema<T> = T extends TableInfo<infer _, infer _, infer Schema> ? Schema : never;
+type InferSchema<T> = T extends TableInfo<infer _, infer _, infer _, infer Schema> ? Schema : never;
 
 type CamelCaseIdObject<T extends string> = KeysToCamelCase<{
   [Key in `${T}_id`]: string;
 }>;
 
-type GetEntitiesOptions = {
-  limit?: number;
-  offset?: number;
+/** Options for getting entities in a table. */
+export type GetEntitiesOptions = {
+  limit: number;
+  offset: number;
 };
 
 /**
@@ -59,7 +65,7 @@ type GetEntitiesOptions = {
  * group with the id `group-id-1`.
  */
 export default class RelationQueries<
-  Schemas extends Array<TableInfo<string, string, unknown>>,
+  Schemas extends Array<TableInfo<string, string, string, unknown>>,
   Length = AtLeast2<Schemas>['length'],
 > {
   protected get table() {
@@ -175,9 +181,9 @@ export default class RelationQueries<
   async getEntities<S extends Schemas[number]>(
     forSchema: S,
     where: CamelCaseIdObject<Exclude<Schemas[number]['tableSingular'], S['tableSingular']>>,
-    options: GetEntitiesOptions = {}
+    options?: GetEntitiesOptions
   ): Promise<[totalCount: number, entities: ReadonlyArray<InferSchema<S>>]> {
-    const { limit, offset } = options;
+    const { limit, offset } = options ?? {};
     const snakeCaseWhere = snakecaseKeys(where);
     const forTable = sql.identifier([forSchema.table]);
     const mainSql = sql`
@@ -201,9 +207,10 @@ export default class RelationQueries<
         select count(*)
         ${mainSql}
       `),
-      // TODO: replace `.*` with explicit fields
+
       this.pool.query<InferSchema<S>>(sql`
-        select ${forTable}.* ${mainSql}
+        select ${expandFields(forSchema, true)}
+        ${mainSql}
         ${conditionalSql(limit, (limit) => sql`limit ${limit}`)}
         ${conditionalSql(offset, (offset) => sql`offset ${offset}`)}
       `),
@@ -249,8 +256,8 @@ export default class RelationQueries<
  * @see {@link RelationQueries} for more information.
  */
 export class TwoRelationsQueries<
-  Schema1 extends TableInfo<string, string, unknown>,
-  Schema2 extends TableInfo<string, string, unknown>,
+  Schema1 extends TableInfo<string, string, string, unknown>,
+  Schema2 extends TableInfo<string, string, string, unknown>,
 > extends RelationQueries<[Schema1, Schema2]> {
   /**
    * Replace all relations for a specific `Schema1` entity with the given `Schema2` entities.
diff --git a/packages/integration-tests/src/tests/api/organization-role.test.ts b/packages/integration-tests/src/tests/api/organization-role.test.ts
index 07aee8638..7931a5905 100644
--- a/packages/integration-tests/src/tests/api/organization-role.test.ts
+++ b/packages/integration-tests/src/tests/api/organization-role.test.ts
@@ -21,10 +21,8 @@ describe('organization role APIs', () => {
 
       const { statusCode, body: raw } = response.response;
       const body: unknown = JSON.parse(String(raw));
-      expect(statusCode).toBe(400);
-      expect(isKeyInObject(body, 'code') && body.code).toBe(
-        'entity.duplicate_value_of_unique_field'
-      );
+      expect(statusCode).toBe(422);
+      expect(isKeyInObject(body, 'code') && body.code).toBe('entity.unique_integrity_violation');
 
       await roleApi.delete(createdRole.id);
     });
diff --git a/packages/integration-tests/src/tests/api/organization-scope.test.ts b/packages/integration-tests/src/tests/api/organization-scope.test.ts
index afcca541f..f9d9e2604 100644
--- a/packages/integration-tests/src/tests/api/organization-scope.test.ts
+++ b/packages/integration-tests/src/tests/api/organization-scope.test.ts
@@ -18,8 +18,8 @@ describe('organization scopes', () => {
 
     const { statusCode, body: raw } = response.response;
     const body: unknown = JSON.parse(String(raw));
-    expect(statusCode).toBe(400);
-    expect(isKeyInObject(body, 'code') && body.code).toBe('entity.duplicate_value_of_unique_field');
+    expect(statusCode).toBe(422);
+    expect(isKeyInObject(body, 'code') && body.code).toBe('entity.unique_integrity_violation');
   });
 
   it('should get organization scopes successfully', async () => {
diff --git a/packages/phrases/src/locales/de/errors/entity.ts b/packages/phrases/src/locales/de/errors/entity.ts
index 06f870bab..8df53c2df 100644
--- a/packages/phrases/src/locales/de/errors/entity.ts
+++ b/packages/phrases/src/locales/de/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/en/errors/entity.ts b/packages/phrases/src/locales/en/errors/entity.ts
index 8a048a79c..756ae2508 100644
--- a/packages/phrases/src/locales/en/errors/entity.ts
+++ b/packages/phrases/src/locales/en/errors/entity.ts
@@ -7,7 +7,7 @@ const entity = {
   not_found: 'The resource does not exist.',
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/es/errors/entity.ts b/packages/phrases/src/locales/es/errors/entity.ts
index 6df341e26..56e513c86 100644
--- a/packages/phrases/src/locales/es/errors/entity.ts
+++ b/packages/phrases/src/locales/es/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/fr/errors/entity.ts b/packages/phrases/src/locales/fr/errors/entity.ts
index cb2d23415..b307cdb68 100644
--- a/packages/phrases/src/locales/fr/errors/entity.ts
+++ b/packages/phrases/src/locales/fr/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/it/errors/entity.ts b/packages/phrases/src/locales/it/errors/entity.ts
index e44d2f4c3..9e6546f1e 100644
--- a/packages/phrases/src/locales/it/errors/entity.ts
+++ b/packages/phrases/src/locales/it/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/ja/errors/entity.ts b/packages/phrases/src/locales/ja/errors/entity.ts
index e3a56a3d2..003b9d073 100644
--- a/packages/phrases/src/locales/ja/errors/entity.ts
+++ b/packages/phrases/src/locales/ja/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/ko/errors/entity.ts b/packages/phrases/src/locales/ko/errors/entity.ts
index ad347b2c2..e5d851116 100644
--- a/packages/phrases/src/locales/ko/errors/entity.ts
+++ b/packages/phrases/src/locales/ko/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/pl-pl/errors/entity.ts b/packages/phrases/src/locales/pl-pl/errors/entity.ts
index c35c09e23..057234df0 100644
--- a/packages/phrases/src/locales/pl-pl/errors/entity.ts
+++ b/packages/phrases/src/locales/pl-pl/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/pt-br/errors/entity.ts b/packages/phrases/src/locales/pt-br/errors/entity.ts
index a036da459..161beeaa2 100644
--- a/packages/phrases/src/locales/pt-br/errors/entity.ts
+++ b/packages/phrases/src/locales/pt-br/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/pt-pt/errors/entity.ts b/packages/phrases/src/locales/pt-pt/errors/entity.ts
index 2ebab9687..5a7022d12 100644
--- a/packages/phrases/src/locales/pt-pt/errors/entity.ts
+++ b/packages/phrases/src/locales/pt-pt/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/ru/errors/entity.ts b/packages/phrases/src/locales/ru/errors/entity.ts
index 9b90b8e51..aa75e132b 100644
--- a/packages/phrases/src/locales/ru/errors/entity.ts
+++ b/packages/phrases/src/locales/ru/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/tr-tr/errors/entity.ts b/packages/phrases/src/locales/tr-tr/errors/entity.ts
index e19c0c2e8..03adf8f94 100644
--- a/packages/phrases/src/locales/tr-tr/errors/entity.ts
+++ b/packages/phrases/src/locales/tr-tr/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/zh-cn/errors/entity.ts b/packages/phrases/src/locales/zh-cn/errors/entity.ts
index 4f6f365bf..f09d56a5e 100644
--- a/packages/phrases/src/locales/zh-cn/errors/entity.ts
+++ b/packages/phrases/src/locales/zh-cn/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/zh-hk/errors/entity.ts b/packages/phrases/src/locales/zh-hk/errors/entity.ts
index c1d23cf45..986882a65 100644
--- a/packages/phrases/src/locales/zh-hk/errors/entity.ts
+++ b/packages/phrases/src/locales/zh-hk/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/phrases/src/locales/zh-tw/errors/entity.ts b/packages/phrases/src/locales/zh-tw/errors/entity.ts
index e12c5d258..a2cebe900 100644
--- a/packages/phrases/src/locales/zh-tw/errors/entity.ts
+++ b/packages/phrases/src/locales/zh-tw/errors/entity.ts
@@ -9,7 +9,7 @@ const entity = {
   relation_foreign_key_not_found:
     'Cannot find one or more foreign keys. Please check the input and ensure that all referenced entities exist.',
   /** UNTRANSLATED */
-  duplicate_value_of_unique_field: 'The value of the unique field `{{field}}` is duplicated.',
+  unique_integrity_violation: 'The entity already exists. Please check the input and try again.',
 };
 
 export default Object.freeze(entity);
diff --git a/packages/shared/src/database/types.ts b/packages/shared/src/database/types.ts
index b9f6dde6a..0508100cf 100644
--- a/packages/shared/src/database/types.ts
+++ b/packages/shared/src/database/types.ts
@@ -6,7 +6,10 @@ export type SchemaLike<Key extends string> = {
   [key in Key]: SchemaValue;
 };
 
-export type Table<Keys extends string> = { table: string; fields: Record<Keys, string> };
+export type Table<Keys extends string, TableName extends string = string> = {
+  table: TableName;
+  fields: Record<Keys, string>;
+};
 export type FieldIdentifiers<Key extends string> = {
   [key in Key]: IdentifierSqlToken;
 };