diff --git a/packages/functions/package.json b/packages/functions/package.json index 8ea0386..351610b 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -12,9 +12,9 @@ "prestart": "npm run build", "start": "func start", "test": "echo \"No tests yet...\"", - "typeorm": "typeorm-ts-node-esm", - "mig:gen": "typeorm-ts-node-esm migration:generate", - "mig:run": "typeorm-ts-node-esm migration:run -d ./src/typeorm/migrationConfig.ts" + "typeorm": "typeorm-ts-node-commonjs", + "mig:gen": "typeorm-ts-node-commonjs migration:generate", + "mig:run": "typeorm-ts-node-commonjs migration:run -d ./src/typeorm/migrationConfig.ts" }, "overrides": { "mssql": "$mssql" @@ -40,4 +40,4 @@ "@types/node": "18.14.2" }, "main": "dist/packages/functions/src/functions/**/*.js" -} +} \ No newline at end of file diff --git a/packages/functions/src/functions/events/import.ts b/packages/functions/src/functions/events/import.ts index 555bed8..3adb6eb 100644 --- a/packages/functions/src/functions/events/import.ts +++ b/packages/functions/src/functions/events/import.ts @@ -74,10 +74,10 @@ export const importEvents = async (myTimer: Timer, context: InvocationContext): const eventCountAfter = await eventRepo.count() const created = eventCountAfter - eventCountBefore if (eventsToSave.length > 0) { - newAlertItem({ ads, context, desc: `${created} events created, ${eventsToSave.length - created} updated in db` }) + await newAlertItem({ ads, context, desc: `${created} events created, ${eventsToSave.length - created} updated in db` }) } } catch (error) { - newAlertItem({ context, desc: `Error during event import: ${error}`, level: AlertLevel.ERROR }) + await newAlertItem({ context, desc: `Error during event import: ${error}`, level: AlertLevel.ERROR }) } } diff --git a/packages/functions/src/typeorm/configOptions.ts b/packages/functions/src/typeorm/configOptions.ts index 9e3d91b..8c7dd3a 100644 --- a/packages/functions/src/typeorm/configOptions.ts +++ b/packages/functions/src/typeorm/configOptions.ts @@ -23,6 +23,7 @@ import { RatingResultItemsText1705347424162 } from './migrations/1705347424162-r import { EventState1705779906213 } from './migrations/1705779906213-event_state' import { AddInvalidatedState1711307184824 } from './migrations/1711307184824-add_invalidated_state' import { AddAlertTable1711394423616 } from './migrations/1711394423616-add_alert_table' +import { RatingMessageTextType1728838819007 } from './migrations/1728838819007-rating_message_text_type' export const DBConfig: SqlServerConnectionOptions = { type: 'mssql', @@ -61,6 +62,7 @@ export const DBConfig: SqlServerConnectionOptions = { EventState1705779906213, AddInvalidatedState1711307184824, AddAlertTable1711394423616, + RatingMessageTextType1728838819007, ], options: { encrypt: ENCRYPT }, } diff --git a/packages/functions/src/typeorm/entities/EventRating.ts b/packages/functions/src/typeorm/entities/EventRating.ts index 8864cc6..14c26e6 100644 --- a/packages/functions/src/typeorm/entities/EventRating.ts +++ b/packages/functions/src/typeorm/entities/EventRating.ts @@ -38,7 +38,7 @@ class EventRating implements IEventRating { @Check("status in('STARTED', 'SUBMITTED')") status: RatingStatus - @Column({ nullable: true }) + @Column({ nullable: true, type: 'text' }) message?: string @Column() diff --git a/packages/functions/src/typeorm/migrations/1728838819007-rating_message_text_type.ts b/packages/functions/src/typeorm/migrations/1728838819007-rating_message_text_type.ts new file mode 100644 index 0000000..cbe120c --- /dev/null +++ b/packages/functions/src/typeorm/migrations/1728838819007-rating_message_text_type.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' + +export class RatingMessageTextType1728838819007 implements MigrationInterface { + name = 'RatingMessageTextType1728838819007' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "event_rating" ALTER COLUMN "message" nvarchar(max)`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "event_rating" ALTER COLUMN "message" nvarchar(255)`) + } +} diff --git a/packages/functions/src/util/env.ts b/packages/functions/src/util/env.ts index f1edf46..7620467 100644 --- a/packages/functions/src/util/env.ts +++ b/packages/functions/src/util/env.ts @@ -5,12 +5,12 @@ export const DB_USER = env.get('DB_USER').default('function_user').asString() export const DB_PWD = env.get('DB_PWD').default('könnyűJelszó53').asString() export const DB_ADMIN_USER = env.get('DB_ADMIN_USER').default('sa').asString() export const DB_ADMIN_PWD = env.get('DB_ADMIN_PWD').default('Pr1sm4_Pr1sm4').asString() -export const DB_NAME = env.get('DB_NAME').asString() +export const DB_NAME = env.get('DB_NAME').default('pontozo-prod-copy').asString() export const ENCRYPT = env.get('ENCRYPT').default('false').asBool() export const REDIS_HOST = env.get('REDIS_HOST').default('localhost').asString() export const REDIS_PORT = env.get('REDIS_PORT').default(6379).asInt() export const REDIS_PWD = env.get('REDIS_PWD').default('hablatyrandomszoveg1235t436').asString() -export const APIM_HOST = env.get('APIM_HOST').default('https://pontozoapim.azure-api.net').asString() +export const APIM_HOST = env.get('APIM_HOST').default('https://pontozo-apim.azure-api.net').asString() export const APIM_KEY = env.get('APIM_KEY').default('').asString() export const CLIENT_ID = env.get('CLIENT_ID').default('').asString() export const CLIENT_SECRET = env.get('CLIENT_SECRET').default('').asString()