update mongoose to 5.8.3 (lots of types changes)

This commit is contained in:
Thomas Ruoff
2024-09-10 22:44:25 +02:00
parent 3ecbd16a2c
commit 32818b7492
22 changed files with 136 additions and 251 deletions

View File

@@ -1,13 +0,0 @@
import { getNextSmaller, getNextBigger } from './array'
test('getPreviousInOrder', () => {
const result = getNextSmaller([3, 1, 2, 0, 8, 9, 10], 5)
expect(result).toEqual(3)
})
test('getNextInOrder', () => {
const result = getNextBigger([7, 8, 9, 3, 1, 2], 4)
expect(result).toEqual(7)
})

View File

@@ -1,5 +1,5 @@
import { MILAGE_TARIFS } from '../db/enums'
import { AdditionalCost, Bill } from '../db/bill'
import { IAdditionalCost, IBill } from '../db/bill'
import fetch from './fetch'
function roundToCent(amount: number): number {
@@ -61,7 +61,7 @@ export function getBillTotal({
}: {
tarif: MILAGE_TARIFS
milage?: number
additionalCosts: AdditionalCost[]
additionalCosts: IAdditionalCost[]
}): number {
const milageCosts = getMilageCosts({ tarif, km: milage })
const additionalCostsSum = additionalCosts
@@ -73,8 +73,8 @@ export function getBillTotal({
export async function createBill(
bookingUuid: string,
bill: Bill
): Promise<Bill> {
bill: IBill
): Promise<IBill> {
return fetch(`/api/bookings/${bookingUuid}/bill`, {
method: 'POST',
body: bill,
@@ -83,8 +83,8 @@ export async function createBill(
export async function patchBill(
bookingUuid: string,
bill: Bill
): Promise<Bill> {
bill: IBill
): Promise<IBill> {
return fetch(`/api/bookings/${bookingUuid}/bill`, {
method: 'POST',
body: bill,

View File

@@ -1,12 +0,0 @@
import { daysFormatFrontend } from './date'
test('daysFormatFrontend', () => {
expect(daysFormatFrontend([])).toEqual('')
expect(daysFormatFrontend(['2020-01-01'])).toEqual('01.01.2020')
expect(daysFormatFrontend(['2020-01-01', '2020-01-02'])).toEqual(
'01.01.2020-02.01.2020'
)
expect(
daysFormatFrontend(['2020-01-01', '2020-01-02', '2020-01-05'])
).toEqual('01.01.2020-05.01.2020')
})

View File

@@ -1,5 +1,5 @@
import { createEvents, createEvent, EventStatus } from 'ics'
import { Booking } from '../db/booking'
import { IBooking } from '../db/booking'
import { BOOKING_STATUS } from '../db/enums'
import { getBaseURL } from './url'
import { daysFormatFrontend } from './date'
@@ -12,7 +12,7 @@ function convertDay(value: string): [number, number, number] {
return [Number(parts[0]), Number(parts[1]), Number(parts[2])]
}
export function generateCalendarEntry(booking: Booking): string {
export function generateCalendarEntry(booking: IBooking): string {
const { error, value } = createEvent({
productId: 'app.vercel.pfadi-bussle/ics',
title: `Pfadi-Bussle Buchung`,
@@ -38,7 +38,7 @@ Buchungs-Link: ${getBaseURL()}/bookings/${booking.uuid}
return value
}
export function generateBookedCalendar(bookings: Booking[]): string {
export function generateBookedCalendar(bookings: IBooking[]): string {
const events = bookings.map(
(
booking
@@ -80,4 +80,4 @@ Link: ${getBaseURL()}/admin/bookings/${booking.uuid}
}
return value
}
}

View File

@@ -1,4 +1,4 @@
import { Booking } from '../db/booking'
import { IBooking } from '../db/booking'
import { getBaseURL } from '../helpers/url'
import { daysFormatFrontend } from './date'
import { generateCalendarEntry } from './ical'
@@ -49,7 +49,7 @@ Tel. 0151/212 253 62
${getBaseURL()}
`
function getReceivedBookingBookerText(booking: Booking): string {
function getReceivedBookingBookerText(booking: IBooking): string {
return `Hallo liebe/r ${booking.name},
Vielen Dank für Deine Buchungsanfrage zum ${daysFormatFrontend(booking.days)}!
@@ -66,7 +66,7 @@ ${footer}
`
}
function getBookingConfirmedText(booking: Booking): string {
function getBookingConfirmedText(booking: IBooking): string {
return `Hallo liebe/r ${booking.name},
deine Buchunganfrage zum ${daysFormatFrontend(
@@ -83,7 +83,7 @@ ${footer}
`
}
function getBookingRejectedText(booking: Booking): string {
function getBookingRejectedText(booking: IBooking): string {
return `Hallo liebe/r ${booking.name},
es tut uns leid, aber deine Buchungsanfrage zum ${daysFormatFrontend(
@@ -97,7 +97,7 @@ ${footer}
`
}
function getBookingCanceledText(booking: Booking): string {
function getBookingCanceledText(booking: IBooking): string {
return `Hallo liebe/r ${booking.name},
deine Buchungsanfrage zum ${daysFormatFrontend(booking.days)} wurde storniert.
@@ -118,7 +118,7 @@ MfG`
}
export async function sendReceivedBookingAdminMail(
booking: Booking
booking: IBooking
): Promise<void> {
await sendMail({
to: [{ address: adminEmail, name: 'Pfadi-Bussle Wart' }],
@@ -129,7 +129,7 @@ export async function sendReceivedBookingAdminMail(
}
export async function sendReceivedBookingBookerMail(
booking: Booking
booking: IBooking
): Promise<void> {
await sendMail({
to: [{ address: booking.email, name: booking.name }],
@@ -139,7 +139,7 @@ export async function sendReceivedBookingBookerMail(
})
}
export async function sendBookingConfirmed(booking: Booking): Promise<void> {
export async function sendBookingConfirmed(booking: IBooking): Promise<void> {
await sendMail({
to: [{ address: booking.email, name: booking.name }],
from: { address: fromEmail, name: 'Pfadi-Bussle Wart' },
@@ -157,7 +157,7 @@ export async function sendBookingConfirmed(booking: Booking): Promise<void> {
})
}
export async function sendBookingRejected(booking: Booking): Promise<void> {
export async function sendBookingRejected(booking: IBooking): Promise<void> {
await sendMail({
to: [{ address: booking.email, name: booking.name }],
from: { address: fromEmail, name: 'Pfadi-Bussle Wart' },
@@ -166,7 +166,7 @@ export async function sendBookingRejected(booking: Booking): Promise<void> {
})
}
export async function sendBookingCanceled(booking: Booking): Promise<void> {
export async function sendBookingCanceled(booking: IBooking): Promise<void> {
await sendMail({
to: [{ address: booking.email, name: booking.name }],
from: { address: fromEmail, name: 'Pfadi-Bussle Wart' },

View File

@@ -1,4 +1,4 @@
import { Booking } from '../db/booking'
import { IBooking } from '../db/booking'
import { log } from '../helpers/log'
const BOOKING_DATA_KEY = 'pfadiBussleBookingData'
@@ -7,7 +7,7 @@ function getStorage() {
return localStorage
}
export function storeBookingData(booking: Booking) {
export function storeBookingData(booking: IBooking) {
const { name, email, street, zip, city, org } = booking
getStorage().setItem(
@@ -30,4 +30,4 @@ export function loadBookingData() {
}
return result
}
}