From 912d6cd6f1e869ac2f25bed1323a3474750089de Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Wed, 19 Sep 2012 14:55:56 -0400
Subject: [PATCH] Move common code for updating modules in mongo to a single
 helper function that also handles creating the item if it doesn't already
 exist

---
 .../lib/xmodule/xmodule/modulestore/mongo.py  | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index 882fa9dda1..bf56e30805 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -254,6 +254,24 @@ class MongoModuleStore(ModuleStoreBase):
         except pymongo.errors.DuplicateKeyError:
             raise DuplicateItemError(location)
 
+    def _update_single_item(self, location, update):
+        """
+        Set update on the specified item, and raises ItemNotFoundError
+        if the location doesn't exist
+        """
+
+        # See http://www.mongodb.org/display/DOCS/Updating for
+        # atomic update syntax
+        result = self.collection.update(
+            {'_id': Location(location).dict()},
+            {'$set': update},
+            multi=False,
+            upsert=True,
+        )
+        if result['n'] == 0:
+            raise ItemNotFoundError(location)
+
+
     def update_item(self, location, data):
         """
         Set the data in the item specified by the location to
@@ -263,13 +281,7 @@ class MongoModuleStore(ModuleStoreBase):
         data: A nested dictionary of problem data
         """
 
-        # See http://www.mongodb.org/display/DOCS/Updating for
-        # atomic update syntax
-        self.collection.update(
-            {'_id': Location(location).dict()},
-            {'$set': {'definition.data': data}},
-
-        )
+        self._update_single_item(location, {'definition.data': data})
 
     def update_children(self, location, children):
         """
@@ -280,12 +292,7 @@ class MongoModuleStore(ModuleStoreBase):
         children: A list of child item identifiers
         """
 
-        # See http://www.mongodb.org/display/DOCS/Updating for
-        # atomic update syntax
-        self.collection.update(
-            {'_id': Location(location).dict()},
-            {'$set': {'definition.children': children}}
-        )
+        self._update_single_item(location, {'definition.children': children})
 
     def update_metadata(self, location, metadata):
         """
@@ -296,12 +303,7 @@ class MongoModuleStore(ModuleStoreBase):
         metadata: A nested dictionary of module metadata
         """
 
-        # See http://www.mongodb.org/display/DOCS/Updating for
-        # atomic update syntax
-        self.collection.update(
-            {'_id': Location(location).dict()},
-            {'$set': {'metadata': metadata}}
-        )
+        self._update_single_item(location, {'metadata': metadata})
 
     def get_parent_locations(self, location):
         '''Find all locations that are the parents of this location.  Needed