Add test for User.bookAppointment().

Author: adewes

Makefile

@@ -8,7 +8,7 @@ eslint:
 	npx eslint . --ext .ts
 
 test:
-	npx mocha
+	npx mocha $(args)
 
 build:
 	npx tsc --build

src/backend/appointments.ts

@@ -148,6 +148,7 @@ export class AppointmentsBackend extends JSONRPCBackend {
         },
         keyPair: KeyPair
     ) {
+        console.log(signedTokenData)
         return this.call<Booking>(
             "bookAppointment",
             { providerID, id, encryptedData, signedTokenData },

src/interfaces/appointments.ts

@@ -16,8 +16,8 @@ export interface Slot {
 }
 
 export interface AcceptedAppointment {
-    appointment: SignedAppointment
-    provider: SignedProviderData
+    appointment: Appointment
+    provider: PublicProviderData
     booking: Booking
 }
 
@@ -51,6 +51,7 @@ export interface SignedProviderData {
 }
 
 export interface PublicProviderData {
+    id: string
     name: string
     street: string
     city: string
@@ -87,3 +88,8 @@ export interface ProviderAppointments {
     appointments: SignedAppointment[]
     keyChain: KeyChain
 }
+
+export interface VerifiedProviderAppointments {
+    provider: PublicProviderData
+    appointments: Appointment[]
+}

src/user/book-appointment.spec.ts

@@ -0,0 +1,88 @@
+// Kiebitz - Privacy-Friendly Appointments
+// Copyright (C) 2021-2021 The Kiebitz Authors
+// README.md contains license information.
+
+import { Status } from "../interfaces"
+import { equal } from "assert"
+import { formatDatetime } from "../helpers/time"
+import {
+    backend,
+    adminKeys,
+    resetDB,
+    mediator,
+    verifiedProvider,
+} from "../testing/fixtures"
+import { User } from "./"
+
+beforeEach(async function () {
+    this.backend = backend()
+
+    const keys = await adminKeys()
+    // we reset the database
+    await resetDB(this.backend, keys)
+    // we create a mediator
+    const med = await mediator(this.backend, keys)
+    // we create an unverified provider
+    const vp = await verifiedProvider(this.backend, keys, med)
+
+    let date = new Date()
+
+    // tomorrow 3 pm
+
+    date.setDate(date.getDate() + 1)
+    date.setHours(15)
+    date.setMinutes(0)
+    date.setSeconds(0)
+    date.setMilliseconds(0)
+
+    var app = await vp.createAppointment(15, "moderna", 5, date.toISOString())
+
+    const publishResult = await vp.publishAppointments([app])
+
+    if (publishResult.status !== Status.Succeeded)
+        throw new Error("cannot create appointment")
+
+    this.user = new User("main", this.backend)
+    // we generate a secret etc.
+    await this.user.initialize()
+    // we set the queue data
+    this.user.queueData = {
+        zipCode: "10707",
+    }
+    // we set the contact data
+    this.user.contactData = {
+        name: "Max Mustermann",
+    }
+})
+
+describe("User.bookAppointment()", function () {
+    it("we should be able to book an appointment", async function () {
+        const tokenResult = await this.user.getToken({})
+
+        if (tokenResult.status !== Status.Succeeded)
+            throw new Error("cannot get token")
+
+        const fromDate = new Date()
+        // 24 hours in the future
+        const toDate = new Date(new Date().getTime() + 48 * 60 * 60 * 1000)
+        const getResult = await this.user.getAppointments({
+            from: formatDatetime(fromDate),
+            to: formatDatetime(toDate),
+            zipCode: this.user.queueData!.zipCode,
+        })
+
+        if (getResult.status !== Status.Succeeded)
+            throw new Error("should not fail")
+
+        if (getResult.appointments.length !== 1)
+            throw new Error("should return one appointment")
+
+        const bookResult = await this.user.bookAppointment(
+            getResult.appointments[0].appointments[0],
+            getResult.appointments[0].provider
+        )
+
+        if (bookResult.status !== Status.Succeeded)
+            throw new Error("should not fail")
+    })
+})

src/user/book-appointment.ts

@@ -8,8 +8,8 @@ import {
     OK,
     Result,
     AcceptedAppointment,
-    SignedProviderData,
-    SignedAppointment,
+    PublicProviderData,
+    Appointment,
     Error,
 } from "../interfaces"
 import { User } from "./"
@@ -20,16 +20,14 @@ interface BookAppointmentResult extends Result {
 
 export async function bookAppointment(
     this: User,
-    signedAppointment: SignedAppointment,
-    provider: SignedProviderData
+    appointment: Appointment,
+    provider: PublicProviderData
 ): Promise<BookAppointmentResult | Error> {
     const providerData = {
         signedToken: this.tokenData!.signedToken,
         userToken: this.tokenData!.userToken,
     }
 
-    const appointment = signedAppointment.json!
-
     const encryptedDataAndPublicKey = await ephemeralECDHEncrypt(
         JSON.stringify(providerData),
         appointment.publicKey
@@ -55,7 +53,7 @@ export async function bookAppointment(
         }
 
     const acceptedAppointment: AcceptedAppointment = {
-        appointment: signedAppointment,
+        appointment: appointment,
         provider: provider,
         booking: response,
     }

src/user/cancel-appointment.ts

@@ -3,17 +3,20 @@
 // README.md contains license information.
 
 import { ecdhEncrypt } from "../crypto"
-import { Result, Error, Status } from "../interfaces"
+import { Result, Error, Status, AcceptedAppointment } from "../interfaces"
 import { User } from "./"
 
-export async function cancelAppointment(this: User): Promise<Result | Error> {
-    const id = this.acceptedAppointment!.appointment.json.id
+export async function cancelAppointment(
+    this: User,
+    acceptedAppointment: AcceptedAppointment
+): Promise<Result | Error> {
+    const id = acceptedAppointment.appointment.id
 
     const result = await this.backend.appointments.cancelAppointment(
         {
             id: id,
             signedTokenData: this.tokenData!.signedToken,
-            providerID: this.acceptedAppointment!.provider.id,
+            providerID: acceptedAppointment.provider.id,
         },
         this.tokenData!.keyPairs.signing
     )

src/user/get-appointments.ts

@@ -2,7 +2,13 @@
 // Copyright (C) 2021-2021 The Kiebitz Authors
 // README.md contains license information.
 
-import { Status, Result, Error, ProviderAppointments } from "../interfaces"
+import {
+    Status,
+    Result,
+    Error,
+    Appointment,
+    VerifiedProviderAppointments,
+} from "../interfaces"
 import { verify } from "../crypto"
 import { User } from "./"
 
@@ -42,7 +48,7 @@ async function verifyProviderData(item: any) {
 }
 
 interface GetAppointmentsResult extends Result {
-    appointments: ProviderAppointments[]
+    appointments: VerifiedProviderAppointments[]
 }
 
 interface GetAppointmentsParams {
@@ -67,29 +73,38 @@ export async function getAppointments(
             error: response,
         }
 
-    const verifiedAppointments: ProviderAppointments[] = []
+    const verifiedAppointments: VerifiedProviderAppointments[] = []
 
     for (const item of response) {
         item.provider.json = await verifyProviderData(item)
-        const verifiedProviderAppointments = []
-        for (const appointment of item.appointments) {
-            const verifiedAppointment = await verifyAppointment(
-                appointment,
+        // we copy the ID for convenience
+        item.provider.json.id = item.provider.id
+        const verifiedProviderAppointments: Appointment[] = []
+        for (const signedAppointment of item.appointments) {
+            const appointment: Appointment = await verifyAppointment(
+                signedAppointment,
                 item
             )
-            for (const slot of verifiedAppointment.slotData) {
-                if (appointment.bookedSlots!.some((id: any) => id === slot.id))
+            for (const slot of appointment.slotData) {
+                if (
+                    signedAppointment.bookedSlots!.some(
+                        (id: any) => id === slot.id
+                    )
+                )
                     slot.open = false
                 else slot.open = true
             }
-            verifiedProviderAppointments.push(verifiedAppointment)
+            verifiedProviderAppointments.push(appointment)
         }
         item.appointments = verifiedProviderAppointments
-        verifiedAppointments.push(item)
+        verifiedAppointments.push({
+            provider: item.provider.json,
+            appointments: verifiedProviderAppointments,
+        } as VerifiedProviderAppointments)
     }
 
     verifiedAppointments.sort((a, b) =>
-        a.provider.json!.name > b.provider.json!.name ? 1 : -1
+        a.provider.name > b.provider.name ? 1 : -1
     )
 
     return {

src/user/get-token.spec.ts

@@ -8,11 +8,11 @@ import { formatDate } from "../helpers/time"
 import { backend } from "../testing/fixtures"
 import { User } from "./"
 
-beforeEach(function () {
+beforeEach(async function () {
     this.backend = backend()
     this.user = new User("main", this.backend)
     // we generate a secret etc.
-    this.user.initialize()
+    await this.user.initialize()
     // we set the queue data
     this.user.queueData = {
         zipCode: "10707",
@@ -25,7 +25,6 @@ beforeEach(function () {
 
 describe("User.getToken()", function () {
     it("we should be able to get a token", async function () {
-        const today = formatDate(new Date())
         const result = await this.user.getToken({})
         equal(result.status, Status.Succeeded)
         equal(result.tokenData.userToken.version, "0.3")

src/user/index.ts

@@ -42,8 +42,8 @@ export class User extends Actor {
     }
 
     public async initialize() {
-        await this.generateKeyPairs()
         this.generateSecret()
+        await this.generateKeyPairs()
     }
 
     public get queueData(): QueueData | null {