[add] User import logic (#5)

Co-authored-by: TechQuery <shiy2008@gmail.com>

Author: luojiyin1987

.gitignore

@@ -124,6 +124,7 @@ coverage
 ############################
 
 .env
+.env*.local
 license.txt
 exports
 dist

package.json

@@ -7,40 +7,40 @@
     "npm": ">=6.0.0"
   },
   "dependencies": {
-    "@arshiash80/strapi-plugin-iconhub": "^1.0.3",
+    "@arshiash80/strapi-plugin-iconhub": "^1.1.1",
     "@ckeditor/strapi-plugin-ckeditor": "^1.1.1",
-    "@strapi/plugin-cloud": "~5.18.1",
-    "@strapi/plugin-color-picker": "~5.18.1",
-    "@strapi/plugin-documentation": "~5.18.1",
-    "@strapi/plugin-users-permissions": "~5.18.1",
-    "@strapi/strapi": "~5.18.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",
     "better-sqlite3": "^12.2.0",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.0.0",
     "pg": "^8.16.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.30.1",
-    "strapi-location-picker": "^0.0.1",
+    "strapi-location-picker": "^0.0.2",
     "strapi-plugin-config-sync": "^3.1.2",
     "strapi-plugin-multi-select": "^2.1.1",
     "strapi-provider-cloudflare-r2": "^0.3.0",
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
-    "@types/node": "^22.16.5",
-    "@types/react": "^18.3.23",
+    "@types/node": "^22.18.6",
+    "@types/react": "^18.3.24",
     "@types/react-dom": "^18.3.7",
-    "get-git-folder": "^0.1.2",
     "husky": "^9.1.7",
     "koajax": "^3.1.2",
-    "lint-staged": "^16.1.2",
+    "lint-staged": "^16.1.6",
+    "mobx-strapi": "^0.8.1",
     "prettier": "^3.6.2",
-    "swagger-typescript-api": "^13.2.7",
-    "tsx": "^4.20.3",
-    "typescript": "~5.8.3",
-    "web-utility": "^4.5.1",
+    "swagger-typescript-api": "^13.2.11",
+    "tsx": "^4.20.5",
+    "typescript": "~5.9.2",
+    "web-utility": "^4.6.1",
     "xlsx": "^0.18.5",
-    "zx": "^8.7.1"
+    "zx": "^8.8.1"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -59,7 +59,7 @@
     "*.{md,json,yml,js,mjs,ts,tsx}": "prettier --write"
   },
   "scripts": {
-    "install": "get-git-folder https://github.com/Open-Source-Bazaar/key-vault main China-NGO-database  ||  true",
+    "install": "pnpx git-utility download https://github.com/Open-Source-Bazaar/key-vault main China-NGO-database  ||  true",
     "prepare": "(husky || true)  &&  (cp -u .env.example .env || true)",
     "test": "lint-staged",
     "upgrade": "npx @strapi/upgrade latest",

pnpm-lock.yaml

@@ -7,10 +7,14 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { Config, OrganizationData } from './types';
+import { Config, OrganizationData, ExtendedUserData } from './types';
+
+// Create WeakMap to store user data for organizations
+const userWeakMap = new WeakMap<OrganizationData, ExtendedUserData>();
 
 // Import refactored modules
 import { DataTransformer } from './transformers/data-transformer';
+import { UserTransformer } from './transformers/user-transformer';
 import { ExcelReader } from './utils/excel-reader';
 import { StrapiAPI } from './utils/strapi-api';
 import { DataImporter } from './utils/data-importer';
@@ -21,7 +25,8 @@ const CONFIG: Config = {
   STRAPI_TOKEN: process.env.STRAPI_TOKEN || '',
   EXCEL_FILE: process.env.EXCEL_FILE || '教育公益开放式数据库.xlsx',
   SHEET_NAME: process.env.SHEET_NAME || null,
-  BATCH_SIZE: parseInt(process.env.BATCH_SIZE || '10'),
+  BATCH_SIZE: parseInt(process.env.BATCH_SIZE || '10'), // Default batch size
+  BATCH_DELAY: parseInt(process.env.BATCH_DELAY || '0'), // Default no delay
   DRY_RUN: process.env.DRY_RUN === 'true',
   MAX_ROWS: parseInt(process.env.MAX_ROWS || '0'),
 };
@@ -70,12 +75,22 @@ async function main(): Promise<void> {
       );
     }
 
