From ed9611678b22e80e272d11f1b73c8e63b605e0f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 8 Jul 2008 15:44:50 +0000
Subject: [PATCH] Monotone-Parent: a12bd5b03a0fa8ed21ec4b06e2b7b59ddf2c3ca2
 Monotone-Revision: 4919aeeff629dcb3750bd1e1f28cf06348a5da02

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-08T15:44:50
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  5 ++
 .../Appointments/SOGoAppointmentFolder.m      | 89 ++++---------------
 2 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9288f130..26d43123b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-07-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder
+	-caldavEventRequest:eventwithContent:iCalStringfrom:originatorto:recipients]):
+	simplified method since REPLY and REQUEST posts are very similar.
+
 	* SoObjects/Appointments/SOGoAppointmentObject.m
 	([SOGoAppointmentObject -postCalDAVEventReplyTo:recipients]): new
 	method that handle CalDAV REPLY posts by updating the event in the
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 1ec40a0fc..658cd6a52 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1732,89 +1732,32 @@ _selectorForProperty (NSString *property)
   return responseElement;
 }
 
-- (NSDictionary *) _postCalDAVEventRequest: (NSString *) iCalString
-				   withUID: (NSString *) uid
-					to: (NSArray *) recipients
-{
-  NSString *filename;
-  SOGoAppointmentObject *apt;
-  NSDictionary *responseElement;
-  NSMutableArray *elements;
-
-  filename = [NSString stringWithFormat: @"%@.ics", uid];
-  apt = [SOGoAppointmentObject objectWithName: filename
-			       andContent: iCalString
-			       inContainer: self];
-  elements = [apt postCalDAVEventRequestTo: recipients];
-  responseElement = davElementWithContent (@"schedule-response",
-					   XMLNS_CALDAV, elements);
-
-  return responseElement;
-}
-
-- (NSDictionary *) _postCalDAVEventReply: (iCalEvent *) event
-				    from: (NSString *) originator
-{
-  NSDictionary *responseElement, *attendeeCode;
-  NSMutableArray *content;
-  iCalPerson *attendee;
-  NSException *ex;
-  SOGoAppointmentObject *apt;
-
-  /* this is a fake success status */
-  apt = [self lookupComponentByUID: [event uid]];
-  if ([apt isKindOfClass: [SOGoAppointmentObject class]])
-    {
-      content = [NSMutableArray new];
-      [content addObject: davElementWithContent (@"recipient", XMLNS_CALDAV,
-						 originator)];
-
-#warning cleanup: add a method to POST replies from CalDAV from SOGoAppointmentObject
-      attendee = [event findParticipant: [context activeUser]];
-      if (attendee)
-	{
-	  ex = [apt changeParticipationStatus: [attendee partStat]];
-	  if (ex)
-	    attendeeCode = davElementWithContent (@"request-status", XMLNS_CALDAV,
-						  @"3.1;Invalid property value");
-	  else
-	    attendeeCode = davElementWithContent (@"request-status", XMLNS_CALDAV,
-						  @"2.0;Success");
-	}
-      else
-	attendeeCode = davElementWithContent (@"request-status", XMLNS_CALDAV,
-					      @"3.7;Invalid Calendar User");
-      [content addObject: attendeeCode];
-
-      responseElement
-	= davElementWithContent (@"schedule-response", XMLNS_CALDAV,
-				 davElementWithContent (@"response", XMLNS_CALDAV,
-							content));
-      [content release];
-    }
-  else
-    responseElement = nil;
-
-  return responseElement;
-}
-
+#warning we should merge this code with the code from the iTIP interpreter in MailPartViewer
 - (NSDictionary *) caldavEventRequest: (iCalEvent *) event
 			  withContent: (NSString *) iCalString
 				 from: (NSString *) originator
 				   to: (NSArray *) recipients
 {
   NSDictionary *responseElement;
-  NSString *method;
+  NSArray *elements;
+  NSString *method, *filename;
+  SOGoAppointmentObject *apt;
 
+  filename = [NSString stringWithFormat: @"%@.ics", [event uid]];
+  apt = [SOGoAppointmentObject objectWithName: filename
+			       andContent: iCalString
+			       inContainer: self];
   method = [[event parent] method];
   if ([method isEqualToString: @"REQUEST"])
-    responseElement = [self _postCalDAVEventRequest: iCalString
-			    withUID: [event uid]
-			    to: recipients];
+    elements = [apt postCalDAVEventRequestTo: recipients];
   else if ([method isEqualToString: @"REPLY"])
-    responseElement = [self _postCalDAVEventReply: event
-			    withUID: [event uid]
-			    from: originator];
+   elements = [apt postCalDAVEventReplyTo: recipients];
+  else
+    elements = nil;
+
+  if (elements)
+    responseElement = davElementWithContent (@"schedule-response",
+					     XMLNS_CALDAV, elements);
   else
     responseElement = nil;