1 files changed, 69 insertions, 16 deletions
diff --git a/sca-cpp/trunk/hosting/server/composites.py b/sca-cpp/trunk/hosting/server/composites.py
index 2b59ebdab4..970bc98a5c 100644
--- a/sca-cpp/trunk/hosting/server/composites.py
+++ b/sca-cpp/trunk/hosting/server/composites.py
@@ -16,29 +16,82 @@
 #  under the License.
 
 # App composites collection implementation
+from time import strftime
 from util import *
+from sys import debug
 
-# Convert an id to an app id
-def appid(id):
+# Convert an id to a composite id
+def compid(id):
     return ("apps", car(id), "app.composite")
 
-# Put an app into the apps db
-def put(id, app, cache):
-    comp = cdr(cadddr(car(app)))
-    cache.put(appid(id), comp)
-    return True
+# Put a composite into the composite db
+def put(id, comp, user, cache, apps):
+    debug('composites.py::put::id', id)
+    debug('composites.py::put::comp', comp)
 
-# Get an app from the apps db
-def get(id, cache):
+    # Get the requested app
+    app = apps.get(id);
+    if isNil(app) or app is None:
+        debug('composites.py::put', 'app not found', id)
+        return False
+
+    # Check app author
+    author = cadr(assoc("'author", car(app)))
+    if author != user.get(()):
+        debug('composites.py::put', 'different author', author)
+        return False
+
+    # Update the composite in the composite db
+    compentry = (("'entry", assoc("'title", car(app)), ("'id", car(id)), ("'author", user.get(())), ("'updated", strftime('%b %d, %Y')), assoc("'content", car(comp))),)
+    debug('composites.py::put::compentry', compentry)
+    return cache.put(compid(id), compentry)
+
+# Get a composite from the composite db
+def get(id, user, cache, apps):
+    debug('composites.py::get::id', id)
     if isNil(id):
         return (("'feed", ("'title", "Composites"), ("'id", "composites")),)
-    app = cache.get(appid(id));
+
+    # Get the requested app
+    app = apps.get(id)
+    if isNil(app) or app is None:
+        debug('composites.py::get', 'app not found', id)
+
+        # Return a default new composite
+        return (("'entry", ("'title", car(id)), ("'id", car(id)), ("'author", user.get(())), ("'updated", strftime('%b %d, %Y'))),)
+
+    # Get the requested composite
+    comp = cache.get(compid(id));
+    if isNil(comp) or comp is None:
+        debug('composites.py::get', 'composite not found', id)
+
+        # Return a default new composite
+        return (("'entry", ("'title", car(id)), ("'id", car(id)), assoc("'author", car(app)), assoc("'updated", car(app))),)
+
+    # Return the composite
+    def updated(u):
+        return assoc("'updated", car(app)) if isNil(u) or u is None else u
+
+    compentry = (("'entry", assoc("'title", car(app)), ("'id", car(id)), assoc("'author", car(app)), updated(assoc("'updated", car(comp))), assoc("'content", car(comp))),)
+    debug('composites.py::get::compentry', compentry)
+    return compentry
+
+# Delete a composite from the composite db
+def delete(id, user, cache, apps):
+    debug('composites.py::delete::id', id)
+
+    # Get the requested app
+    app = apps.get(id);
     if isNil(app) or app is None:
-        return (("'entry", ("'title", car(id)), ("'id", car(id))),)
-    return (("'entry", ("'title", car(id)), ("'id", car(id)), ("'content", car(app))),)
+        debug('composites.py::delete', 'app not found', id)
+        return False
+
+    # Check app author
+    author = cadr(assoc("'author", car(app)))
+    if author != user.get(()):
+        debug('composites.py::delete', 'different author', author)
+        return False
 
-# Delete an app from the apps db
-def delete(id, cache):
-    cache.delete(appid(id))
-    return True
+    # Delete the composite
+    return cache.delete(compid(id))