From 547898564ed103ff94101ce1e2b4991e41510592 Mon Sep 17 00:00:00 2001
From: Francisco Lopez Sancho <fran@Franciscos-MacBook-Pro.local>
Date: Wed, 12 Jun 2013 23:36:54 +0200
Subject: [PATCH] Adding activities

---
 api-docs.json       |  4 +++
 api-docs/activities | 83 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 api-docs/activities

diff --git a/api-docs.json b/api-docs.json
index 2eaa5ae..cf47884 100644
--- a/api-docs.json
+++ b/api-docs.json
@@ -54,6 +54,10 @@
     {
       "path":"/api-docs/videosNoApi",
       "description":"Operations attaching videos with users"
+    },
+    {
+      "path":"/api-docs/activities",
+      "description":"Operations attaching videos with users"
     }
   ]
 }
diff --git a/api-docs/activities b/api-docs/activities
new file mode 100644
index 0000000..a5a321d
--- /dev/null
+++ b/api-docs/activities
@@ -0,0 +1,83 @@
+{
+    "apiVersion": "0.2", 
+    "apis": [
+        {
+            "description": "Operations about Activities", 
+            "operations": [
+                {
+                    "errorResponses": [
+                        {
+                            "code": 400, 
+                            "reason": "User with given id doesn't exist"
+                        }
+                    ], 
+                    "httpMethod": "GET", 
+                    "nickname": "obtain", 
+                    "notes": "Creating tokens", 
+                    "parameters": [
+                        {
+                            "allowMultiple": false, 
+                            "dataType": "string", 
+                            "description": "User", 
+                            "name": "id", 
+                            "paramType": "path", 
+                            "required": true
+                        }, 
+                        {
+                            "allowMultiple": false, 
+                            "dataType": "string", 
+                            "description": "Created after date. format: yyyy-mm-dd", 
+                            "name": "from", 
+                            "paramType": "query", 
+                            "required": false
+                        }, 
+                        {
+                            "allowMultiple": false, 
+                            "dataType": "string", 
+                            "description": "Create equals or before date. format: yyyy-mm-dd", 
+                            "name": "to", 
+                            "paramType": "query", 
+                            "required": false
+                        }
+                    ], 
+                    "responseClass": "Activity", 
+                    "summary": "Gets videos that reply to opinions from user passed and ticckles from same user. Optional to filter by dates"
+                }
+            ], 
+            "path": "/api/activity/{id}"}
+    ], 
+    "basePath": "http://192.168.1.131:3000/", 
+    "models": {
+        "Video": {
+            "id": "Video", 
+            "properties": {
+                "type": {
+                    "type": "string"
+                }, 
+                "date": {
+                    "type": "date"
+                }, 
+                "title": {
+                    "type": "string"
+                }, 
+                "id": {
+                    "type": "int"
+                }, 
+                "topic_id": {
+                    "type": "int"
+                }, 
+                "user_id": {
+                    "type": "int"
+                }, 
+                "user_avatar": {
+                    "type": "file"
+                }, 
+                "user_name": {
+                    "type": "string"
+                }
+            }
+        }
+    }, 
+    "resourcePath": "/store", 
+    "swaggerVersion": "1.1"
+}