adding occupants that are not in LDAP in occupant table, still need to add them to detail table

2 files changed, 51 insertions, 2 deletions

diff --git a/lib/d2/bin/d2_agi_db_setup.py b/lib/d2/bin/d2_agi_db_setup.py
index 4cf3602..2df60ef 100644
--- a/lib/d2/bin/d2_agi_db_setup.py
+++ b/lib/d2/bin/d2_agi_db_setup.py
@@ -1,4 +1,5 @@
 import argparse
+import hashlib
 from d2.config import Config
 from d2.app.model.static import StaticData
 from d2.db import Base
@@ -6,6 +7,8 @@ from d2.db import Location
 from d2.db import Map
 from d2.db import Room
 from d2.db import Floor
+from d2.db import OccupantType
+from d2.db import Occupant
 
 class Args(object):
 
@@ -91,6 +94,47 @@ class PopulateMap(object):
         return self._db.session.query(Map).filter('location_id=:location_id').params(
                 location_id=map.get('location_id')).first()
 
+class PopulateSpecialOccupants(object):
+
+    NAMES = {'person': [u'CSR', u'Temp'],
+             'work area': [u'Cirith Ungol', u'Orodruin'],
+             'restroom': [u"Men's Restroom", u"Women's Restroom"]
+            }
+    KEY = unicode(hashlib.md5(u'Temp').hexdigest())
+
+    def __init__(self, config):
+        self._log = config.log
+        self._db = config.db
+
+    def __call__(self):
+        s = StaticData.load(self._db)
+        occupant_type_id_for_person = s().occupant_type.person
+        for type, names in self.NAMES.iteritems():
+            if type == 'person':
+                type_id = s().occupant_type.person
+            elif type == 'work area':
+                type_id = s().occupant_type.work_area
+            elif type == 'restroom':
+                type_id = s().occupant_type.restroom
+
+            for name in names:
+                if not self._get(name):
+                    data = dict(occupant_type_id = type_id, 
+                                key = self._get_key(name),
+                                active = True)
+                    obj = Occupant.from_dict(data)
+                    self._db.session.add(obj)
+                    self._db.session.commit()
+                    message = "{0} occupant was added".format(name)
+                    self._log.info(message)
+
+    def _get_key(self, name):
+        return unicode(hashlib.md5(unicode(name)).hexdigest())
+
+    def _get(self, name):
+        return self._db.session.query(Occupant).filter(
+                      'key=:key').params(
+                      key=self._get_key(name)).first()
 
 class PopulateTables(object):
 
@@ -98,6 +142,7 @@ class PopulateTables(object):
         self._chain = [
             PopulateLocation(config),
             PopulateMap(config),
+            PopulateSpecialOccupants(config)
         ]
 
     def __call__(self):
@@ -106,6 +151,6 @@ class PopulateTables(object):
 
 
 def main():
-    config = Config()()
+    config = Config.load()
     populate_tables = PopulateTables(config)
     populate_tables()
diff --git a/lib/d2/bin/d2_db_setup.py b/lib/d2/bin/d2_db_setup.py
index 511677e..5eb0cae 100644
--- a/lib/d2/bin/d2_db_setup.py
+++ b/lib/d2/bin/d2_db_setup.py
@@ -187,7 +187,11 @@ class PopulateDetailType(object):
 
 class PopulateOccupantType(object):
 
-    NAMES = [u'Person', u'Conference Room', u'Work Area', u'Empty',
+    NAMES = [u'Person', 
+             u'Conference Room', 
+             u'Work Area', 
+             u'Empty',
+             u'Restroom',
              ]
 
     def __init__(self, config):