-    // Transform data format
+    // Transform data format with user support
     console.log('转换数据格式...');
     const organizations = limitedData
       .map((row) => {
         try {
-          return DataTransformer.transformOrganization(row);
+          const organization = DataTransformer.transformOrganization(row);
+
+          // Extract user data from the same row
+          const userData = UserTransformer.transformUser(row);
+
+          // Attach user data for later processing using WeakMap
+          if (userData) {
+            userWeakMap.set(organization, userData);
+          }
+
+          return organization;
         } catch (error: any) {
           const orgName = row['常用名称'] || row.name || 'Unknown';
           console.warn(`转换数据失败，跳过行: ${orgName}`, error.message);
@@ -97,7 +112,13 @@ async function main(): Promise<void> {
 
     // Initialize API client and importer
     const api = new StrapiAPI(CONFIG.STRAPI_URL, CONFIG.STRAPI_TOKEN);
-    importer = new DataImporter(api, CONFIG.BATCH_SIZE, CONFIG.DRY_RUN);
+    importer = new DataImporter(
+      api,
+      userWeakMap,
+      CONFIG.BATCH_SIZE,
+      CONFIG.BATCH_DELAY,
+      CONFIG.DRY_RUN,
+    );
 
     // Start import
     await importer.importOrganizations(organizations);
@@ -115,7 +136,9 @@ function parseArgs(): void {
 
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
-Strapi 数据导入工具
+Strapi 数据导入工具 (增强版)
+
+支持同时导入组织信息和联系人用户，并自动建立关联关系。
 
 用法:
   tsx scripts/import-data.ts [选项]
@@ -130,9 +153,17 @@ Strapi 数据导入工具
   EXCEL_FILE        Excel 文件路径 (默认: 教育公益开放式数据库.xlsx)
   SHEET_NAME        工作表名称 (默认: 使用第一个工作表)
   BATCH_SIZE        批次大小 (默认: 10)
+  BATCH_DELAY       批次间延迟秒数 (默认: 0, 表示无延迟)
   MAX_ROWS          最大导入行数 (默认: 0, 表示导入所有行)
   DRY_RUN           模拟模式 (true/false)
 
+功能特性:
+  - 导入组织基本信息
+  - 自动创建联系人用户账户
+  - 建立组织与用户的关联关系
+  - 支持用户名冲突自动处理
+  - 重复检查和错误处理
+
 示例:
   # 正常导入
   STRAPI_TOKEN=your_token tsx import-data.ts
@@ -142,6 +173,12 @@ Strapi 数据导入工具
   
   # 导入指定工作表
   SHEET_NAME="甘肃省" STRAPI_TOKEN=your_token tsx import-data.ts
+  
+  # 仅测试前10行
+  MAX_ROWS=10 DRY_RUN=true tsx import-data.ts
+  
+  # 设置批次间延迟
+  BATCH_DELAY=2 STRAPI_TOKEN=your_token tsx import-data.ts
 `);
     process.exit(0);
   }

scripts/import-data.ts

@@ -45,6 +45,5 @@ export class DataTransformer {
     internetContact: ServiceTransformer.transformContacts(organization),
     qualifications:
       QualificationTransformer.transformQualifications(organization),
-    publishedAt: new Date().toISOString(),
   });
 }

scripts/transformers/data-transformer.ts

@@ -0,0 +1,96 @@
+import { randomBytes } from 'node:crypto';
+
+import { ExtendedUserData, Organization } from '../types';
+
+export class UserTransformer {
+  static transformUser = (
+    organization: Organization,
+  ): ExtendedUserData | null => {
+    // 获取用户信息
+    const contactName = String(
+      organization['机构联系人联系人姓名'] ?? '',
+    ).trim();
+    const contactPhone = String(
+      organization['机构联系人联系人电话'] ?? '',
+    ).trim();
+    const contactEmail = String(organization['机构联系人联系人邮箱'] ?? '')
+      .trim()
+      .toLowerCase()
+      .split(/[^\w-@.]+/)[0];
+    const principalName = String(organization['负责人'] ?? '').trim();
+
+    // 检查是否有联系方式（邮箱或手机）
+    const hasValidEmail = contactEmail.includes('@');
+    const phoneDigits = contactPhone.replace(/\D/g, '');
+    const hasValidPhone = phoneDigits.length > 0;
+
+    // 如果没有任何联系方式，则不创建用户
+    if (!hasValidEmail && !hasValidPhone) {
+      return null;
+    }
+
+    // 生成邮箱：优先使用真实邮箱，如果没有则用手机号生成系统邮箱
+    let email: string;
+    if (hasValidEmail) {
+      email = contactEmail;
+    } else {
+      // 生成不可投递的占位邮箱（仅用于存储联系信息）
+      const local = phoneDigits || `u${Date.now().toString(36).slice(-6)}`;
+      email = `${local}@example.invalid`;
+    }
+
+    // 生成用户名：优先使用联系人姓名，没有则使用负责人，最后使用组织名
+    const organizationName = organization['常用名称'] || organization.name;
+    const baseUsername =
+      contactName || principalName || organizationName || `user_${Date.now()}`;
+
+    // 生成唯一的用户名：基础用户名 + 组织名称（确保唯一性）
+    const orgCleanName = organizationName
+      ? organizationName.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, '')
+      : 'org';
+
+    // 清理用户名，移除特殊字符
+    const cleanBaseUsername = baseUsername.replace(
+      /[^a-zA-Z0-9\u4e00-\u9fa5]/g,
+      '',
+    );
+
+    const safeBase = cleanBaseUsername || 'user';
+    // 生成带序号的用户名格式
+    // 生成唯一用户名（序号从1开始）
+    // 注意：这里只是生成用户名格式，实际唯一性检查在导入脚本中进行
+    let username = ((suffix: string = ''): string =>
+      safeBase === orgCleanName
+        ? `${safeBase}${suffix}`
+        : `${safeBase}_${orgCleanName}${suffix}`)();
+
+    return {
+      username,
+      email,
+      password: randomBytes(18).toString('base64url').slice(0, 24), // 强随机密码
+      confirmed: false, // 不需要确认
+      blocked: true, // 阻止登录
+      provider: 'local',
+      phone: contactPhone.replace(/\D/g, '') || undefined,
+      // 设置默认角色（通常 authenticated 用户角色的 ID 是 1）
+      role: 1,
+    } as ExtendedUserData;
+  };
+
+  static extractPrincipalName = (organization: Organization): string =>
+    String(organization['负责人'] ?? '').trim();
+
+  static extractContactInfo = (
+    organization: Organization,
+  ): {
+    name: string;
+    phone: string;
+    email: string;
+  } => ({
+    name: String(organization['机构联系人联系人姓名'] ?? '').trim(),
+    phone: String(organization['机构联系人联系人电话'] ?? '').trim(),
+    email: String(organization['机构联系人联系人邮箱'] ?? '')
+      .trim()
+      .toLowerCase(),
+  });
+}

scripts/transformers/user-transformer.ts

@@ -2,6 +2,11 @@
  * 类型定义模块
  * 集中管理所有接口和类型定义
  */
+import {
+  Organization as _Organization,
+  UsersPermissionsRole,
+  UsersPermissionsUser,
+} from '../types';
 
 // 配置接口
 export interface Config {
@@ -10,6 +15,7 @@ export interface Config {
   EXCEL_FILE: string;
   SHEET_NAME: string | null;
   BATCH_SIZE: number;
+  BATCH_DELAY: number;
   DRY_RUN: boolean;
   MAX_ROWS: number;
 }
@@ -19,15 +25,29 @@ export {
   ServiceOrganizationServiceComponent as Service,
   ContactInternetContactComponent as InternetContact,
   QualificationCertificateComponent as Qualification,
-  Organization as OrganizationData,
-  UsersPermissionsUser as UserData,
 } from '../types';
 
-// 组织数据接口
-type OrganizationData = import('../types').Organization;
+// 扩展的用户数据接口（包含自定义字段）
+export interface ExtendedUserData extends Omit<UsersPermissionsUser, 'id'> {
+  // 用户创建时不需要ID，但可以包含其他可选字段
+  id?: number;
+  // 自定义字段
+  phone?: string;
+  // 其他可能需要的字段
+  password?: string;
+  // 角色可以是ID或完整对象
+  role?: number | UsersPermissionsRole;
+}
+
+export interface OrganizationData extends Omit<_Organization, 'contactUser'> {
+  // contactUser 可以是用户对象（用于创建）或用户ID（用于引用）
+  contactUser?: number | null;
+}
 
 // Excel行数据接口
-export interface Organization extends Partial<import('../types').Organization> {
+export interface Organization extends Partial<_Organization> {
+  // 添加索引签名以支持动态中文属性名访问
+  [key: string]: any;
   常用名称?: string;
   机构信用代码?: string;
   实体类型?: string;
@@ -41,6 +61,10 @@ export interface Organization extends Partial<import('../types').Organization> {
   机构微信公众号?: string;
   机构微博?: string;
   登记管理机关?: string;
+  负责人?: string;
+  机构联系人联系人姓名?: string;
+  机构联系人联系人电话?: string;
+  机构联系人联系人邮箱?: string;
 }
 
 // 导入统计接口