From 7357b32da7b1368ccd28175bdbf12185fe65cde0 Mon Sep 17 00:00:00 2001 From: Joao Pedro da Silva Date: Tue, 14 Nov 2023 15:34:33 -0300 Subject: [PATCH 1/2] add createdAt on learnAndEarnUserLesson --- ...661374519-create-learnAndEarnUserLesson.js | 4 +++ ...34748-update-learn-and-earn-user-lesson.js | 27 +++++++++++++++++++ .../learnAndEarn/learnAndEarnUserLesson.ts | 8 +++++- .../learnAndEarn/learnAndEarnUserLesson.ts | 1 + 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 packages/core/src/database/migrations/z20231114134748-update-learn-and-earn-user-lesson.js diff --git a/packages/core/src/database/migrations/z1661374519-create-learnAndEarnUserLesson.js b/packages/core/src/database/migrations/z1661374519-create-learnAndEarnUserLesson.js index b7a168d9b..bfa267b34 100644 --- a/packages/core/src/database/migrations/z1661374519-create-learnAndEarnUserLesson.js +++ b/packages/core/src/database/migrations/z1661374519-create-learnAndEarnUserLesson.js @@ -51,6 +51,10 @@ module.exports = { allowNull: false, defaultValue: 0, }, + createdAt: { + type: Sequelize.DATE, + allowNull: false, + }, }); }, down: (queryInterface) => { diff --git a/packages/core/src/database/migrations/z20231114134748-update-learn-and-earn-user-lesson.js b/packages/core/src/database/migrations/z20231114134748-update-learn-and-earn-user-lesson.js new file mode 100644 index 000000000..f784ace9f --- /dev/null +++ b/packages/core/src/database/migrations/z20231114134748-update-learn-and-earn-user-lesson.js @@ -0,0 +1,27 @@ +'use strict'; +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + if (process.env.NODE_ENV === 'test') { + return; + } + + await queryInterface.addColumn('learn_and_earn_user_lesson', 'createdAt', { + type: Sequelize.DATE, + allowNull: true + }); + + await queryInterface.sequelize.query(` + UPDATE learn_and_earn_user_lesson + SET "createdAt" = COALESCE("completionDate", CURRENT_DATE); + `); + + await queryInterface.changeColumn('learn_and_earn_user_lesson', 'createdAt', { + type: Sequelize.DATE, + allowNull: false + }); + }, + async down(queryInterface, Sequelize) { + // + } +}; diff --git a/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts b/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts index dedb6452d..f7931ccb6 100644 --- a/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts +++ b/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts @@ -15,6 +15,8 @@ export class LearnAndEarnUserLessonModel extends Model Date: Tue, 14 Nov 2023 15:35:09 -0300 Subject: [PATCH 2/2] fix lint --- .../src/database/models/learnAndEarn/learnAndEarnUserLesson.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts b/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts index f7931ccb6..c5224611e 100644 --- a/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts +++ b/packages/core/src/database/models/learnAndEarn/learnAndEarnUserLesson.ts @@ -67,7 +67,7 @@ export function initializeLearnAndEarnUserLesson(sequelize: Sequelize): typeof L }, createdAt: { type: DataTypes.DATE, - allowNull: false, + allowNull: false } }, {