Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ docs/_build/
docs/build/

# Prisma generated files
src/prisma/build/**/*.ts
src/prisma/build/

# OLD DATABASE, DO NOT PUSH, IT CONTAINS SENSITIVE DATA
migration/etuutt_old/etuutt_old.sql
Expand Down
8 changes: 6 additions & 2 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import tsParser from '@typescript-eslint/parser';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import typescriptPlugin from 'typescript-eslint';
import importPlugin from 'eslint-plugin-import'

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);

export default defineConfig([globalIgnores(['eslint.config.mjs']),
{
extends: [
typescriptPlugin.configs.recommended, eslintConfigPrettier
typescriptPlugin.configs.recommended, eslintConfigPrettier, importPlugin.flatConfigs.recommended, importPlugin.flatConfigs.typescript,
],

languageOptions: {
Expand All @@ -36,7 +37,10 @@ export default defineConfig([globalIgnores(['eslint.config.mjs']),
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'import/no-unresolved': 'off',
// Currently disabled, until https://github.com/import-js/eslint-plugin-import/pull/3230 is merged to support ESLint 10.
//'import/order': 'error'
},
files: ['**/*.ts']
files: ['**/*.ts'],
},
]);
21 changes: 10 additions & 11 deletions migration/etuutt_old/make-migration.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
import { PrismaClient as _PrismaClient } from '../../src/prisma/types';
import { RawBranch ,
RawBranchOption,
RawCreditCategory,
RawSemester,
RawUe,
RawUeComment,
PrismaClient as _PrismaClient,
} from '@/prisma/types';
import { PrismaMariaDb } from '@prisma/adapter-mariadb';
import { createConnection } from 'mysql';
import { cleanDb } from '../../test/utils/test_utils';
import { cleanDb } from '#/utils/test_utils';
import { findLegacyUeofName, migrateUEs } from './modules/ue';
import { createCreditCategories } from './modules/creditCategory';
import { createSemesters } from './modules/semester';
import { migrateUeComments } from './modules/ueComment';
import { createBranches } from './modules/branch';
import {
RawBranch,
RawBranchOption,
RawCreditCategory,
RawSemester,
RawUe,
RawUeComment,
} from '../../src/prisma/types';
import { stringToTranslation } from './utils';
import { omit } from '../../src/utils';
import { omit } from '@/utils';

type MayBePromise<T> = Promise<T> | T;

Expand Down
4 changes: 2 additions & 2 deletions migration/etuutt_old/modules/branch.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getOperationResults, PrismaClient, PrismaOperationResult } from '../make-migration';
import { RawBranch, RawBranchOption } from '../../../src/prisma/types';
import { PrismaClient, PrismaOperationResult, getOperationResults } from '../make-migration';
import { RawBranch, RawBranchOption } from '@/prisma/types';

export async function createBranches(prisma: PrismaClient) {
const operations: Promise<{
Expand Down
4 changes: 2 additions & 2 deletions migration/etuutt_old/modules/creditCategory.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getOperationResults, PrismaClient, PrismaOperationResult } from '../make-migration';
import { RawCreditCategory } from '../../../src/prisma/types';
import { PrismaClient, PrismaOperationResult, getOperationResults } from '../make-migration';
import { RawCreditCategory } from '@/prisma/types';

export async function createCreditCategories(prisma: PrismaClient) {
const creditCategoriesData = [
Expand Down
4 changes: 2 additions & 2 deletions migration/etuutt_old/modules/semester.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RawSemester } from '../../../src/prisma/types';
import { getOperationResults, PrismaClient, PrismaOperationResult } from '../make-migration';
import { RawSemester } from '@/prisma/types';
import { PrismaClient, PrismaOperationResult, getOperationResults } from '../make-migration';

export async function createSemesters(prisma: PrismaClient) {
const operations: Promise<PrismaOperationResult<RawSemester>>[] = [];
Expand Down
5 changes: 2 additions & 3 deletions migration/etuutt_old/modules/ue.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getOperationResults, PrismaOperationResult, QueryFunction } from '../make-migration';
import { PrismaClient } from '../make-migration';
import { RawUe } from '../../../src/prisma/types';
import { PrismaClient, PrismaOperationResult, QueryFunction , getOperationResults } from '../make-migration';
import { RawUe } from '@/prisma/types';

export function findLegacyUeofName(ueCode: string, comment: string) {
let LOCATION = 'TRO';
Expand Down
5 changes: 2 additions & 3 deletions migration/etuutt_old/modules/ueComment.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getOperationResults, PrismaOperationResult, QueryFunction } from '../make-migration';
import { PrismaClient } from '../make-migration';
import { RawSemester, RawUeComment } from '../../../src/prisma/types';
import { PrismaClient, PrismaOperationResult, QueryFunction , getOperationResults } from '../make-migration';
import { RawSemester, RawUeComment } from '@/prisma/types';

export async function migrateUeComments(query: QueryFunction, prisma: PrismaClient, semesters: RawSemester[]) {
const comments = await query(
Expand Down
3 changes: 1 addition & 2 deletions migration/etuutt_old/modules/user.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { PrismaClient, UserType } from '../../../src/prisma/types';
import { PrismaClient, RawSemester , RawUe, RawUser, UserType } from '@/prisma/types';
import { QueryFunction } from '../make-migration';
import { RawSemester, RawUe, RawUser } from '../../../src/prisma/types';

export async function migrateUsers(
query: QueryFunction,
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"build:docs:configure": "pip install --upgrade pip setuptools sphinx readthedocs-sphinx-ext && pip install -r docs/requirements.txt",
"start": "NODE_ENV=production node dist/src/main",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"lint": "eslint \"{src,apps,libs,test,prisma,migration}/**/*.ts\" --fix",
"lint": "pnpm lint:dry --fix",
"lint:dry": "eslint \"{src,apps,libs,test,prisma,migration}/**/*.ts\"",
"dev": "NODE_ENV=development npx nest start --watch",
"dev:debug": "NODE_ENV=development npx nest start --debug --watch",
"db:reset": "pnpm dev:db:reset && pnpm test:db:reset",
Expand All @@ -38,7 +39,8 @@
"seed:base:prod": "node scripts/seed/base.js",
"seed:ue:prod": "node scripts/seed/ue.js",
"seed:ue:aliases:prod": "node scripts/seed/aliases.js",
"script:deps:graph": "ts-node scripts/dependency_graph.ts"
"script:deps-graph": "ts-node scripts/dependency_graph.ts",
"script:reorder-imports": "ts-node scripts/reorder_imports.ts"
},
"dependencies": {
"@fast-csv/parse": "^5.0.5",
Expand Down Expand Up @@ -97,6 +99,7 @@
"env-cmd": "^11.0.0",
"eslint": "^10.0.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-prettier": "^5.5.5",
"globals": "^17.4.0",
"jest": "30.2.0",
Expand Down
Loading
Loading