@@ -34,7 +34,7 @@
diff --git a/src/components/CardStatus/CardStatus.vue b/src/components/CardStatus/CardStatus.vue
index fbe39acc..e40fb6cc 100644
--- a/src/components/CardStatus/CardStatus.vue
+++ b/src/components/CardStatus/CardStatus.vue
@@ -1,49 +1,41 @@
- {{ $t("open") }}
+ {{ $t("open") }}
- {{ $t("closed") }}
+ {{ $t("closed") }}
-
+
@@ -57,6 +49,7 @@ const isOpen = computed(() => {
}
.card-status__icon {
+ vertical-align: middle;
width: 11px;
height: 11px;
stroke: var(--text-color);
diff --git a/src/components/OpeningHours/OpeningHours.vue b/src/components/OpeningHours/OpeningHours.vue
index 98fcb1a0..c5f20d92 100644
--- a/src/components/OpeningHours/OpeningHours.vue
+++ b/src/components/OpeningHours/OpeningHours.vue
@@ -1,14 +1,13 @@
-
+
{{ $t("comingWeek") }}
-
- {{ index === 0 ? $t("today") : $t(timeSlot.day) }}
+ {{ intlFormatDay.format(day.date) }}
-
-
+
- {{ renderTime(time.time[0]) }} - {{ renderTime(time.time[1]) }}
+ {{
+ intlFormatTime.formatRange(
+ new Date(event.start),
+ new Date(event.end)
+ )
+ }}
@@ -53,84 +54,41 @@
diff --git a/src/components/SpaceCard/SpaceCard.vue b/src/components/SpaceCard/SpaceCard.vue
index ee88b99c..94b0eab2 100644
--- a/src/components/SpaceCard/SpaceCard.vue
+++ b/src/components/SpaceCard/SpaceCard.vue
@@ -12,9 +12,9 @@
name="seat-icon"
class="space-card__seating-icon"
/>
- {{ " " }}{{ space.seats }}{{ " " }}
+ {{ " " }}{{ space.seats }}{{ " " }}
- {{ $t("total") }} {{ $t("seats") }}
+ {{ $t("seats") }}
diff --git a/src/components/SpriteMap/SpriteMap.vue b/src/components/SpriteMap/SpriteMap.vue
index b8fe7982..afdf67c5 100644
--- a/src/components/SpriteMap/SpriteMap.vue
+++ b/src/components/SpriteMap/SpriteMap.vue
@@ -9,7 +9,26 @@
viewBox="0 0 16 16"
>
+
+
+
+
+
+
+
+
+
@@ -53,15 +72,6 @@
/>
-
-
-
-
;
@@ -30,17 +29,20 @@ function filterSpaces(
If the current time falls in any of the time ranges for today, we're in
business
*/
-export function spaceIsOpen(now: Date, openingHours: OpeningHours[]) {
- // first item in openingHours array is today
- const [{ time: timeRanges }] = openingHours;
- return (
- timeRanges
- // parse to date objects for comparison
- .map((range) => range.map((item) => new Date(item)))
- .some(([start, end]) => {
- return now >= start && now <= end;
- })
- );
+export function spaceIsOpen(now: Date, openingHours: any) {
+ const hoursToday = openingHours[now.getUTCDate()]
+
+ if (!hoursToday)
+ return false
+
+ return hoursToday
+ .map((timeRange) => ({
+ start: new Date(timeRange.start),
+ end: new Date(timeRange.end),
+ }))
+ .some((timeRange) => (
+ now >= timeRange.start && now <= timeRange.end
+ ))
}
function filterSpace(
@@ -52,8 +54,8 @@ function filterSpace(
return activeFilterKeys.every((activeFilterKey) => {
if (activeFilterKey == "showOpenLocations")
- return space.building.openingHours
- && spaceIsOpen(now, space.building.openingHours);
+ return space.building.openingHoursPerDay
+ && spaceIsOpen(now, space.building.openingHoursPerDay);
if (activeFilterKey == "buildings")
return filters.buildings.includes(space.buildingNumber);
if (activeFilterKey == "quietness")
diff --git a/src/server/api/consume-opening-hours.ts b/src/server/api/consume-opening-hours.ts
index 90d90303..5acf894e 100644
--- a/src/server/api/consume-opening-hours.ts
+++ b/src/server/api/consume-opening-hours.ts
@@ -1,9 +1,26 @@
-import { getRoomAvailability } from "../helpers/room-availability";
-import { roomstoTimes } from "../helpers/rooms-to-times";
-import { buildingOpeningHours } from "../helpers/opening-hours";
-import { serverSupabaseServiceRole } from "#supabase/server";
+import { Client } from '@microsoft/microsoft-graph-client';
+import { ClientSecretCredential } from '@azure/identity';
+import { TokenCredentialAuthenticationProvider } from '@microsoft/microsoft-graph-client/authProviders/azureTokenCredentials/index.js';
+import { serverSupabaseServiceRole } from '#supabase/server';
-const { internalSecret, datoApiToken } = useRuntimeConfig();
+const { internalSecret, datoApiToken, microsoftGraph } = useRuntimeConfig();
+
+const credential = new ClientSecretCredential(
+ microsoftGraph.tenantId,
+ microsoftGraph.clientId,
+ microsoftGraph.clientSecret,
+);
+
+const authProvider = new TokenCredentialAuthenticationProvider(credential, {
+ scopes: ['https://graph.microsoft.com/.default'],
+});
+
+const graphClient = Client.initWithMiddleware({
+ authProvider: authProvider,
+ fetchOptions: {
+ headers: { 'Prefer': 'outlook.timezone="Europe/Amsterdam"' },
+ },
+});
export default defineEventHandler(async (event) => {
if (getQuery(event)?.secret !== internalSecret) {
@@ -14,40 +31,91 @@ export default defineEventHandler(async (event) => {
const client = serverSupabaseServiceRole(event);
- const emails = await fetch(
- "https://graphql.datocms.com/",
- {
- method: "POST",
- headers: {
- Authorization: datoApiToken,
- },
- body: JSON.stringify({ query: `
+ const { data } = await fetch('https://graphql.datocms.com/', {
+ method: 'POST',
+ headers: {
+ Authorization: datoApiToken,
+ },
+ body: JSON.stringify({
+ query: `
{
allBuildings(first: 100) {
number
}
}
- `}),
- }
- )
- .then((response) => response.json())
- .then(({ data }) => data.allBuildings.map(buildingNumberToEmail));
-
- const roomAvailability = await getRoomAvailability(emails);
- const times = roomstoTimes(emails, roomAvailability);
- const buildingOpeningHoursResult = buildingOpeningHours(times);
-
- const { error } = await client
- .from("buildings")
- .upsert(
- buildingOpeningHoursResult.map((building) => ({
- number: building.exchangeBuildingId.replace(/\D/g, ""),
- opening_hours: building.openingHours,
- }))
- );
+ `,
+ }),
+ }).then((response) => response.json());
+
+ const startDate = new Date();
+ startDate.setUTCHours(0, 0, 0, 0);
+ const endDate = new Date();
+ endDate.setUTCHours(12, 0, 0, 0);
+ endDate.setUTCDate(startDate.getUTCDate() + 7);
+
+ type Building = {
+ number: string;
+ };
+
+ type BuildingOpeningDates = Building & {
+ openEvents: Array<{
+ start: string;
+ end: string;
+ }>;
+ };
+
+ type CalendarEvent = {
+ subject: string;
+ start: { dateTime: string }
+ end: { dateTime: string }
+ };
+
+ const buildingsOpeningDates: BuildingOpeningDates[] = await Promise.all(
+ data.allBuildings.map((building: Building) =>
+ graphClient
+ .api(
+ `/users/building-${
+ building.number
+ }@tudelft.nl/calendar/calendarView?startDateTime=${
+ startDate.toISOString()
+ }&endDateTime=${
+ endDate.toISOString()
+ }&$select=subject,start,end`
+ )
+ .get()
+ .then((calendarView) => ({
+ number: building.number,
+ openEvents: calendarView.value
+ .filter((event: CalendarEvent) => event.subject === 'Open')
+ .map((event: CalendarEvent) => ({
+ start: new Date(event.start.dateTime).toISOString(),
+ end: new Date(event.end.dateTime).toISOString(),
+ })),
+ }))
+ .catch((error) => {
+ console.warn(
+ `Failed to fetch data for building ${building.number}:`,
+ error.body,
+ );
+
+ return {
+ number: building.number,
+ openEvents: [],
+ };
+ }),
+ ),
+ );
+
+ const { error } = await client.from('buildings').upsert(
+ // @ts-expect-error
+ buildingsOpeningDates.map((building) => ({
+ number: building.number,
+ opening_hours: building.openEvents,
+ })),
+ );
if (error) {
- console.error("Failed to upsert buildings to Supabase", error);
+ console.error('Failed to upsert buildings to Supabase', error);
event.node.res.statusCode = 503;
return event.node.res.end();
}
@@ -55,7 +123,3 @@ export default defineEventHandler(async (event) => {
event.node.res.statusCode = 202;
event.node.res.end();
});
-
-function buildingNumberToEmail({ number }: { number: number }) {
- return `Building-${String(number).padStart(2, "0")}@tudelft.nl`;
-}
diff --git a/src/server/helpers/opening-hours-fixture.ts b/src/server/helpers/opening-hours-fixture.ts
deleted file mode 100644
index 9a31b13f..00000000
--- a/src/server/helpers/opening-hours-fixture.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-export default {
- spaces: [
- {
- spaceId: "sp1",
- floor: "ground floor",
- seats: 10,
- tables: 1,
- latitude: 50.5,
- longitude: 10.1,
- slug: "sp1--hal",
- i18n: {
- en: { name: "corridor" },
- nl: { name: "hal" },
- },
- roomId: "r-1-1",
- realEstateNumber: "r.1.1",
- facilities: {
- adjustableChairs: true,
- daylit: false,
- powerOutlets: true,
- whiteBoard: false,
- presentationScreen: false,
- nearCoffeeMachine: true,
- nearPrinter: false,
- nearBathroom: true,
- quietness: "quiet" as const,
- },
- buildingNumber: 31,
- exchangeBuildingId: "building@domain.com",
- exchangeRoomId: "room@domain.com",
- },
- ],
- availability: {
- "building@domain.com": [
- {
- StartTime: "2019-07-30T05:30:00",
- EndTime: "2019-07-30T16:00:00",
- BusyType: "Free",
- },
- {
- StartTime: "2019-07-31T05:30:00",
- EndTime: "2019-07-31T16:00:00",
- BusyType: "Free",
- },
- {
- StartTime: "2019-08-01T05:30:00",
- EndTime: "2019-08-01T16:00:00",
- BusyType: "Free",
- },
- {
- StartTime: "2019-08-02T05:30:00",
- EndTime: "2019-08-02T16:00:00",
- BusyType: "Free",
- },
- {
- StartTime: "2019-08-05T05:30:00",
- EndTime: "2019-08-05T16:00:00",
- BusyType: "Free",
- },
- ],
- "room@domain.com": [
- {
- StartTime: "2019-07-30T07:00:00",
- EndTime: "2019-07-30T08:00:00",
- BusyType: "Busy",
- },
- {
- StartTime: "2019-07-30T13:30:00",
- EndTime: "2019-07-30T14:00:00",
- BusyType: "Busy",
- },
- {
- StartTime: "2019-07-30T15:30:00",
- EndTime: "2019-07-30T15:45:00",
- BusyType: "Free",
- },
- {
- StartTime: "2019-07-31T09:00:00",
- EndTime: "2019-07-31T16:30:00",
- BusyType: "Busy",
- },
- ],
- },
-};
diff --git a/src/server/helpers/opening-hours.test.ts b/src/server/helpers/opening-hours.test.ts
deleted file mode 100644
index 88ad74dd..00000000
--- a/src/server/helpers/opening-hours.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { describe, test, beforeEach, afterEach, expect, vi } from "vitest";
-import { roomOpeningHours } from "./opening-hours";
-import buildingAndRoom from "./opening-hours-fixture";
-
-beforeEach(() => {
- // set fake date
- vi.useFakeTimers();
- vi.setSystemTime(new Date("2019-07-30"));
-});
-
-afterEach(() => {
- vi.useRealTimers();
-});
-
-describe("space with building and room availability", () => {
- const { availability, spaces } = buildingAndRoom;
-
- test("returns an array with an item for each day of the week ahead", () => {
- const [result] = roomOpeningHours(availability, spaces);
- const { openingHours: resultOpeningHours } = result;
- expect(Array.isArray(resultOpeningHours)).toBe(true);
- expect(resultOpeningHours.length).toBe(7);
- });
-
- test("starts at the current weekday (forced to tuesday)", () => {
- const [result] = roomOpeningHours(availability, spaces);
- const { openingHours: resultOpeningHours } = result;
- const [{ day }] = resultOpeningHours;
- expect(day).toBe("tu");
- });
-
- test("tuesday contains three time ranges", () => {
- const [result] = roomOpeningHours(availability, spaces);
- const { openingHours: resultOpeningHours } = result;
- const [tuesday] = resultOpeningHours;
- expect(tuesday.time.length).toBe(3);
- });
-});
diff --git a/src/server/helpers/opening-hours.ts b/src/server/helpers/opening-hours.ts
deleted file mode 100644
index feca9ad7..00000000
--- a/src/server/helpers/opening-hours.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import type { CsvSpaceData, SpaceI18n } from "./../../../src/types/Space";
-
-import type { DateRange } from "moment-range";
-import momentRange from "moment-range"
-import Moment from "moment-timezone";
-import type { OpeningHours } from "./../../../src/types/OpeningHours";
-const moment = momentRange.extendMoment(Moment);
-moment.tz.setDefault("Europe/Amsterdam");
-
-interface Availability {
- BusyType: string;
- StartTime: any;
- EndTime: any;
-}
-
-/*
- Iterate through a list of calendar entries, filtering by Free or Busy
- (Free for buildings, Busy for rooms)
- Produce an object containing the moment timerange for start and end time
- found in each availability in the list.
-*/
-const getTimeRanges = (availabilityData: Availability[], busyType: string) =>
- availabilityData
- .filter(({ BusyType: type }) => type === busyType)
- // make a moment daterange out of start and end date
- .map(({ StartTime: start, EndTime: end }) => {
- return moment.range(start, end);
- });
-
-/*
- As Exchange may return a single availability item as an object instead of as
- an array, We should make sure it's an array.
-*/
-function ensureArray(availabilityData: T | T[]) {
- if (!Array.isArray(availabilityData)) {
- return Array.of(availabilityData);
- }
- return availabilityData;
-}
-
-function subtractClosingTimes(
- buildingRanges: DateRange[],
- roomRanges: DateRange[] = []
-) {
- return buildingRanges.map((buildingRange) => {
- return roomRanges
- .filter((roomRange) => {
- return buildingRange.contains(roomRange);
- })
- .reduce((openingHours, gap) => {
- // Result after successful subtraction of a time range, is an array of ranges
- const precedingRanges = openingHours.slice(0, openingHours.length - 1);
- const [lastRange] = openingHours.slice(-1);
- return [...precedingRanges, ...lastRange.subtract(gap)];
- }, Array.of(buildingRange.clone()));
- });
-}
-
-function getWeekDayRange() {
- const now = moment();
- const range = moment.range(now, now.clone().add(6, "day"));
- return Array.from(range.by("day", { step: 1 })).map((d) =>
- d.format("dd").toLowerCase()
- );
-}
-
-const fillMissingDays = (openingHours: OpeningHours[] = []) => {
- const days = getWeekDayRange();
- return days.reduce((acc, weekDay) => {
- const dayFromOpeningHours = openingHours.find(({ day }) => day === weekDay);
- if (!dayFromOpeningHours) {
- return [...acc, { day: weekDay, time: [] }];
- }
- return [...acc, dayFromOpeningHours];
- }, [] as OpeningHours[]);
-};
-
-function formatOpeningHours(ranges: DateRange[][] = []): OpeningHours[] {
- return ranges.map((range) => {
- // Determine the weekday by taking the start property off the first item.
- const first = range[0].start;
- const day = first.format("dd").toLowerCase();
- const time = range.map(
- (r) => [r.start, r.end].map((t) => t.utc().format()) as [string, string]
- );
- return { day, time };
- });
-}
-
-const getOpeningHoursForRooms = (building = [], room = []) => {
- if (!building.length) {
- return [];
- }
- // ignore 'busy' entries in building appointments
- const buildingOpenRanges = getTimeRanges(ensureArray(building), "Free");
- // ignore 'free' entries in room appointments
- const roomBusyRanges = getTimeRanges(ensureArray(room), "Busy");
-
- let rangesToFormat: DateRange[][];
-
- if (roomBusyRanges.length) {
- rangesToFormat = subtractClosingTimes(buildingOpenRanges, roomBusyRanges);
- } else {
- rangesToFormat = buildingOpenRanges.map((r) => Array.of(r));
- }
-
- const formattedOpeningHours = formatOpeningHours(rangesToFormat);
- const openingHoursWithDaysFilled = fillMissingDays(formattedOpeningHours);
-
- return openingHoursWithDaysFilled;
-};
-
-const getOpeningHoursForBuildings = (building = []) => {
- const buildingOpenRanges = getTimeRanges(ensureArray(building), "Free").map(
- (r) => Array.of(r)
- );
-
- const formattedOpeningHours = formatOpeningHours(buildingOpenRanges);
- const openingHoursWithDaysFilled = fillMissingDays(formattedOpeningHours);
-
- return openingHoursWithDaysFilled;
-};
-
-export function roomOpeningHours(
- availability: Record,
- rooms: CsvSpaceData[] = []
-): SpaceI18n[] {
- return rooms.map((room) => {
- const { exchangeBuildingId, exchangeRoomId, ...otherProps } = room;
- return {
- ...otherProps,
- openingHours: getOpeningHoursForRooms(
- availability[exchangeBuildingId],
- availability[exchangeRoomId]
- ),
- };
- });
-}
-
-export function buildingOpeningHours(
- availability: Record,
-): unknown {
- return Object
- .entries(availability)
- .map(([key, value]) => ({
- exchangeBuildingId: key,
- openingHours: getOpeningHoursForBuildings(value)
- }))
-}
diff --git a/src/server/helpers/room-availability.ts b/src/server/helpers/room-availability.ts
deleted file mode 100644
index d1f5a0d7..00000000
--- a/src/server/helpers/room-availability.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import moment from "moment";
-import * as dotenv from "dotenv";
-import { soapTemplate } from "./soap-template";
-import { getSoapClient } from "./soap-client";
-
-dotenv.config();
-
-const start = moment().startOf("day").toISOString(true);
-const end = moment().add(6, "days").endOf("day").toISOString(true);
-
-export function getRoomAvailability(emailAddresses: string[]) {
- const soapClient = getSoapClient({
- username: process.env.EWS_USER!,
- password: process.env.EWS_PASS!,
- url: process.env.EWS_ENDPOINT!,
- });
- const soapDocument = soapTemplate({
- emails: emailAddresses,
- start,
- end,
- });
-
- return soapClient(soapDocument);
-};
diff --git a/src/server/helpers/soap-client.test.ts b/src/server/helpers/soap-client.test.ts
deleted file mode 100644
index 89057754..00000000
--- a/src/server/helpers/soap-client.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { describe, it, expect } from "vitest";
-// @ts-ignore
-
-import { parseReponse } from "./soap-client";
-
-describe("Parsing Exchange SOAP response", () => {
- it("works", () => {
- const availability = parseReponse(`
-
-
-
-
-
-
-
-
-
- Detailed
-
-
- 2006-02-28T19:00:00-08:00
- 2006-02-28T23:30:00-08:00
- OOF
- false
-
- 00000
- Exercise
- the gym
- false
- false
- false
- true
-
-
-
-
-
- 480
-
- 0
-
- 5
- 10
- Sunday
-
-
- -60
-
- 1
- 4
- Sunday
-
-
-
-
- Monday Tuesday Wednesday Thursday Friday
- 480
- 1020
-
-
-
-
-
-
-
-
-
- `);
- expect(availability).not.toBeFalsy();
- expect(availability.FreeBusyResponseArray).not.toBeFalsy();
- expect(availability.FreeBusyResponseArray.FreeBusyResponse).not.toBeFalsy();
- });
-});
diff --git a/src/server/helpers/soap-client.ts b/src/server/helpers/soap-client.ts
deleted file mode 100644
index e6172961..00000000
--- a/src/server/helpers/soap-client.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import httpntlm from "httpntlm";
-import { XMLParser } from "fast-xml-parser";
-
-export function parseReponse(responseBody: string) {
- const parser = new XMLParser();
- const parsed = parser.parse(responseBody);
- // Cautiously get user availability response
- return parsed?.["s:Envelope"]?.["s:Body"]?.GetUserAvailabilityResponse;
-}
-
-export function getSoapClient(config: {
- username: string;
- password: string;
- url: string;
-}) {
- return (xml: string) => {
- return new Promise((resolve, reject) => {
- httpntlm.post(
- {
- ...config,
- headers: { "Content-type": "text/xml" },
- body: xml,
- },
- (err: any, res: any) => {
- if (err) return reject(err);
- if (res && res.statusCode !== 200)
- return reject(
- new Error(res.body || "failed to make SOAP to EWS call")
- );
- const availability = parseReponse(res.body);
- if (availability) {
- resolve(availability);
- } else {
- reject(
- new Error(
- "could not find UserAvailabilityResponse in SOAP envelope"
- )
- );
- }
- }
- );
- });
- };
-}
diff --git a/src/server/helpers/soap-template.ts b/src/server/helpers/soap-template.ts
deleted file mode 100644
index fde51d8c..00000000
--- a/src/server/helpers/soap-template.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-function getMailboxData(emails: string[]) {
- return emails
- .map(
- (email) =>
- `
-
- ${email}
-
- `
- )
- .join("\n");
-}
-
-export function soapTemplate({
- emails = [],
- start,
- end,
-}: {
- emails: string[];
- start: string;
- end: string;
-}) {
- return `
-
-
-
-
-
- -60
-
- 0
- 03:00:00
- 5
- 10
- Sunday
-
-
- -60
- 02:00:00
- 5
- 3
- Sunday
-
-
-
- ${getMailboxData(emails)}
-
-
-
- ${start}
- ${end}
-
-
-
-
-`;
-}
diff --git a/src/stores/spaces.ts b/src/stores/spaces.ts
index 010bc863..cbfa3435 100644
--- a/src/stores/spaces.ts
+++ b/src/stores/spaces.ts
@@ -8,13 +8,13 @@ import type { Space, SpaceI18n, Room, RoomI18n } from "~/types/Space";
export type Selection =
| {
- level: "building";
- buildingSlug: string;
- }
+ level: "building";
+ buildingSlug: string;
+ }
| {
- level: "space";
- spaceSlug: string;
- }
+ level: "space";
+ spaceSlug: string;
+ }
| undefined;
export type AssociatedSpace = {
@@ -44,7 +44,7 @@ export const useSpacesStore = defineStore("spaces", () => {
: currentSpace.value?.building
: undefined
);
-
+
const associatedSpaces = computed(() => currentAssociatedSpaces.value);
const defaultFilters: Filters = {
@@ -117,12 +117,18 @@ export const useSpacesStore = defineStore("spaces", () => {
function bulkSetBuildingOpeningHours(data: Array) {
buildingsI18n.value = buildingsI18n.value.map((building) => {
- const matchedBuilding = data.find(({ number }) => number === Number(building.number));
+ const matchedBuilding = data.find(({ number }) => number === building.number);
return matchedBuilding
? {
...building,
- openingHours: matchedBuilding.opening_hours,
+ ...(matchedBuilding.opening_hours.length && {
+ // @ts-expect-error groupBy method exists but has no type yet
+ openingHoursPerDay: Object.groupBy(matchedBuilding.opening_hours, ({ start }) => {
+ const startDate = new Date(start);
+ return startDate.getUTCDate();
+ })
+ }),
}
: building;
});
@@ -219,7 +225,7 @@ export const useSpacesStore = defineStore("spaces", () => {
//mapStore.updateData(); //TODO: DECIDE IF WE NEED TO DO THAT
}
}
-
+
function setAssociatedSpaces(spaces: AssociatedSpace[]) {
currentAssociatedSpaces.value = spaces;
}
@@ -254,7 +260,7 @@ export const useSpacesStore = defineStore("spaces", () => {
const numberOfSelectedFilters = computed(
() => {
- return Object.values(filters.value).reduce((acc, item) => {
+ return Object.values(filters.value).reduce((acc, item) => {
return acc + (item === true || item > 0 ? 1 : item.length > 0 ? item.length : 0)
}, 0)
}
diff --git a/src/types/Building.ts b/src/types/Building.ts
index 0fd20481..3b4c9791 100644
--- a/src/types/Building.ts
+++ b/src/types/Building.ts
@@ -1,6 +1,5 @@
import { Bounds } from "./Bounds";
import type { Occupancy } from "./Filters";
-import type { OpeningHours } from "./OpeningHours";
export interface Building extends BuildingI18n {
slug: string;
@@ -24,12 +23,17 @@ export interface BuildingI18n {
// Client-side loading
occupancy?: Occupancy | undefined;
- openingHours?: OpeningHours[];
+ openingHoursPerDay?: {
+ [key: string]: {
+ start: string;
+ end: string;
+ };
+ };
}
export type CsvAndCmsBuildingData = Omit<
BuildingI18n,
- "openingHours" | "activeDevices" | "occupancy"
+ "activeDevices" | "occupancy"
> & { exchangeBuildingId: string };
export type CmsBuildingData = Pick<
diff --git a/src/types/OpeningHours.ts b/src/types/OpeningHours.ts
deleted file mode 100644
index 456e605b..00000000
--- a/src/types/OpeningHours.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface OpeningHours {
- day: string;
- time: Array<[string, string]>;
-}
diff --git a/src/types/Space.ts b/src/types/Space.ts
index b71eec6f..38fca8c3 100644
--- a/src/types/Space.ts
+++ b/src/types/Space.ts
@@ -1,5 +1,4 @@
import type { SpaceFeatures, Occupancy } from "./Filters";
-import type { OpeningHours } from "./OpeningHours";
import type { Building } from "./Building";
export type Space = Room | RoomZone;
@@ -15,7 +14,7 @@ export interface RoomI18n extends RoomBaseRaw {
export type CsvRoomData = Omit<
RoomI18n,
- "openingHours" | "imageUrl" | "activeDevices"
+ "imageUrl" | "activeDevices"
> & {
exchangeBuildingId: string;
exchangeRoomId: string;
@@ -42,7 +41,6 @@ export interface RoomBaseRaw {
seats: number;
tables: number;
facilities: SpaceFeatures;
- openingHours: OpeningHours[];
image?: {
url: string;
};
@@ -52,7 +50,7 @@ export interface RoomBaseRaw {
export type CsvSpaceData = Omit<
SpaceI18n,
- "openingHours" | "activeDevices"
+ "activeDevices"
> & {
exchangeBuildingId: string;
exchangeRoomId: string;
diff --git a/src/types/supabase.ts b/src/types/supabase.ts
index d3e02905..58a21eab 100644
--- a/src/types/supabase.ts
+++ b/src/types/supabase.ts
@@ -61,17 +61,17 @@ export interface Database {
buildings: {
Row: {
created_at: string | null
- number: number
+ number: string
opening_hours: Json | null
}
Insert: {
created_at?: string | null
- number: number
+ number: string
opening_hours?: Json | null
}
Update: {
created_at?: string | null
- number?: number
+ number?: string
opening_hours?: Json | null
}
Relationships: []
diff --git a/supabase/migrations/20240515111002_building-number-string.sql b/supabase/migrations/20240515111002_building-number-string.sql
new file mode 100644
index 00000000..b19a6db5
--- /dev/null
+++ b/supabase/migrations/20240515111002_building-number-string.sql
@@ -0,0 +1 @@
+alter table "public"."buildings" alter column "number" set data type text using "number"::text;