From 5c7e1457665344a81cab628e978fecda76376fe6 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Tue, 26 May 2026 09:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E7=AB=AF=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8E=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/repositories/order-item-repo.ts | 4 ++-- apps/backend/src/repositories/order-repo.ts | 4 ++-- apps/backend/src/repositories/task-repo.ts | 4 ++-- apps/backend/src/routes/admin/orders.ts | 2 +- .../admin/platform-config/cloudtentacles.ts | 4 ++-- .../kuaishou-cloud-fulfillment.ts | 2 +- .../admin/platform-config/kuaishou-eticket.ts | 2 +- .../routes/admin/platform-config/ninetyone.ts | 2 +- .../admin/platform-config/notifications.ts | 2 +- apps/backend/src/routes/admin/tasks.ts | 4 ++-- .../admin/admin-order-read-helpers.ts | 4 ++-- .../src/services/admin/admin-read-service.ts | 4 ++-- .../admin/admin-read-shared-helpers.ts | 4 ++-- .../services/admin/admin-task-read-helpers.ts | 6 +++--- .../{ => cloudtentacles}/context.test.ts | 0 .../{ => cloudtentacles}/context.ts | 4 ++-- .../{ => cloudtentacles}/domain.test.ts | 0 .../{ => cloudtentacles}/domain.ts | 0 .../index.ts} | 20 +++++++++---------- .../{ => cloudtentacles}/mappers.test.ts | 0 .../{ => cloudtentacles}/mappers.ts | 2 +- .../observed-products.test.ts | 0 .../{ => cloudtentacles}/observed-products.ts | 2 +- .../payloads.test.ts} | 2 +- .../payloads.ts} | 4 ++-- .../writes.ts} | 0 .../kuaishou-cloud-fulfillment-service.ts | 2 +- .../kuaishou-eticket-service.ts | 4 ++-- .../platform-config/notification-service.ts | 4 ++-- .../src/services/admin/write-helpers.ts | 2 +- .../admin/write/kuaishou-cloud-actions.ts | 6 +++--- .../claim/kuaishou-cloud-claim-context.ts | 2 +- .../claim/kuaishou-cloud-claim-service.ts | 2 +- .../claim/kuaishou-cloud-sync-service.ts | 2 +- .../fulfillment/kuaishou-cloud/index.ts | 2 +- .../kuaishou-cloud/task-context.ts | 2 +- .../kuaishou-cloud/task-finalization.ts | 2 +- .../services/open-91/order-query-service.ts | 2 +- .../services/order/delivery-task-service.ts | 2 +- .../src/services/order/order-service.ts | 2 +- .../platforms/ninetyone/order-service.ts | 2 +- .../read-inputs.ts} | 0 .../read-models.ts} | 0 .../route-inputs.ts} | 4 ++-- .../write-inputs.ts} | 0 .../write-models.ts} | 0 .../inputs.ts} | 0 .../rows.ts} | 0 48 files changed, 62 insertions(+), 62 deletions(-) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/context.test.ts (100%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/context.ts (93%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/domain.test.ts (100%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/domain.ts (100%) rename apps/backend/src/services/admin/platform-config/{cloudtentacles-service.ts => cloudtentacles/index.ts} (94%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/mappers.test.ts (100%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/mappers.ts (99%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/observed-products.test.ts (100%) rename apps/backend/src/services/admin/platform-config/{ => cloudtentacles}/observed-products.ts (97%) rename apps/backend/src/services/admin/platform-config/{cloudtentacles.test.ts => cloudtentacles/payloads.test.ts} (99%) rename apps/backend/src/services/admin/platform-config/{cloudtentacles.ts => cloudtentacles/payloads.ts} (94%) rename apps/backend/src/services/admin/platform-config/{cloudtentacles-writes.ts => cloudtentacles/writes.ts} (100%) rename apps/backend/src/types/{admin-read-inputs.ts => admin/read-inputs.ts} (100%) rename apps/backend/src/types/{admin-read-models.ts => admin/read-models.ts} (100%) rename apps/backend/src/types/{admin-route-inputs.ts => admin/route-inputs.ts} (97%) rename apps/backend/src/types/{admin-write-inputs.ts => admin/write-inputs.ts} (100%) rename apps/backend/src/types/{admin-write-models.ts => admin/write-models.ts} (100%) rename apps/backend/src/types/{repository-inputs.ts => repository/inputs.ts} (100%) rename apps/backend/src/types/{repository-rows.ts => repository/rows.ts} (100%) diff --git a/apps/backend/src/repositories/order-item-repo.ts b/apps/backend/src/repositories/order-item-repo.ts index 7752dd24..11511cc9 100644 --- a/apps/backend/src/repositories/order-item-repo.ts +++ b/apps/backend/src/repositories/order-item-repo.ts @@ -1,8 +1,8 @@ import type { PoolClient, QueryResult } from 'pg' import { query, withTransaction } from '../db/client.js' -import type { OrderItemReplaceInput } from '../types/repository-inputs.js' -import type { OrderItemRow } from '../types/repository-rows.js' +import type { OrderItemReplaceInput } from '../types/repository/inputs.js' +import type { OrderItemRow } from '../types/repository/rows.js' type QueryExecutor = (text: string, params?: unknown[]) => Promise> diff --git a/apps/backend/src/repositories/order-repo.ts b/apps/backend/src/repositories/order-repo.ts index d520ec60..f04291bf 100644 --- a/apps/backend/src/repositories/order-repo.ts +++ b/apps/backend/src/repositories/order-repo.ts @@ -3,12 +3,12 @@ import type { OrderCreateInput, OrderListQueryInput, OrderUpdateInput, -} from '../types/repository-inputs.js' +} from '../types/repository/inputs.js' import type { OrderListQueryResult, OrderListRow, OrderRow, -} from '../types/repository-rows.js' +} from '../types/repository/rows.js' type OrderPlatformLookupInput = { provider?: string diff --git a/apps/backend/src/repositories/task-repo.ts b/apps/backend/src/repositories/task-repo.ts index 00008f90..e7f2bd44 100644 --- a/apps/backend/src/repositories/task-repo.ts +++ b/apps/backend/src/repositories/task-repo.ts @@ -6,11 +6,11 @@ import type { TaskListQueryInput, TaskRuntimeContextPatch, TaskUpdatePatch, -} from '../types/repository-inputs.js' +} from '../types/repository/inputs.js' import type { TaskListQueryResult, TaskRow, -} from '../types/repository-rows.js' +} from '../types/repository/rows.js' type TaskQueryExecutor = (text: string, params?: unknown[]) => Promise<{ rows: unknown[] }> diff --git a/apps/backend/src/routes/admin/orders.ts b/apps/backend/src/routes/admin/orders.ts index 13b4fdb1..b45e6513 100644 --- a/apps/backend/src/routes/admin/orders.ts +++ b/apps/backend/src/routes/admin/orders.ts @@ -5,7 +5,7 @@ import { createJsonHandler } from './session.js' import type { AdminOrderRouteParams, AdminOrderRouteQuery, -} from '../../types/admin-route-inputs.js' +} from '../../types/admin/route-inputs.js' const router = Router() diff --git a/apps/backend/src/routes/admin/platform-config/cloudtentacles.ts b/apps/backend/src/routes/admin/platform-config/cloudtentacles.ts index 4213e747..b311c9d4 100644 --- a/apps/backend/src/routes/admin/platform-config/cloudtentacles.ts +++ b/apps/backend/src/routes/admin/platform-config/cloudtentacles.ts @@ -21,7 +21,7 @@ import { useAdminCloudtentaclesSku, validateAdminCloudtentaclesSession, verifyAdminCloudtentaclesLoginCode, -} from "../../../services/admin/platform-config/cloudtentacles-service.js"; +} from "../../../services/admin/platform-config/cloudtentacles/index.js"; import type { AdminCloudtentaclesCatalogQueryRouteBody, AdminCloudtentaclesFullFlowRouteBody, @@ -32,7 +32,7 @@ import type { AdminCloudtentaclesTestLoginRouteBody, AdminCloudtentaclesValidateSessionRouteBody, AdminCloudtentaclesVirtualNumberRouteBody, -} from "../../../types/admin-route-inputs.js"; +} from "../../../types/admin/route-inputs.js"; import { createJsonHandler } from "../session.js"; import type { JsonRecord } from "../../../types/json.js"; diff --git a/apps/backend/src/routes/admin/platform-config/kuaishou-cloud-fulfillment.ts b/apps/backend/src/routes/admin/platform-config/kuaishou-cloud-fulfillment.ts index b0ef002d..1264db83 100644 --- a/apps/backend/src/routes/admin/platform-config/kuaishou-cloud-fulfillment.ts +++ b/apps/backend/src/routes/admin/platform-config/kuaishou-cloud-fulfillment.ts @@ -4,7 +4,7 @@ import { getAdminKuaishouCloudFulfillmentConfig, updateAdminKuaishouCloudFulfillmentConfig, } from "../../../services/admin/platform-config/kuaishou-cloud-fulfillment-service.js"; -import type { AdminKuaishouCloudFulfillmentConfigRouteBody } from "../../../types/admin-route-inputs.js"; +import type { AdminKuaishouCloudFulfillmentConfigRouteBody } from "../../../types/admin/route-inputs.js"; import { createJsonHandler } from "../session.js"; import type { JsonRecord } from "../../../types/json.js"; diff --git a/apps/backend/src/routes/admin/platform-config/kuaishou-eticket.ts b/apps/backend/src/routes/admin/platform-config/kuaishou-eticket.ts index be8aab9a..656d34c0 100644 --- a/apps/backend/src/routes/admin/platform-config/kuaishou-eticket.ts +++ b/apps/backend/src/routes/admin/platform-config/kuaishou-eticket.ts @@ -12,7 +12,7 @@ import type { AdminKuaishouEticketDetailQueryRouteBody, AdminKuaishouEticketShopInfoRouteBody, AdminKuaishouEticketSourceConfigRouteBody, -} from "../../../types/admin-route-inputs.js"; +} from "../../../types/admin/route-inputs.js"; import { createJsonHandler } from "../session.js"; import type { JsonRecord } from "../../../types/json.js"; diff --git a/apps/backend/src/routes/admin/platform-config/ninetyone.ts b/apps/backend/src/routes/admin/platform-config/ninetyone.ts index 4e84f2b7..d36db6ab 100644 --- a/apps/backend/src/routes/admin/platform-config/ninetyone.ts +++ b/apps/backend/src/routes/admin/platform-config/ninetyone.ts @@ -5,7 +5,7 @@ import { getAdminNinetyoneOrders, retryAdminNinetyoneOrder, } from "../../../services/admin/platform-config/ninetyone-service.js"; -import type { AdminEntityRouteParams } from "../../../types/admin-route-inputs.js"; +import type { AdminEntityRouteParams } from "../../../types/admin/route-inputs.js"; import { createJsonHandler } from "../session.js"; import type { JsonRecord } from "../../../types/json.js"; diff --git a/apps/backend/src/routes/admin/platform-config/notifications.ts b/apps/backend/src/routes/admin/platform-config/notifications.ts index 56bb44d4..07f20686 100644 --- a/apps/backend/src/routes/admin/platform-config/notifications.ts +++ b/apps/backend/src/routes/admin/platform-config/notifications.ts @@ -13,7 +13,7 @@ import type { AdminNotificationConfigRouteBody, AdminNotificationTestRouteBody, AdminScheduledJobsConfigRouteBody, -} from "../../../types/admin-route-inputs.js"; +} from "../../../types/admin/route-inputs.js"; import { createJsonHandler } from "../session.js"; import type { JsonRecord } from "../../../types/json.js"; diff --git a/apps/backend/src/routes/admin/tasks.ts b/apps/backend/src/routes/admin/tasks.ts index 728df2c4..b8d3ebe2 100644 --- a/apps/backend/src/routes/admin/tasks.ts +++ b/apps/backend/src/routes/admin/tasks.ts @@ -19,8 +19,8 @@ import type { AdminTaskKuaishouCloudDispatchRouteBody, AdminTaskRouteParams, AdminTaskRouteQuery, -} from "../../types/admin-route-inputs.js"; -import type { AdminTaskActionResponse } from "../../types/admin-write-models.js"; +} from "../../types/admin/route-inputs.js"; +import type { AdminTaskActionResponse } from "../../types/admin/write-models.js"; const router = Router(); diff --git a/apps/backend/src/services/admin/admin-order-read-helpers.ts b/apps/backend/src/services/admin/admin-order-read-helpers.ts index f1ea3eea..0a1b7f1a 100644 --- a/apps/backend/src/services/admin/admin-order-read-helpers.ts +++ b/apps/backend/src/services/admin/admin-order-read-helpers.ts @@ -4,8 +4,8 @@ import { formatFenToAmount, normalizeFen } from '../../utils/money.js' import { resolveDisplayShopName, resolveOrderItemTitle } from './admin-read-shared-helpers.js' import { buildOrderBindingSummary } from './admin-task-read-helpers.js' -import type { AdminOrderListItem } from '../../types/admin-read-models.js' -import type { OrderItemRow, OrderListRow } from '../../types/repository-rows.js' +import type { AdminOrderListItem } from '../../types/admin/read-models.js' +import type { OrderItemRow, OrderListRow } from '../../types/repository/rows.js' export async function mapAdminOrderListItem(item: OrderListRow): Promise { const [tasks, orderItems] = await Promise.all([ diff --git a/apps/backend/src/services/admin/admin-read-service.ts b/apps/backend/src/services/admin/admin-read-service.ts index da7b4138..57db7e79 100644 --- a/apps/backend/src/services/admin/admin-read-service.ts +++ b/apps/backend/src/services/admin/admin-read-service.ts @@ -35,13 +35,13 @@ import { import type { AdminOrderListResponse, AdminTaskListResponse, -} from '../../types/admin-read-models.js' +} from '../../types/admin/read-models.js' import type { AdminEntityIdInput, AdminOrderListQueryInput, AdminTaskListQueryInput, AdminViewerSessionInput, -} from '../../types/admin-read-inputs.js' +} from '../../types/admin/read-inputs.js' type JsonRecord = Record diff --git a/apps/backend/src/services/admin/admin-read-shared-helpers.ts b/apps/backend/src/services/admin/admin-read-shared-helpers.ts index 1089fbb5..1307acc2 100644 --- a/apps/backend/src/services/admin/admin-read-shared-helpers.ts +++ b/apps/backend/src/services/admin/admin-read-shared-helpers.ts @@ -5,8 +5,8 @@ import { parseTaskState as parseTaskStateValue, } from '../../utils/task-json.js' -import type { AdminViewerSessionInput } from '../../types/admin-read-inputs.js' -import type { OrderItemRow, TaskRow } from '../../types/repository-rows.js' +import type { AdminViewerSessionInput } from '../../types/admin/read-inputs.js' +import type { OrderItemRow, TaskRow } from '../../types/repository/rows.js' type JsonRecord = Record diff --git a/apps/backend/src/services/admin/admin-task-read-helpers.ts b/apps/backend/src/services/admin/admin-task-read-helpers.ts index 17330a4d..a28f3a3d 100644 --- a/apps/backend/src/services/admin/admin-task-read-helpers.ts +++ b/apps/backend/src/services/admin/admin-task-read-helpers.ts @@ -9,12 +9,12 @@ import { import type { AdminTaskBindingSummary, AdminTaskListItem, -} from '../../types/admin-read-models.js' -import type { AdminTaskActionPayload } from '../../types/admin-write-models.js' +} from '../../types/admin/read-models.js' +import type { AdminTaskActionPayload } from '../../types/admin/write-models.js' import type { TaskEventRow, TaskRow, -} from '../../types/repository-rows.js' +} from '../../types/repository/rows.js' import type { AdminViewerContext } from './admin-read-shared-helpers.js' type JsonRecord = Record diff --git a/apps/backend/src/services/admin/platform-config/context.test.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/context.test.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/context.test.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/context.test.ts diff --git a/apps/backend/src/services/admin/platform-config/context.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/context.ts similarity index 93% rename from apps/backend/src/services/admin/platform-config/context.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/context.ts index 43677f5d..81d6d8fd 100644 --- a/apps/backend/src/services/admin/platform-config/context.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/context.ts @@ -41,8 +41,8 @@ export function resolveKuaishouEticketAdminContext(payload: JsonObject = {}, opt }; } -import { getCloudtentaclesSourceByKey } from "../../platforms/cloudtentacles/source-config-service.js"; -import { getCloudtentaclesSessionStateByKey } from "../../platforms/cloudtentacles/session-state-service.js"; +import { getCloudtentaclesSourceByKey } from "../../../platforms/cloudtentacles/source-config-service.js"; +import { getCloudtentaclesSessionStateByKey } from "../../../platforms/cloudtentacles/session-state-service.js"; export function resolveCloudtentaclesAdminContext(payload: JsonObject = {}, options: JsonObject = {}) { const sourceKey = String( diff --git a/apps/backend/src/services/admin/platform-config/domain.test.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/domain.test.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/domain.test.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/domain.test.ts diff --git a/apps/backend/src/services/admin/platform-config/domain.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/domain.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/domain.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/domain.ts diff --git a/apps/backend/src/services/admin/platform-config/cloudtentacles-service.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/index.ts similarity index 94% rename from apps/backend/src/services/admin/platform-config/cloudtentacles-service.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/index.ts index 6c10aff4..b572b521 100644 --- a/apps/backend/src/services/admin/platform-config/cloudtentacles-service.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/index.ts @@ -5,7 +5,7 @@ import { saveCloudtentaclesSourceByKey, saveCloudtentaclesSourcesList, deleteCloudtentaclesSourceByKey, -} from "../../platforms/cloudtentacles/source-config-service.js"; +} from "../../../platforms/cloudtentacles/source-config-service.js"; import { clearCloudtentaclesSessionStateByKey, deleteCloudtentaclesSessionStateByKey, @@ -14,20 +14,20 @@ import { saveCloudtentaclesSessionStateByKey, getAllCloudtentaclesSessionStates, pruneCloudtentaclesSessionStates, -} from "../../platforms/cloudtentacles/session-state-service.js"; +} from "../../../platforms/cloudtentacles/session-state-service.js"; import { loginCloudtentaclesSession, sendCloudtentaclesSmsCode, validateCloudtentaclesSession, -} from "../../platforms/cloudtentacles/session-service.js"; +} from "../../../platforms/cloudtentacles/session-service.js"; import { buyCloudtentaclesSku, getCloudtentaclesAsset, getCloudtentaclesCategories, listCloudtentaclesSku, useCloudtentaclesSku, -} from "../../platforms/cloudtentacles/catalog-service.js"; -import { getCloudtentaclesKnapsack } from "../../platforms/cloudtentacles/knapsack-service.js"; +} from "../../../platforms/cloudtentacles/catalog-service.js"; +import { getCloudtentaclesKnapsack } from "../../../platforms/cloudtentacles/knapsack-service.js"; import { appointCloudtentaclesVirtualNumber, backCloudtentaclesVirtualNumber, @@ -36,8 +36,8 @@ import { getCloudtentaclesBindUrl, listCloudtentaclesVirtualNumbers, verifyCloudtentaclesLoginCode, -} from "../../platforms/cloudtentacles/virtual-number-service.js"; -import { runCloudtentaclesFullDebugFlow } from "../../platforms/cloudtentacles/debug-flow-service.js"; +} from "../../../platforms/cloudtentacles/virtual-number-service.js"; +import { runCloudtentaclesFullDebugFlow } from "../../../platforms/cloudtentacles/debug-flow-service.js"; import { hasCloudtentaclesCredentialContextChanged, pickFirstNonEmpty, @@ -48,8 +48,8 @@ import { buildAdminCloudtentaclesValidateResult, resolveAdminCloudtentaclesCredentialPayload, resolveAdminCloudtentaclesSessionPayload, -} from "./cloudtentacles.js"; -import { normalizeAdminCloudtentaclesSourceConfigPayload } from "./cloudtentacles-writes.js"; +} from "./payloads.js"; +import { normalizeAdminCloudtentaclesSourceConfigPayload } from "./writes.js"; import { mapAdminCloudtentaclesSession, mapAdminCloudtentaclesSourceConfig, @@ -66,7 +66,7 @@ import type { AdminCloudtentaclesTestLoginInput, AdminCloudtentaclesValidateSessionInput, AdminCloudtentaclesVirtualNumberInput, -} from "../../../types/admin-write-inputs.js"; +} from "../../../../types/admin/write-inputs.js"; type JsonObject = Record; diff --git a/apps/backend/src/services/admin/platform-config/mappers.test.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/mappers.test.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/mappers.test.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/mappers.test.ts diff --git a/apps/backend/src/services/admin/platform-config/mappers.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/mappers.ts similarity index 99% rename from apps/backend/src/services/admin/platform-config/mappers.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/mappers.ts index 4c8cb1ba..587d5430 100644 --- a/apps/backend/src/services/admin/platform-config/mappers.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/mappers.ts @@ -1,7 +1,7 @@ import { maskPhone as maskPhoneValue, maskSecret as maskSecretValue, -} from "../../../utils/masking.js"; +} from "../../../../utils/masking.js"; type JsonObject = Record diff --git a/apps/backend/src/services/admin/platform-config/observed-products.test.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/observed-products.test.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/observed-products.test.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/observed-products.test.ts diff --git a/apps/backend/src/services/admin/platform-config/observed-products.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/observed-products.ts similarity index 97% rename from apps/backend/src/services/admin/platform-config/observed-products.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/observed-products.ts index 295dcdc2..37980aec 100644 --- a/apps/backend/src/services/admin/platform-config/observed-products.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/observed-products.ts @@ -1,4 +1,4 @@ -import { query } from '../../../db/client.js' +import { query } from '../../../../db/client.js' import { mapAdminObservedProductItem } from './domain.js' type JsonObject = Record diff --git a/apps/backend/src/services/admin/platform-config/cloudtentacles.test.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.test.ts similarity index 99% rename from apps/backend/src/services/admin/platform-config/cloudtentacles.test.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.test.ts index 7c3a8cf7..a7612bda 100644 --- a/apps/backend/src/services/admin/platform-config/cloudtentacles.test.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.test.ts @@ -8,7 +8,7 @@ import { buildAdminCloudtentaclesValidateResult, resolveAdminCloudtentaclesCredentialPayload, resolveAdminCloudtentaclesSessionPayload, -} from './cloudtentacles.js' +} from './payloads.js' test('resolveAdminCloudtentaclesCredentialPayload merges payload and saved source defaults', () => { assert.deepEqual( diff --git a/apps/backend/src/services/admin/platform-config/cloudtentacles.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.ts similarity index 94% rename from apps/backend/src/services/admin/platform-config/cloudtentacles.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.ts index d61d7aa4..6b1e7eb9 100644 --- a/apps/backend/src/services/admin/platform-config/cloudtentacles.ts +++ b/apps/backend/src/services/admin/platform-config/cloudtentacles/payloads.ts @@ -1,5 +1,5 @@ -import { getCloudtentaclesSourceByKey } from "../../platforms/cloudtentacles/source-config-service.js"; -import { getCloudtentaclesSessionStateByKey } from "../../platforms/cloudtentacles/session-state-service.js"; +import { getCloudtentaclesSourceByKey } from "../../../platforms/cloudtentacles/source-config-service.js"; +import { getCloudtentaclesSessionStateByKey } from "../../../platforms/cloudtentacles/session-state-service.js"; import { pickFirstNonEmpty, resolveCloudtentaclesAdminContext, diff --git a/apps/backend/src/services/admin/platform-config/cloudtentacles-writes.ts b/apps/backend/src/services/admin/platform-config/cloudtentacles/writes.ts similarity index 100% rename from apps/backend/src/services/admin/platform-config/cloudtentacles-writes.ts rename to apps/backend/src/services/admin/platform-config/cloudtentacles/writes.ts diff --git a/apps/backend/src/services/admin/platform-config/kuaishou-cloud-fulfillment-service.ts b/apps/backend/src/services/admin/platform-config/kuaishou-cloud-fulfillment-service.ts index 4bdff610..cccf5c48 100644 --- a/apps/backend/src/services/admin/platform-config/kuaishou-cloud-fulfillment-service.ts +++ b/apps/backend/src/services/admin/platform-config/kuaishou-cloud-fulfillment-service.ts @@ -4,7 +4,7 @@ import { saveKuaishouCloudFulfillmentConfig, } from '../../order/kuaishou-cloud-fulfillment-config-service.js' import { syncConfiguredFulfillmentBindings } from '../../bootstrap/fulfillment-bootstrap-service.js' -import { mapAdminKuaishouCloudFulfillmentSource } from './mappers.js' +import { mapAdminKuaishouCloudFulfillmentSource } from './cloudtentacles/mappers.js' type JsonObject = Record diff --git a/apps/backend/src/services/admin/platform-config/kuaishou-eticket-service.ts b/apps/backend/src/services/admin/platform-config/kuaishou-eticket-service.ts index 924c5d0a..bbc209d8 100644 --- a/apps/backend/src/services/admin/platform-config/kuaishou-eticket-service.ts +++ b/apps/backend/src/services/admin/platform-config/kuaishou-eticket-service.ts @@ -11,8 +11,8 @@ import { saveKuaishouEticketSourceConfig, } from '../../platforms/kuaishou-eticket/source-config-service.js' import { queryKuaishouEticketStableInfo } from '../../platforms/kuaishou-eticket/info-service.js' -import { resolveKuaishouEticketAdminContext } from './context.js' -import { mapAdminKuaishouEticketSourceConfig } from './mappers.js' +import { resolveKuaishouEticketAdminContext } from './cloudtentacles/context.js' +import { mapAdminKuaishouEticketSourceConfig } from './cloudtentacles/mappers.js' type JsonObject = Record diff --git a/apps/backend/src/services/admin/platform-config/notification-service.ts b/apps/backend/src/services/admin/platform-config/notification-service.ts index 1b419136..04937424 100644 --- a/apps/backend/src/services/admin/platform-config/notification-service.ts +++ b/apps/backend/src/services/admin/platform-config/notification-service.ts @@ -16,13 +16,13 @@ import { reloadScheduledJobs, runScheduledJobNow, } from '../../scheduler/scheduler-service.js' -import { maskPhone, maskSecret } from './mappers.js' +import { maskPhone, maskSecret } from './cloudtentacles/mappers.js' import type { AdminNotificationConfigInput, AdminNotificationTestInput, AdminScheduledJobsConfigInput, -} from '../../../types/admin-write-inputs.js' +} from '../../../types/admin/write-inputs.js' type JsonObject = Record diff --git a/apps/backend/src/services/admin/write-helpers.ts b/apps/backend/src/services/admin/write-helpers.ts index 5f4a3a3c..ab9370df 100644 --- a/apps/backend/src/services/admin/write-helpers.ts +++ b/apps/backend/src/services/admin/write-helpers.ts @@ -4,7 +4,7 @@ import { maskPhone as maskPhoneValue, } from '../../utils/masking.js' -import type { TaskRow } from '../../types/repository-rows.js' +import type { TaskRow } from '../../types/repository/rows.js' type TaskClaimLink = { token: string diff --git a/apps/backend/src/services/admin/write/kuaishou-cloud-actions.ts b/apps/backend/src/services/admin/write/kuaishou-cloud-actions.ts index 443ed55a..50047e51 100644 --- a/apps/backend/src/services/admin/write/kuaishou-cloud-actions.ts +++ b/apps/backend/src/services/admin/write/kuaishou-cloud-actions.ts @@ -47,9 +47,9 @@ import { import type { AdminEntityIdInput, AdminViewerSessionInput, -} from '../../../types/admin-read-inputs.js' -import type { AdminTaskKuaishouCloudDispatchInput } from '../../../types/admin-write-inputs.js' -import type { AdminTaskActionResponse } from '../../../types/admin-write-models.js' +} from '../../../types/admin/read-inputs.js' +import type { AdminTaskKuaishouCloudDispatchInput } from '../../../types/admin/write-inputs.js' +import type { AdminTaskActionResponse } from '../../../types/admin/write-models.js' export async function prepareAdminTaskKuaishouCloudFulfillment( taskId: AdminEntityIdInput, diff --git a/apps/backend/src/services/claim/kuaishou-cloud-claim-context.ts b/apps/backend/src/services/claim/kuaishou-cloud-claim-context.ts index 3cc19e9e..cde8804f 100644 --- a/apps/backend/src/services/claim/kuaishou-cloud-claim-context.ts +++ b/apps/backend/src/services/claim/kuaishou-cloud-claim-context.ts @@ -7,7 +7,7 @@ import { formatFenToAmount, normalizeFen } from '../../utils/money.js' import { parseTaskContext as parseTaskContextValue } from '../../utils/task-json.js' import { nowIso } from '../../utils/time.js' import { buildClaimUrl } from './claim-service.js' -import type { ClaimTokenRow, OrderItemRow, OrderRow, TaskRow } from '../../types/repository-rows.js' +import type { ClaimTokenRow, OrderItemRow, OrderRow, TaskRow } from '../../types/repository/rows.js' export const CLAIM_TERMINAL_STATUSES = new Set(['expired', 'closed']) export const KUAISHOU_CLOUD_CLAIM_GUIDE_BASE_PATH = '/kuaishou-cloud-guide' diff --git a/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts b/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts index 8b112514..067bd67d 100644 --- a/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts +++ b/apps/backend/src/services/claim/kuaishou-cloud-claim-service.ts @@ -20,7 +20,7 @@ import { } from '../fulfillment/kuaishou-cloud/index.js' import { buildClaimDetailPayload, getClaimContext } from './kuaishou-cloud-claim-context.js' import { syncKuaishouCloudRoleInfo } from './kuaishou-cloud-sync-service.js' -import type { TaskRow } from '../../types/repository-rows.js' +import type { TaskRow } from '../../types/repository/rows.js' const KUAISHOU_CLOUD_GUIDE_DIR = path.resolve(PROJECT_ROOT, '../../tems/imgs') const ALLOWED_GUIDE_FILES = new Set(['1.png', '2.png', '3.png']) diff --git a/apps/backend/src/services/claim/kuaishou-cloud-sync-service.ts b/apps/backend/src/services/claim/kuaishou-cloud-sync-service.ts index c055c1b6..292f5bb8 100644 --- a/apps/backend/src/services/claim/kuaishou-cloud-sync-service.ts +++ b/apps/backend/src/services/claim/kuaishou-cloud-sync-service.ts @@ -4,7 +4,7 @@ import { probeKuaishouCloudTaskBindUrl, refreshKuaishouCloudTaskRoleInfo, } from '../fulfillment/kuaishou-cloud/index.js' -import type { TaskRow } from '../../types/repository-rows.js' +import type { TaskRow } from '../../types/repository/rows.js' export async function syncKuaishouCloudRoleInfo(task: TaskRow) { const flow = normalizeKuaishouCloudFlow(parseTaskContext(task).kuaishouCloudFulfillment) diff --git a/apps/backend/src/services/fulfillment/kuaishou-cloud/index.ts b/apps/backend/src/services/fulfillment/kuaishou-cloud/index.ts index 86b8e9cf..b35a8ae4 100644 --- a/apps/backend/src/services/fulfillment/kuaishou-cloud/index.ts +++ b/apps/backend/src/services/fulfillment/kuaishou-cloud/index.ts @@ -43,7 +43,7 @@ import { normalizeActor, parseTaskContext, } from "./task-context.js"; -import type { TaskRow } from "../../../types/repository-rows.js"; +import type { TaskRow } from "../../../types/repository/rows.js"; export { isKuaishouCloudBindUrlFresh, diff --git a/apps/backend/src/services/fulfillment/kuaishou-cloud/task-context.ts b/apps/backend/src/services/fulfillment/kuaishou-cloud/task-context.ts index 6b259ee2..bd091073 100644 --- a/apps/backend/src/services/fulfillment/kuaishou-cloud/task-context.ts +++ b/apps/backend/src/services/fulfillment/kuaishou-cloud/task-context.ts @@ -1,5 +1,5 @@ import { parseTaskContext as parseTaskContextValue } from "../../../utils/task-json.js"; -import type { TaskRow } from "../../../types/repository-rows.js"; +import type { TaskRow } from "../../../types/repository/rows.js"; type JsonObject = Record; diff --git a/apps/backend/src/services/fulfillment/kuaishou-cloud/task-finalization.ts b/apps/backend/src/services/fulfillment/kuaishou-cloud/task-finalization.ts index 2b75c8ba..f069c1b5 100644 --- a/apps/backend/src/services/fulfillment/kuaishou-cloud/task-finalization.ts +++ b/apps/backend/src/services/fulfillment/kuaishou-cloud/task-finalization.ts @@ -20,7 +20,7 @@ import { } from "./domain.js"; import { resolvePersistedCloudtentaclesContextWithFallback } from "./cloudtentacles-context.js"; import { normalizeActor, parseTaskContext } from "./task-context.js"; -import type { TaskRow } from "../../../types/repository-rows.js"; +import type { TaskRow } from "../../../types/repository/rows.js"; export async function dispatchKuaishouCloudFulfillmentTask( task: TaskRow, diff --git a/apps/backend/src/services/open-91/order-query-service.ts b/apps/backend/src/services/open-91/order-query-service.ts index 034862af..b8ad2550 100644 --- a/apps/backend/src/services/open-91/order-query-service.ts +++ b/apps/backend/src/services/open-91/order-query-service.ts @@ -26,7 +26,7 @@ import { buildOpen91SuccessResponse, resolveOpen91QueryState, } from './response.js' -import type { OrderRow } from '../../types/repository-rows.js' +import type { OrderRow } from '../../types/repository/rows.js' type JsonObject = Record diff --git a/apps/backend/src/services/order/delivery-task-service.ts b/apps/backend/src/services/order/delivery-task-service.ts index 9dc10cb3..7a8953b9 100644 --- a/apps/backend/src/services/order/delivery-task-service.ts +++ b/apps/backend/src/services/order/delivery-task-service.ts @@ -6,7 +6,7 @@ import { createTaskClaimToken } from '../claim/claim-service.js' import { notifyTaskAutoManualReview } from '../notification/domain-notifications.js' import { nowIso } from '../../utils/time.js' import { randomId } from '../../utils/random.js' -import type { OrderItemRow, OrderRow, TaskRow } from '../../types/repository-rows.js' +import type { OrderItemRow, OrderRow, TaskRow } from '../../types/repository/rows.js' type JsonObject = Record diff --git a/apps/backend/src/services/order/order-service.ts b/apps/backend/src/services/order/order-service.ts index b6102fa8..da7a1940 100644 --- a/apps/backend/src/services/order/order-service.ts +++ b/apps/backend/src/services/order/order-service.ts @@ -9,7 +9,7 @@ import { syncDeliveryTasksForOrder } from './delivery-task-service.js' import { resolveOrderItemForFulfillment } from './product-match-service.js' import { nowIso } from '../../utils/time.js' import { logIntegration } from '../../utils/logger.js' -import type { OrderItemRow, OrderRow, TaskRow } from '../../types/repository-rows.js' +import type { OrderItemRow, OrderRow, TaskRow } from '../../types/repository/rows.js' type SourceOrderItem = { quantity?: number diff --git a/apps/backend/src/services/platforms/ninetyone/order-service.ts b/apps/backend/src/services/platforms/ninetyone/order-service.ts index c03c0107..3bed443c 100644 --- a/apps/backend/src/services/platforms/ninetyone/order-service.ts +++ b/apps/backend/src/services/platforms/ninetyone/order-service.ts @@ -11,7 +11,7 @@ import { normalizeOpen91CreatePayload } from '../../open-91/payload.js' import { buildOpen91OutTradeNo } from '../../open-91/response.js' import { createHttpError } from '../../../utils/http.js' import { nowIso } from '../../../utils/time.js' -import type { OrderItemRow, OrderRow } from '../../../types/repository-rows.js' +import type { OrderItemRow, OrderRow } from '../../../types/repository/rows.js' export const OPEN_91_PENDING_CONFIG_STATUS = 'pending_config' export const OPEN_91_MANUAL_FAILED_STATUS = 'manual_failed' diff --git a/apps/backend/src/types/admin-read-inputs.ts b/apps/backend/src/types/admin/read-inputs.ts similarity index 100% rename from apps/backend/src/types/admin-read-inputs.ts rename to apps/backend/src/types/admin/read-inputs.ts diff --git a/apps/backend/src/types/admin-read-models.ts b/apps/backend/src/types/admin/read-models.ts similarity index 100% rename from apps/backend/src/types/admin-read-models.ts rename to apps/backend/src/types/admin/read-models.ts diff --git a/apps/backend/src/types/admin-route-inputs.ts b/apps/backend/src/types/admin/route-inputs.ts similarity index 97% rename from apps/backend/src/types/admin-route-inputs.ts rename to apps/backend/src/types/admin/route-inputs.ts index fb4f1cfe..b256714d 100644 --- a/apps/backend/src/types/admin-route-inputs.ts +++ b/apps/backend/src/types/admin/route-inputs.ts @@ -2,7 +2,7 @@ import type { AdminOrderListQueryInput, AdminTaskListQueryInput, AdminViewerSessionInput, -} from './admin-read-inputs.js' +} from './read-inputs.js' import type { AdminCloudtentaclesCatalogQueryInput, AdminCloudtentaclesFullFlowInput, @@ -23,7 +23,7 @@ import type { AdminScheduledJobsConfigInput, AdminTaskKuaishouCloudDispatchInput, AdminTaskManualDispatchInput, -} from './admin-write-inputs.js' +} from './write-inputs.js' export type AdminOrderRouteQuery = AdminOrderListQueryInput export type AdminTaskRouteQuery = AdminTaskListQueryInput diff --git a/apps/backend/src/types/admin-write-inputs.ts b/apps/backend/src/types/admin/write-inputs.ts similarity index 100% rename from apps/backend/src/types/admin-write-inputs.ts rename to apps/backend/src/types/admin/write-inputs.ts diff --git a/apps/backend/src/types/admin-write-models.ts b/apps/backend/src/types/admin/write-models.ts similarity index 100% rename from apps/backend/src/types/admin-write-models.ts rename to apps/backend/src/types/admin/write-models.ts diff --git a/apps/backend/src/types/repository-inputs.ts b/apps/backend/src/types/repository/inputs.ts similarity index 100% rename from apps/backend/src/types/repository-inputs.ts rename to apps/backend/src/types/repository/inputs.ts diff --git a/apps/backend/src/types/repository-rows.ts b/apps/backend/src/types/repository/rows.ts similarity index 100% rename from apps/backend/src/types/repository-rows.ts rename to apps/backend/src/types/repository/rows.ts