✨ feat(cabins): admin queries, add feedback and questions to booking (#…

…512)

* ✨ feat(cabins): find many bookings, booking questions and feedback

* chore: add debug config

.vscode/launch.json

@@ -0,0 +1,12 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "command": "pnpm dev",
+ "name": "Run pnpm dev",
+ "request": "launch",
+ "type": "node-terminal",
+ "skipFiles": ["<node_internals>/**"]
+ }
+ ]
+}

.vscode/settings.json

@@ -1,9 +1,13 @@
 {
- "editor.formatOnSave": true,
- "[typescript][javascript][json][typescriptreact]": {
- "editor.defaultFormatter": "biomejs.biome"
- },
- "[prisma]": {
- "editor.defaultFormatter": "Prisma.prisma"
- }
+ "editor.formatOnSave": true,
+ "[typescript][javascript][json][typescriptreact]": {
+ "editor.defaultFormatter": "biomejs.biome",
+ "editor.codeActionsOnSave": {
+ "quickfix.biome": "explicit",
+ "source.organizeImports.biome": "explicit"
+ }
+ },
+ "[prisma]": {
+ "editor.defaultFormatter": "Prisma.prisma"
+ }
 }

package.json

@@ -117,18 +117,9 @@
  },
  "pnpm": {
  "supportedArchitectures": {
- "os": [
- "current",
- "linux"
- ],
- "cpu": [
- "current",
- "x64"
- ],
- "libc": [
- "current",
- "glibc"
- ]
+ "os": ["current", "linux"],
+ "cpu": ["current", "x64"],
+ "libc": ["current", "glibc"]
  }
  }
 }

prisma/schema.prisma

