1 files changed, 25 insertions, 13 deletions

diff --git a/lib/d2/app/adapters/forge.py b/lib/d2/app/adapters/forge.py
index 3590d23..792725f 100644
--- a/lib/d2/app/adapters/forge.py
+++ b/lib/d2/app/adapters/forge.py
@@ -41,12 +41,12 @@ class ForgeAdapter(BaseAdapter):
         self._db.session.add(obj_empty)
         self._db.session.commit()
 
-    def add_occupant_to_plot(self, plot_id, occupant_id, 
+    def add_occupant_to_plot(self, plot_id, occupant_id,
             date_start=None, date_end=None):
         """ add an occupant to a plot
         """
         if self._is_empty_plot(plot_id, date_start):
-            empty_record = self._fetch_forge_by_plot_and_occupant_id(plot_id, 
+            empty_record = self._fetch_forge_by_plot_and_occupant_id(plot_id,
                                     self._static.occupant.empty, date_start)
             self._set_override(empty_record)
             self._set_end(empty_record, date_end)
@@ -64,30 +64,42 @@ class ForgeAdapter(BaseAdapter):
         self._db.session.add(obj)
         self._db.session.commit()
         return obj
-         
+
     def remove_occupant_from_plot(self, plot_id, occupant_id,
             date_start=None, date_end=None):
         """ remove an occupant from a plot
         """
-        forge_record = self._fetch_forge_by_plot_and_occupant_id(plot_id, 
+        forge_record = self._fetch_forge_by_plot_and_occupant_id(plot_id,
                             occupant_id, date_start)
         if forge_record:
             self._set_override(forge_record)
             self._set_end(forge_record, date_end)
 
-        # if no more occupants in plot_id, mark it as empty  
+        # if no more occupants in plot_id, mark it as empty
         records = self._fetch_forge_by_plot_id(plot_id, date_start)
         if not records:
             self.add_empty_user(plot_id)
-                
+
     def get_forge_by_occupant_id(self, occupant_id, date_start=None):
-        date_start = self.build_date(date_start)
-        return self._fetch_forge_by_occupant_id(occupant_id, date_start)
-        
+        if occupant_id:
+            date_start = self.build_date(date_start)
+            return self._fetch_forge_by_occupant_id(occupant_id, date_start)
+        return []
+
     def get_forge_by_plot_id(self, plot_id, date_start=None):
         date_start = self.build_date(date_start)
         return self._fetch_forge_by_plot_id(plot_id, date_start)
-        
+
+    def get_occupant_other_plots(self, plot_id=None, occupant_id=None,
+                               date_start=None):
+        out = []
+        date_start = self.build_date(date_start)
+        results = self._fetch_forge_by_occupant_id(occupant_id, date_start)
+        for row in results:
+            if not row.plot_id == plot_id:
+                out.append(row)
+        return out
+
     def get_all(self, date_start=None):
         date_start = self.build_date(date_start)
         records = self._fetch_all(date_start)
@@ -114,8 +126,8 @@ class ForgeAdapter(BaseAdapter):
         self._db.session.commit()
 
     def _is_empty_plot(self, plot_id, date_start):
-        """ return True if and only if one record exists for the given plot_id 
-            and the occupant_id in that record is empty user id 
+        """ return True if and only if one record exists for the given plot_id
+            and the occupant_id in that record is empty user id
         """
         is_empty = True
         records = self._fetch_forge_by_plot_id(plot_id, date_start)
@@ -131,7 +143,7 @@ class ForgeAdapter(BaseAdapter):
 
         return is_empty
 
-    def _fetch_forge_by_plot_and_occupant_id(self, plot_id, 
+    def _fetch_forge_by_plot_and_occupant_id(self, plot_id,
             occupant_id, date_start):
         date_start = self.build_date(date_start)
         return self._db.session.query(self._forge