Merge branch 'develop' into dev

src/app.ts

@@ -66,9 +66,7 @@ async function main() {
     }
   });
 
-  // const cronTime_Oct = "0 0 1 10 *";
+  const cronTime_Oct = "0 0 1 10 *";
-  // Test #1912
-  const cronTime_Oct = "0 0 4 11 *";
   cron.schedule(cronTime_Oct, async () => {
     try {
       const commandController = new CommandController();

src/controllers/PositionController.ts

@@ -3704,7 +3704,9 @@ export class PositionController extends Controller {
       dataMaster.current_holderId = _null;
     }
     await this.posMasterRepository.save(dataMaster, { data: request });
-    await CreatePosMasterHistoryOfficer(dataMaster.id, request);
+    if (chkRevision?.orgRevisionIsCurrent) {
+      await CreatePosMasterHistoryOfficer(dataMaster.id, request);
+    }
     setLogDataDiff(request, { before, after: dataMaster });
 
     return new HttpSuccess();

src/entities/ApiHistory.ts

@@ -6,17 +6,17 @@ import { ApiName } from "./ApiName";
 @Entity("apiHistory")
 export class ApiHistory extends EntityBase {
   @Column({
+    type: 'longtext',
     nullable: true,
     comment: "header",
-    length: 255,
     default: null, 
   })
   headerApi: string;
 
   @Column({
+    type: 'longtext',
     nullable: true,
     comment: "token",
-    length: 255,
     default: null,
   })
   tokenApi: string;

src/migration/1762243747843-update_size_headerApi_and_tokenApi_field_ApiHistoryTable.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateSizeHeaderApiAndTokenApiFieldApiHistoryTable1762243747843 implements MigrationInterface {
+    name = 'UpdateSizeHeaderApiAndTokenApiFieldApiHistoryTable1762243747843'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`headerApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`headerApi\` longtext NULL COMMENT 'header'`);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`tokenApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`tokenApi\` longtext NULL COMMENT 'token'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`tokenApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`tokenApi\` varchar(255) NULL COMMENT 'token'`);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` DROP COLUMN \`headerApi\``);
+        await queryRunner.query(`ALTER TABLE \`apiHistory\` ADD \`headerApi\` varchar(255) NULL COMMENT 'header'`);
+    }
+
+}