groupware: improve tests

 * jmap: add UpdateContactCard and UpdateCalendarEvent funcs
 * use JSON marshalling and unmarshalling into a map for toPatch()
   implementations
 * add updating ContactCards and CalendarEvents to tests
 * add deleting ContactCards and CalendarEvents to tests
 * make query response totals work when the value is 0
 * tests: use CreateContactCard and CreateCalendarEvent funcs to create
   objects in tests instead of using a different JMAP stack that works
   with untyped maps

Author: pbleser-oc

pkg/jmap/api_contact.go

@@ -76,7 +76,7 @@ func (j *Client) QueryContactCards(accountIds []string,
 				Results:             get.List,
 				CanCalculateChanges: query.CanCalculateChanges,
 				Position:            query.Position,
-				Total:               uintPtrIf(query.Total, calculateTotal),
+				Total:               uintPtrIfPtr(query.Total, calculateTotal),
 				Limit:               query.Limit,
 			}
 		},
@@ -114,3 +114,18 @@ func (j *Client) DeleteContactCard(accountId string, destroyIds []string, ctx Co
 		ctx,
 	)
 }
+
+func (j *Client) UpdateContactCard(accountId string, id string, changes ContactCardChange, ctx Context) (ContactCard, SessionState, State, Language, Error) {
+	return update(j, "UpdateContactCard", ContactCardType,
+		func(update map[string]PatchObject) ContactCardSetCommand {
+			return ContactCardSetCommand{AccountId: accountId, Update: update}
+		},
+		func(id string) ContactCardGetCommand {
+			return ContactCardGetCommand{AccountId: accountId, Ids: []string{id}}
+		},
+		func(resp ContactCardSetResponse) map[string]SetError { return resp.NotUpdated },
+		func(resp ContactCardGetResponse) ContactCard { return resp.List[0] },
+		id, changes,
+		ctx,
+	)
+}

pkg/jmap/api_event.go

@@ -29,7 +29,7 @@ func (j *Client) QueryCalendarEvents(accountIds []string, //NOSONAR
 				Results:             get.List,
 				CanCalculateChanges: query.CanCalculateChanges,
 				Position:            query.Position,
-				Total:               uintPtrIf(query.Total, calculateTotal),
+				Total:               uintPtrIfPtr(query.Total, calculateTotal),
 				Limit:               query.Limit,
 			}
 		},
@@ -103,3 +103,18 @@ func (j *Client) DeleteCalendarEvent(accountId string, destroyIds []string, ctx
 		ctx,
 	)
 }
+
+func (j *Client) UpdateCalendarEvent(accountId string, id string, changes CalendarEventChange, ctx Context) (CalendarEvent, SessionState, State, Language, Error) {
+	return update(j, "UpdateCalendarEvent", CalendarEventType,
+		func(update map[string]PatchObject) CalendarEventSetCommand {
+			return CalendarEventSetCommand{AccountId: accountId, Update: update}
+		},
+		func(id string) CalendarEventGetCommand {
+			return CalendarEventGetCommand{AccountId: accountId, Ids: []string{id}}
+		},
+		func(resp CalendarEventSetResponse) map[string]SetError { return resp.NotUpdated },
+		func(resp CalendarEventGetResponse) CalendarEvent { return resp.List[0] },
+		id, changes,
+		ctx,
+	)
+}

pkg/jmap/error.go

@@ -39,6 +39,7 @@ const (
 	JmapErrorSocketPushUnsupported
 	JmapErrorMissingCreatedObject
 	JmapInvalidObjectState
+	JmapPatchObjectSerialization
 )
 
 var (