[fix] many GitHub copilot bugs

[optimize] update Upstream packages

Author: TechQuery

package.json

@@ -9,11 +9,11 @@
   "dependencies": {
     "@arshiash80/strapi-plugin-iconhub": "^1.1.1",
     "@ckeditor/strapi-plugin-ckeditor": "^1.1.1",
-    "@strapi/plugin-cloud": "~5.23.5",
-    "@strapi/plugin-color-picker": "~5.23.5",
-    "@strapi/plugin-documentation": "~5.23.5",
-    "@strapi/plugin-users-permissions": "~5.23.5",
-    "@strapi/strapi": "~5.23.5",
+    "@strapi/plugin-cloud": "~5.23.6",
+    "@strapi/plugin-color-picker": "~5.23.6",
+    "@strapi/plugin-documentation": "~5.23.6",
+    "@strapi/plugin-users-permissions": "~5.23.6",
+    "@strapi/strapi": "~5.23.6",
     "better-sqlite3": "^12.2.0",
     "cross-env": "^10.0.0",
     "mobx-restful-migrator": "^0.1.0",
@@ -34,14 +34,15 @@
     "husky": "^9.1.7",
     "koajax": "^3.1.2",
     "lint-staged": "^16.1.6",
+    "mobx-restful": "^2.1.3",
     "mobx-strapi": "^0.8.1",
     "prettier": "^3.6.2",
-    "swagger-typescript-api": "^13.2.11",
+    "swagger-typescript-api": "^13.2.13",
     "tsx": "^4.20.5",
     "typescript": "~5.9.2",
     "web-utility": "^4.6.1",
     "xlsx": "^0.18.5",
-    "zx": "^8.8.1"
+    "zx": "^8.8.2"
   },
   "pnpm": {
     "onlyBuiltDependencies": [

pnpm-lock.yaml

@@ -5,14 +5,13 @@
  * Support import NGO organization data from Excel file to Strapi database
  */
 
-import * as fs from 'node:fs';
 import { RestMigrator } from 'mobx-restful-migrator';
 
+import { migrationMapping } from './transformers/data-transformer';
+import { Config } from './types';
 import { ExcelReader } from './utils/excel-reader';
-import { Config, SourceOrganization } from './types';
-import { TargetOrganizationModel } from './utils/strapi-api';
-import { migrationMapping } from './migration/organization-mapping';
 import { ImportLogger } from './utils/import-logger';
+import { TargetOrganizationModel } from './utils/strapi-api';
 
 // Configuration
 const CONFIG: Config = {
@@ -27,27 +26,11 @@ const CONFIG: Config = {
 };
 
 // Data source generator function
-async function* loadOrganizationData(): AsyncGenerator<SourceOrganization> {
+async function* loadOrganizationData() {
   console.log(`正在读取 Excel 文件: ${CONFIG.EXCEL_FILE}`);
 
-  if (!fs.existsSync(CONFIG.EXCEL_FILE)) {
-    throw new Error(`Excel 文件不存在: ${CONFIG.EXCEL_FILE}`);
-  }
-
   // Use existing Excel reader
-  const rawOrganizations = ExcelReader.readExcelFile(
-    CONFIG.EXCEL_FILE,
-    CONFIG.SHEET_NAME,
-  );
-
-  if (CONFIG.MAX_ROWS > 0) {
-    rawOrganizations.splice(CONFIG.MAX_ROWS);
-  }
-
-  console.log(`从 Excel 读取到 ${rawOrganizations.length} 条记录`);
-
-  // Yield each organization from existing reader
-  yield* rawOrganizations;
+  yield* ExcelReader.readExcelFile(CONFIG.EXCEL_FILE, CONFIG.SHEET_NAME);
 }
 
 // Main function
@@ -100,22 +83,17 @@ async function main(): Promise<void> {
 
     // Print final statistics
     logger.printStats();
-    
+
     console.log('\n导入完成！');
 
     // Save logs to files
     await logger.saveToFiles();
-
   } catch (error: any) {
     console.error('导入失败:', error.message);
-    if (error.stack) {
-      console.error('错误堆栈:', error.stack);
-    }
-    
-    if (logger) {
-      await logger.saveToFiles();
-    }
-    
+    console.error('错误堆栈:', error.stack);
+
+    await logger?.saveToFiles();
+
     process.exit(1);
   }
 }
@@ -169,8 +147,5 @@ Strapi 数据导入工具
   }
 }
 
-// Entry point
-if (require.main === module) {
-  parseArgs();
-  main();
-}
+parseArgs();
+main();

scripts/import-data.ts

@@ -1,49 +1,74 @@
-import { OrganizationData, Organization } from '../types';
+import { MigrationSchema, TargetPatch } from 'mobx-restful-migrator';
+
+import { SourceOrganization, TargetOrganization } from '../types';
 import { AddressTransformer } from './address-transformer';
 import { DateTransformer } from './date-transformer';
 import { ServiceTransformer } from './service-transformer';
 import { QualificationTransformer } from './qualification-transformer';
+import { UserTransformer } from './user-transformer';
 import { DataUtils } from '../utils/data-utils';
+import { TargetUserModel } from '../utils/strapi-api';
 
-export class DataTransformer {
-  static transformOrganization = (
-    organization: Organization,
-  ): OrganizationData => ({
-    name: organization['常用名称'] || organization.name || '',
-    code: organization['机构信用代码'] || organization.code || '',
-    entityType: DataUtils.transformEntityType(
-      organization['实体类型'] || organization.entityType,
-    ),
-    registrationCountry: DataUtils.transformRegistrationCountry(
-      organization['注册国籍'] || organization.registrationCountry,
-    ),
-    establishedDate: DateTransformer.parseDate(
-      organization['成立时间'] || organization.establishedDate,
-    ),
-    coverageArea: ServiceTransformer.extractCoverageFromDescription(
-      organization['机构／项目简介'] || organization.description,
-    ),
-    description: DataUtils.cleanDescription(
-      organization['机构／项目简介'] || organization.description || '',
-    ),
-    staffCount: DataUtils.parseStaffCount(
-      organization['机构／项目全职人数'] || organization.staffCount,
-    ),
-    address: AddressTransformer.transformAddress({
+export const migrationMapping: MigrationSchema<
+  SourceOrganization,
+  TargetOrganization
+> = {
+  常用名称: ({ 常用名称: value }) => ({ name: { value, unique: true } }),
+  机构信用代码: 'code',
+  实体类型: ({ 实体类型: value }) => ({
+    entityType: { value: DataUtils.transformEntityType(value) },
+  }),
+  注册国籍: ({ 注册国籍: value }) => ({
+    registrationCountry: {
+      value: DataUtils.transformRegistrationCountry(value),
+    },
+  }),
+  成立时间: ({ 成立时间: value }) => ({
+    establishedDate: { value: DateTransformer.parseDate(value) },
+  }),
+  '机构／项目简介': ({ ['机构／项目简介']: value }) => {
+    value ||= '';
+    return {
+      description: { value: DataUtils.cleanDescription(value) },
+      coverageArea: {
+        value: ServiceTransformer.extractCoverageFromDescription(value),
+      },
+    };
+  },
+  '机构／项目全职人数': ({ ['机构／项目全职人数']: value }) => ({
+    staffCount: { value: DataUtils.parseStaffCount(value) },
+  }),
+  注册地: ({ 注册地, 具体地址 }) => {
+    const addressData = {
       province: AddressTransformer.extractProvinceFromAddress(
-        organization['注册地'] || organization['具体地址'],
-      ),
-      city: AddressTransformer.extractCityFromAddress(
-        organization['注册地'] || organization['具体地址'],
+        注册地 || 具体地址,
       ),
+      city: AddressTransformer.extractCityFromAddress(注册地 || 具体地址),
       district: AddressTransformer.extractDistrictFromAddress(
-        organization['注册地'] || organization['具体地址'],
+        注册地 || 具体地址,
       ),
-      street: organization['具体地址'] || organization.address?.street || '',
-    }),
-    services: ServiceTransformer.transformServices(organization),
-    internetContact: ServiceTransformer.transformContacts(organization),
-    qualifications:
-      QualificationTransformer.transformQualifications(organization),
-  });
-}
+      street: 具体地址 || '',
+    };
+    return {
+      address: { value: AddressTransformer.transformAddress(addressData) },
+    };
+  },
+  机构官网: (row) => ({
+    services: { value: ServiceTransformer.transformServices(row) },
+  }),
+  机构微信公众号: (row) => ({
+    internetContact: { value: ServiceTransformer.transformContacts(row) },
+  }),
+  登记管理机关: (org) => ({
+    qualifications: {
+      value: QualificationTransformer.transformQualifications(org),
+    },
+  }),
+  机构联系人联系人姓名: (org) => {
+    const value = UserTransformer.transformUser(org);
+
+    return (
+      !value ? {} : { contactUser: { value, model: TargetUserModel } }
+    ) as TargetPatch<TargetOrganization>;
+  },
+};

scripts/migration/organization-mapping.ts

@@ -1,9 +1,9 @@
-import { Qualification, Organization } from '../types';
+import { Qualification, SourceOrganization } from '../types';
 import { QUALIFICATION_INDICATORS, QUALIFICATION_TYPES } from '../constants';
 
 export class QualificationTransformer {
   static transformQualifications = (
-    organization: Organization,
+    organization: SourceOrganization,
   ): Qualification[] => {
     // Transform qualification indicators using map
     const qualifications = QUALIFICATION_INDICATORS.filter(

scripts/transformers/data-transformer.ts

@@ -1,4 +1,4 @@
-import { Service, InternetContact, Organization } from '../types';
+import { Service, InternetContact, SourceOrganization } from '../types';
 import {
   SERVICE_CATEGORY_MAPPING,
   EDUCATION_FIELDS,
@@ -8,7 +8,7 @@ import {
 } from '../constants';
 
 export class ServiceTransformer {
-  static transformServices = (organization: Organization): Service[] => {
+  static transformServices = (organization: SourceOrganization): Service[] => {
     const services: Service[] = [];
 
     // extract service information from various education related fields
@@ -61,17 +61,16 @@ export class ServiceTransformer {
     return services;
   };
 
-  static extractTargetGroups = (organization: Organization) =>
+  static extractTargetGroups = (organization: SourceOrganization) =>
     TARGET_GROUP_FIELDS.map((field) => organization[field])
       .filter(Boolean)
       .join('; ');
 
-  static transformContacts(organization: Organization): InternetContact {
+  static transformContacts(organization: SourceOrganization): InternetContact {
     const contact: InternetContact = {};
 
     // 官网
-    const website =
-      organization['机构官网'] || organization.internetContact?.website || '';
+    const website = organization['机构官网'] || '';
 
     if (website) contact.website = website;