@@ -196,6 +196,8 @@ model Booking {
  totalCost Int
  internalParticipantsCount Int
  externalParticipantsCount Int
+ questions String @default("")
+ feedback String @default("")
 }
 
 enum Semester {

schema.graphql

@@ -21,15 +21,27 @@ type AddMemberResponse {
 }
 
 type Booking {
- cabins: [Cabin]!
+ cabins: [Cabin!]!
+ createdAt: DateTime!
  email: String!
  endDate: DateTime!
+
+ """
+ Feedback from the cabin administrators to the user, e.g. why a booking was rejected
+ """
+ feedback: String!
  firstName: String!
  id: ID!
  lastName: String!
  phoneNumber: String!
+
+ """Questions/comments from the user to the cabin administrators"""
+ questions: String!
  startDate: DateTime!
- status: Status!
+ status: BookingStatus!
+
+ """Total cost of the booking, in NOK"""
+ totalCost: Int!
 }
 
 type BookingContact {
@@ -56,6 +68,22 @@ type BookingSemestersResponse {
  spring: BookingSemester
 }
 
+enum BookingStatus {
+ CANCELLED
+ CONFIRMED
+ PENDING
+ REJECTED
+}
+
+input BookingsInput {
+ status: BookingStatus
+}
+
+type BookingsResponse {
+ bookings: [Booking!]!
+ total: Int!
+}
+
 type Cabin {
  capacity: Int!
  externalPrice: Int!
@@ -642,6 +670,9 @@ input NewBookingInput {
  internalParticipantsCount: Int!
  lastName: String!
  phoneNumber: String!
+
+ """Questions/comments from the user to the cabin administrators"""
+ questions: String
  startDate: DateTime!
 }
 
@@ -935,6 +966,11 @@ type PublicUser {
 type Query {
  bookingContact: BookingContactResponse!
  bookingSemesters: BookingSemestersResponse!
+
+ """
+ Find all bookings, requires that the user is in an organization with the CABIN_ADMIN permission.
+ """
+ bookings(data: BookingsInput): BookingsResponse!
  cabins: CabinsResponse!
  categories: EventCategoriesResponse!
  event(data: EventInput!): EventResponse!
@@ -1140,13 +1176,6 @@ type SignUpsWithTotalCount {
  total: Int!
 }
 
-enum Status {
- CANCELLED
- CONFIRMED
- PENDING
- REJECTED
-}
-
 type StudyProgram {
  externalId: String!
  id: ID!
@@ -1223,8 +1252,9 @@ type UpdateBookingSemesterResponse {
 }
 
 input UpdateBookingStatusInput {
+ feedback: String
  id: ID!
- status: Status!
+ status: BookingStatus!
 }
 
 input UpdateCategoriesInput {

src/domain/cabins.ts

@@ -20,6 +20,9 @@ interface BookingType {
  totalCost: number;
  internalParticipantsCount: number;
  externalParticipantsCount: number;
+ createdAt: Date;
+ questions: string;
+ feedback: string;
 }
 
 class Booking implements BookingType {
@@ -36,7 +39,13 @@ class Booking implements BookingType {
  this.totalCost = params.totalCost;
  this.internalParticipantsCount = params.internalParticipantsCount;
  this.externalParticipantsCount = params.externalParticipantsCount;
+ this.createdAt = params.createdAt;
+ this.questions = params.questions;
+ this.feedback = params.feedback;
  }
+ feedback: string;
+ questions: string;
+ createdAt: Date;
  internalParticipantsCount: number;
  externalParticipantsCount: number;
  totalCost: number;
@@ -64,6 +73,9 @@ type NewBookingParams = {
  totalCost: number;
  internalParticipantsCount: number;
  externalParticipantsCount: number;
+ createdAt: Date;
+ questions: string;
+ feedback: string;
 };
 
 export { Booking };

src/graphql/cabins/resolvers/BookingsResponse.ts

@@ -0,0 +1,4 @@
+import type { BookingsResponseResolvers } from "./../../types.generated.js";
+export const BookingsResponse: BookingsResponseResolvers = {
+ /* Implement BookingsResponse resolver logic here */
+};

src/graphql/cabins/resolvers/Mutation/newBooking.ts

@@ -14,6 +14,7 @@ export const newBooking: NonNullable<MutationResolvers["newBooking"]> = async (
  phoneNumber,
  internalParticipantsCount,
  externalParticipantsCount,
+ questions,
  } = data;
 
  const newBookingResult = await ctx.cabins.newBooking(ctx, {
@@ -26,6 +27,7 @@ export const newBooking: NonNullable<MutationResolvers["newBooking"]> = async (
  phoneNumber,
  internalParticipantsCount,
  externalParticipantsCount,
+ questions,
  });
 
  if (!newBookingResult.ok) {

src/graphql/cabins/resolvers/Mutation/updateBookingStatus.ts

@@ -1,15 +1,13 @@
-import { assertIsAuthenticated } from "~/graphql/auth.js";
 import type { MutationResolvers } from "./../../../types.generated.js";
 export const updateBookingStatus: NonNullable<
  MutationResolvers["updateBookingStatus"]
 > = async (_parent, { data }, ctx) => {
- assertIsAuthenticated(ctx);
- const { id, status } = data;
- const updateBookingStatusResult = await ctx.cabins.updateBookingStatus(
- ctx,
- id,
+ const { id, status, feedback } = data;
+ const updateBookingStatusResult = await ctx.cabins.updateBookingStatus(ctx, {
+ bookingId: id,
  status,
- );
+ feedback,
+ });
  if (!updateBookingStatusResult.ok) {
  throw updateBookingStatusResult.error;
  }

src/graphql/cabins/resolvers/Mutation/updateBookingStatus.unit.test.ts

@@ -1,41 +1,12 @@
 import { faker } from "@faker-js/faker";
 import { mock } from "jest-mock-extended";
 import type { BookingType } from "~/domain/cabins.js";
-import { errorCodes } from "~/domain/errors.js";
 import { createMockApolloServer } from "~/graphql/test-clients/mock-apollo-server.js";
 import { graphql } from "~/graphql/test-clients/unit/gql.js";
 
 describe("Cabin mutations", () => {
  describe("updateBookingStatus", () => {
- it("should raise PermissionDeniedError if the user is not authenticated", async () => {
- const { client } = createMockApolloServer();
-
- const { errors } = await client.mutate({
- mutation: graphql(`
- mutation UpdateBookingStatus($data: UpdateBookingStatusInput!) {
- updateBookingStatus(data: $data) {
- booking {
- id
- }
- }
- }
- `),
- variables: {
- data: {
- id: faker.string.uuid(),
- status: "PENDING",
- },
- },
- });
- expect(errors).toBeDefined();
- expect(
- errors?.some(
- (err) => err.extensions?.code === errorCodes.ERR_PERMISSION_DENIED,
- ),
- ).toBe(true);
- });
-
- it("should call updateBookingStatus with the correct arugments if authenticated", async () => {
+ it("calls updateBookingStatus with parameters", async () => {
  const { client, cabinService, createMockContext } =
  createMockApolloServer();
 
@@ -64,6 +35,7 @@ describe("Cabin mutations", () => {
  data: {
  id,
  status: "PENDING",
+ feedback: "feedback",
  },
  },
  },
@@ -75,8 +47,11 @@ describe("Cabin mutations", () => {
  expect(errors).toBeUndefined();
  expect(cabinService.updateBookingStatus).toHaveBeenCalledWith(
  expect.anything(),
- id,
- "PENDING",
+ {
+ bookingId: id,
+ status: "PENDING",
+ feedback: "feedback",
+ },
  );
  });
  });

src/graphql/cabins/resolvers/Query/bookings.ts

@@ -0,0 +1,27 @@
+import type { QueryResolvers } from "./../../../types.generated.js";
+export const bookings: NonNullable<QueryResolvers["bookings"]> = async (
+ _parent,
+ { data },
+ ctx,
+) => {
+ const result = await ctx.cabins.findManyBookings(ctx, {
+ bookingStatus: data?.status,
+ });
+
+ if (!result.ok) {
+ switch (result.error.name) {
+ case "PermissionDeniedError":
+ case "UnauthorizedError":
+ return {
+ bookings: [],
+ total: 0,
+ };
+ case "InternalServerError":
+ throw result.error;
+ }
+ }
+ return {
+ bookings: result.data.bookings,
+ total: result.data.total,
+ };
+};