Merge branch 'main' into #1-account-management

# Conflicts:
#	src/data-source.ts
This commit is contained in:
Julian Krauser 2024-11-21 16:00:22 +01:00
commit 273745f830
66 changed files with 3721 additions and 10 deletions

View file

@ -30,6 +30,16 @@ import { membership } from "./entity/membership";
import { Memberdata1726301836849 } from "./migrations/1726301836849-memberdata";
import { CommunicationFields1727439800630 } from "./migrations/1727439800630-communicationFields";
import { Ownership1728313041449 } from "./migrations/1728313041449-ownership";
import { protocol } from "./entity/protocol";
import { protocolAgenda } from "./entity/protocolAgenda";
import { protocolDecision } from "./entity/protocolDecision";
import { protocolPresence } from "./entity/protocolPresence";
import { protocolVoting } from "./entity/protocolVoting";
import { protocolPrintout } from "./entity/protocolPrintout";
import { Protocol1729347911107 } from "./migrations/1729347911107-protocol";
import { calendar } from "./entity/calendar";
import { calendarType } from "./entity/calendarType";
import { Calendar1729947763295 } from "./migrations/1729947763295-calendar";
const dataSource = new DataSource({
type: DB_TYPE as any,
@ -59,6 +69,14 @@ const dataSource = new DataSource({
memberExecutivePositions,
memberQualifications,
membership,
protocol,
protocolAgenda,
protocolDecision,
protocolPresence,
protocolVoting,
protocolPrintout,
calendar,
calendarType,
],
migrations: [
Initial1724317398939,
@ -70,6 +88,8 @@ const dataSource = new DataSource({
Memberdata1726301836849,
CommunicationFields1727439800630,
Ownership1728313041449,
Protocol1729347911107,
Calendar1729947763295,
],
migrationsRun: true,
migrationsTransactionMode: "each",