Add support for multiple appointment bookings per user.

Author: adewes

README.md

@@ -1,8 +1,6 @@
-Welcome! Vanellus is the Kiebitzt Typescript library that provides
-all necessary functionality for building web applications based on
-the Kiebitz API and data models.
-
-**This is still a work in progress.**
+Welcome! Vanellus is the official Kiebitz Typescript library that acts as an
+interface to the Kiebitz backend services and provides necessary functionality
+for building end-to-end encrypted applications with Kiebitz.
 
 # Requirements
 

src/backend/appointments.ts

@@ -134,14 +134,20 @@ export class AppointmentsBackend extends JSONRPCBackend {
     async cancelAppointment(
         {
             providerID,
+            slotID,
             id,
             signedTokenData,
-        }: { providerID: string; id: string; signedTokenData: SignedData },
+        }: {
+            providerID: string
+            slotID: string
+            id: string
+            signedTokenData: SignedData
+        },
         keyPair: KeyPair
     ) {
         return this.call<OK>(
             "cancelAppointment",
-            { providerID, id, signedTokenData },
+            { providerID, slotID, id, signedTokenData },
             keyPair
         )
     }

src/user/backup-data.spec.ts

@@ -46,7 +46,7 @@ describe("User.backupData()", function () {
         deepEqual(newUser.contactData, user.contactData)
         deepEqual(newUser.tokenData, user.tokenData)
         deepEqual(newUser.queueData, user.queueData)
-        deepEqual(newUser.acceptedAppointment, user.acceptedAppointment)
+        deepEqual(newUser.acceptedAppointments, user.acceptedAppointments)
 
         // we overwrite the secret
         newUser.initialize()

src/user/backup-data.ts

@@ -27,7 +27,7 @@ export interface CloudBackupData extends BackupData {
     tokenData: TokenData | null
     queueData: QueueData | null
     contactData: ContactData | null
-    acceptedAppointment: AcceptedAppointment | null
+    acceptedAppointments: AcceptedAppointment[]
 }
 
 export interface BackupDataResult extends Result {
@@ -44,7 +44,7 @@ export async function backupData(
         tokenData: this.tokenData,
         queueData: this.queueData,
         contactData: this.contactData,
-        acceptedAppointment: this.acceptedAppointment,
+        acceptedAppointments: this.acceptedAppointments,
     }
 
     const idAndKey = await deriveSecrets(base322buf(this.secret!), 32, 2)

src/user/book-appointment.spec.ts

@@ -104,6 +104,8 @@ describe("User.bookAppointment()", function () {
         if (cancelResult.status !== Status.Succeeded)
             throw new Error("cannot cancel appointment")
 
+        equal(user.appointments.length, 0)
+
         apptsResult = await vp.appointments().get({
             from: formatDatetime(fromDate),
             to: formatDatetime(toDate),

src/user/book-appointment.ts

@@ -63,7 +63,9 @@ export async function bookAppointment(
     }
 
     // we store the information about the offer which we've accepted
-    this.acceptedAppointment = acceptedAppointment
+    const aa = this.acceptedAppointments
+    aa.push(acceptedAppointment)
+    this.acceptedAppointments = aa
 
     return {
         status: Status.Succeeded,

src/user/cancel-appointment.ts

@@ -19,12 +19,18 @@ export async function cancelAppointment(
     const response = await this.backend.appointments.cancelAppointment(
         {
             id: acceptedAppointment.appointment.id,
+            slotID: acceptedAppointment.booking.id,
             signedTokenData: this.tokenData!.signedToken,
             providerID: acceptedAppointment.provider.id,
         },
         this.tokenData!.keyPairs.signing
     )
 
+    // we remove the accepted appointment
+    this.acceptedAppointments = this.acceptedAppointments.filter(
+        (aa) => aa.booking.id !== acceptedAppointment.booking.id
+    )
+
     if (response !== "ok")
         return {
             status: Status.Failed,

src/user/index.ts

@@ -90,23 +90,13 @@ export class User extends Actor {
         this.set("contactData", contactData)
     }
 
-    public get verifiedAppointments(): ProviderAppointments[] | null {
-        return this.get("verifiedAppointments")
+    public get acceptedAppointments(): AcceptedAppointment[] {
+        return this.get("acceptedAppointments") || []
     }
 
-    public set verifiedAppointments(
-        verifiedAppointments: ProviderAppointments[] | null
+    public set acceptedAppointments(
+        acceptedAppointments: AcceptedAppointment[]
     ) {
-        this.set("verifiedAppointments", verifiedAppointments)
-    }
-
-    public get acceptedAppointment(): AcceptedAppointment | null {
-        return this.get("acceptedAppointment")
-    }
-
-    public set acceptedAppointment(
-        acceptedAppointment: AcceptedAppointment | null
-    ) {
-        this.set("acceptedAppointment", acceptedAppointment)
+        this.set("acceptedAppointments", acceptedAppointments)
     }
 }

src/user/restore-from-backup.ts

@@ -35,7 +35,7 @@ export async function restoreFromBackup(
     this.tokenData = dd.tokenData
     this.queueData = dd.queueData
     this.contactData = dd.contactData
-    this.acceptedAppointment = dd.acceptedAppointment
+    this.acceptedAppointments = dd.acceptedAppointments
 
     return {
         status: Status.Succeeded,