1.1 --- a/imiptools/content.py Thu Feb 05 19:01:22 2015 +0100
1.2 +++ b/imiptools/content.py Thu Feb 05 19:02:00 2015 +0100
1.3 @@ -175,8 +175,39 @@
1.4 def update_freebusy(self, freebusy, attendee, periods):
1.5 return update_freebusy(freebusy, attendee, periods, self.obj.get_value("TRANSP"), self.uid, self.store)
1.6
1.7 - def update_freebusy_for_other(self, freebusy, user, other, periods):
1.8 - return update_freebusy_for_other(freebusy, user, other, periods, self.obj.get_value("TRANSP"), self.uid, self.store)
1.9 + def update_freebusy_from_organiser(self, attendee, organiser_item):
1.10 +
1.11 + """
1.12 + For the 'attendee', record free/busy information from the
1.13 + 'organiser_item' (a value plus attributes).
1.14 + """
1.15 +
1.16 + organiser, organiser_attr = organiser_item
1.17 +
1.18 + if organiser != attendee:
1.19 + freebusy = self.store.get_freebusy_for_other(attendee, organiser)
1.20 +
1.21 + if organiser_attr.get("PARTSTAT") != "DECLINED":
1.22 + update_freebusy_for_other(freebusy, attendee, organiser,
1.23 + self.obj.get_periods(), self.obj.get_value("TRANSP"),
1.24 + self.uid, self.store)
1.25 + else:
1.26 + self.remove_from_freebusy_for_other(freebusy, attendee, organiser)
1.27 +
1.28 + def update_freebusy_from_attendees(self, organiser, attendees):
1.29 +
1.30 + "For the 'organiser', record free/busy information from 'attendees'."
1.31 +
1.32 + for attendee, attendee_attr in attendees.items():
1.33 + if organiser != attendee:
1.34 + freebusy = self.store.get_freebusy_for_other(organiser, attendee)
1.35 +
1.36 + if attendee_attr.get("PARTSTAT") != "DECLINED":
1.37 + update_freebusy_for_other(freebusy, organiser, attendee,
1.38 + self.obj.get_periods(), self.obj.get_value("TRANSP"),
1.39 + self.uid, self.store)
1.40 + else:
1.41 + self.remove_from_freebusy_for_other(freebusy, organiser, attendee)
1.42
1.43 def can_schedule(self, freebusy, periods):
1.44 return can_schedule(freebusy, periods, self.uid)
1.45 @@ -328,6 +359,36 @@
1.46
1.47 return False
1.48
1.49 + def merge_attendance(self, attendees, identity):
1.50 +
1.51 + """
1.52 + Merge attendance from the current object's 'attendees' into the version
1.53 + stored for the given 'identity'.
1.54 + """
1.55 +
1.56 + obj = self.get_object(identity)
1.57 +
1.58 + if not obj or not self.have_new_object(identity, obj=obj):
1.59 + return False
1.60 +
1.61 + # Get attendee details in a usable form.
1.62 +
1.63 + attendee_map = uri_dict(obj.get_value_map("ATTENDEE"))
1.64 +
1.65 + for attendee, attendee_attr in attendees.items():
1.66 +
1.67 + # Update attendance in the loaded object.
1.68 +
1.69 + attendee_map[attendee] = attendee_attr
1.70 +
1.71 + # Set the new details and store the object.
1.72 +
1.73 + obj["ATTENDEE"] = attendee_map.items()
1.74 +
1.75 + self.store.set_event(identity, self.uid, obj.to_node())
1.76 +
1.77 + return True
1.78 +
1.79 def update_dtstamp(self):
1.80
1.81 "Update the DTSTAMP in the current object."
2.1 --- a/imiptools/handlers/person.py Thu Feb 05 19:01:22 2015 +0100
2.2 +++ b/imiptools/handlers/person.py Thu Feb 05 19:02:00 2015 +0100
2.3 @@ -47,16 +47,6 @@
2.4 if not self.have_new_object(attendee):
2.5 continue
2.6
2.7 - # Record other party free/busy information.
2.8 -
2.9 - if organiser != attendee:
2.10 - freebusy = self.store.get_freebusy_for_other(attendee, organiser)
2.11 -
2.12 - if organiser_attr.get("PARTSTAT") != "DECLINED":
2.13 - self.update_freebusy_for_other(freebusy, attendee, organiser, self.obj.get_periods())
2.14 - else:
2.15 - self.remove_from_freebusy_for_other(freebusy, attendee, organiser)
2.16 -
2.17 # Store the object and queue any request.
2.18
2.19 self.store.set_event(attendee, self.uid, self.obj.to_node())
2.20 @@ -75,38 +65,13 @@
2.21 if self.publisher:
2.22 self.publisher.set_freebusy(attendee, freebusy)
2.23
2.24 + self.update_freebusy_from_organiser(attendee, organiser_item)
2.25 +
2.26 # As organiser, update attendance.
2.27
2.28 else:
2.29 - obj = self.get_object(organiser)
2.30 -
2.31 - if obj and self.have_new_object(organiser, obj=obj):
2.32 -
2.33 - # Get attendee details in a usable form.
2.34 -
2.35 - attendee_map = uri_dict(obj.get_value_map("ATTENDEE"))
2.36 -
2.37 - for attendee, attendee_attr in attendees.items():
2.38 -
2.39 - # Update attendance in the loaded object.
2.40 -
2.41 - attendee_map[attendee] = attendee_attr
2.42 -
2.43 - # Record other party free/busy information.
2.44 -
2.45 - if organiser != attendee:
2.46 - freebusy = self.store.get_freebusy_for_other(organiser, attendee)
2.47 -
2.48 - if attendee_attr.get("PARTSTAT") != "DECLINED":
2.49 - self.update_freebusy_for_other(freebusy, organiser, attendee, self.obj.get_periods())
2.50 - else:
2.51 - self.remove_from_freebusy_for_other(freebusy, organiser, attendee)
2.52 -
2.53 - # Set the new details and store the object.
2.54 -
2.55 - obj["ATTENDEE"] = attendee_map.items()
2.56 -
2.57 - self.store.set_event(organiser, self.uid, obj.to_node())
2.58 + if self.merge_attendance(attendees, organiser):
2.59 + self.update_freebusy_from_attendees(organiser, attendees)
2.60
2.61 return True
2.62
3.1 --- a/imiptools/handlers/person_outgoing.py Thu Feb 05 19:01:22 2015 +0100
3.2 +++ b/imiptools/handlers/person_outgoing.py Thu Feb 05 19:02:00 2015 +0100
3.3 @@ -53,9 +53,13 @@
3.4
3.5 identity, attr = item
3.6
3.7 - # Store the object.
3.8 + # Update the object.
3.9
3.10 - self.store.set_event(identity, self.uid, self.obj.to_node())
3.11 + if from_organiser:
3.12 + self.store.set_event(identity, self.uid, self.obj.to_node())
3.13 + else:
3.14 + organiser_item, attendees = self.require_organiser_and_attendees(from_organiser)
3.15 + self.merge_attendance(attendees, identity)
3.16
3.17 # Remove any associated request.
3.18