diff --git a/scripts/migrate-expenses.ts b/scripts/migrate-expenses.ts index 6c20eb6..215f2bb 100644 --- a/scripts/migrate-expenses.ts +++ b/scripts/migrate-expenses.ts @@ -116,8 +116,9 @@ const createManyNewExpenses = async (timesheet_id: number, old_expenses: OldExpe mileage = old_expense.value!; amount = mileage * 0.72; } - if (mileage < 0) { + if (mileage < 0 || amount < 0) { console.warn(`expense of value less than '0' found`) + continue; } if (old_expense.date == null) { diff --git a/scripts/migrate-shifts.ts b/scripts/migrate-shifts.ts index 5b966c4..a3dfce5 100644 --- a/scripts/migrate-shifts.ts +++ b/scripts/migrate-shifts.ts @@ -22,13 +22,13 @@ type OldShifts = { } export const extractOldShifts = async () => { - for (let id = 1; id <= 61; id++) { + // for (let id = 1; id <= 61; id++) { console.log(`Start of shift migration ***************************************************************`); - const new_employee = await findOneNewEmployee(id); - console.log(`Employee ${id} found in new DB`); + const new_employee = await findOneNewEmployee(50); + console.log(`Employee ${50} found in new DB`); const new_timesheets = await findManyNewTimesheets(new_employee.id); - console.log(`New Timesheets found for employee ${id}`); + console.log(`New Timesheets found for employee ${50}`); for (const ts of new_timesheets) { console.log(`start_date = ${ts.start_date} timesheet_id = ${ts.id}`) @@ -62,7 +62,7 @@ export const extractOldShifts = async () => { }); await createManyNewShifts(new_timesheet.id, old_shifts); } - } + // } await prisma_legacy.$disconnect(); await prisma.$disconnect(); } diff --git a/scripts/migration.service.ts b/scripts/migration.service.ts index 88dcb82..2bb37d6 100644 --- a/scripts/migration.service.ts +++ b/scripts/migration.service.ts @@ -1,6 +1,6 @@ -import { extractOldTimesheets } from "scripts/migrate-timesheets"; -import { extractOldExpenses } from "scripts/migrate-expenses"; -import { extractOldShifts } from "scripts/migrate-shifts"; +// import { extractOldTimesheets } from "scripts/migrate-timesheets"; +// import { extractOldExpenses } from "scripts/migrate-expenses"; +// import { extractOldShifts } from "scripts/migrate-shifts"; import { Injectable } from "@nestjs/common"; @Injectable() @@ -8,14 +8,14 @@ export class MigrationService { constructor() {} async migrateTimesheets() { - extractOldTimesheets(); + // extractOldTimesheets(); }; async migrateShifts() { - extractOldShifts(); + // extractOldShifts(); } async migrateExpenses() { - extractOldExpenses(); + // extractOldExpenses(); } } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 5b9134b..6dc2a03 100644 --- a/src/main.ts +++ b/src/main.ts @@ -18,7 +18,6 @@ import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import { writeFileSync } from 'fs'; import * as session from 'express-session'; import * as passport from 'passport'; -// import { extractOldTimesheets } from 'scripts/migrate-timesheets'; import { extractOldShifts } from 'scripts/migrate-shifts'; import { extractOldTimesheets } from 'scripts/migrate-timesheets'; import { extractOldExpenses } from 'scripts/migrate-expenses'; @@ -98,6 +97,6 @@ async function bootstrap() { // migration function calls // await extractOldTimesheets(); // await extractOldShifts(); - // await extractOldExpenses(); + await extractOldExpenses(); } bootstrap();