From 48617debcdcbe097f514ac548a59947c0e8f78b1 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Thu, 5 Apr 2018 11:30:47 +0300
Subject: [PATCH 1/9] feat(schedule): schedule collection checks

---
 application/.DS_Store                         | Bin 6148 -> 6148 bytes
 application/base_model.py                     |   3 +-
 application/helpers.py                        |   8 ++++-
 application/models.py                         |   6 ++--
 application/static/.DS_Store                  | Bin 6148 -> 6148 bytes
 application/templates/collection_details.html |  26 ++++++++++++++++
 application/views.py                          |   7 +++--
 config.py                                     |   1 +
 main.py                                       |  29 +++++++++++++++++-
 migrations/versions/5da1e973b109_.py          |  28 +++++++++++++++++
 requirements.txt                              |   1 +
 test/application/__init__.py                  |   0
 test/application/test_auth.py                 |   2 +-
 test/application/test_auth_models.py          |   2 +-
 test/application/test_collection_model.py     |   2 +-
 test/application/test_request_model.py        |   4 +--
 test/application/test_response_model.py       |   2 +-
 test/application/test_team_model.py           |   2 +-
 test/application/test_views.py                |   2 +-
 test/base.py                                  |   3 +-
 20 files changed, 107 insertions(+), 21 deletions(-)
 create mode 100644 migrations/versions/5da1e973b109_.py
 delete mode 100644 test/application/__init__.py

diff --git a/application/.DS_Store b/application/.DS_Store
index e9cfff9c0503a42c119b38dae2e68b87802bd4b8..c6b4c1d6e37a4644bbfdb460ded087b25f3a2105 100644
GIT binary patch
delta 98
zcmZoMXfc@J&&abeU^g=(&tx8!>7u+0Neqb$#SEzo@eH{P`3xyQR?g%HETXKf3=9l2
yCeL88=H+6@0Esdb0Lh}s_gJJEXKX&f!pg{DW^SOPU~Fcx`6}xX#?9;;fB6B#2N{z9

delta 48
zcmZoMXfc@J&&ahgU^g=(*JK`+>67oW7)*9#{l#HqVxgm8WNf<Gne7PU#D=`h>>Pjj
E0dnCFXaE2J

diff --git a/application/base_model.py b/application/base_model.py
index 1afc056..ce7ca6e 100644
--- a/application/base_model.py
+++ b/application/base_model.py
@@ -1,7 +1,6 @@
-from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.sql import func
 from sqlalchemy.exc import SQLAlchemyError
-
+from flask_sqlalchemy import SQLAlchemy
 db = SQLAlchemy()
 
 
diff --git a/application/helpers.py b/application/helpers.py
index 6a9feec..cb6398f 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -1,7 +1,13 @@
 import requests
 import json
 import re
-from application.models import Request, Response, ResponseSummary, ResponseAssertion
+from application.models import Request, Response, ResponseSummary, ResponseAssertion, Collection
+
+
+def collection_scheduler():
+	collections = Collection.fetch_all()
+	for collection in collections:
+		run_collection_checks(collection.id)
 
 
 def valid_url(url):
diff --git a/application/models.py b/application/models.py
index 556d765..49f579c 100644
--- a/application/models.py
+++ b/application/models.py
@@ -1,5 +1,4 @@
 from application.base_model import Base, db
-from sqlalchemy.orm import backref
 
 # many to many relationship between users and teams
 team_members = db.Table(
@@ -32,12 +31,11 @@ class Collection(Base):
 	name = db.Column(db.String(128), nullable=False)
 	user_id = db.Column(db.Integer, db.ForeignKey('User.id'), nullable=False)
 	team_id = db.Column(db.Integer, db.ForeignKey('Team.id'))
-	requests = db.relationship('Request',
-                    backref='collection', cascade='all, delete-orphan')
+	requests = db.relationship('Request', backref='collection', cascade='all, delete-orphan')
 	response_summary = db.relationship(
 		'ResponseSummary', backref='collection', lazy=True
 	)
-	requests = db.relationship('Request', backref='collection', lazy=True)
+	schedule = db.Column(db.Time)
 	
 	def __str__(self):
 		return self.name
diff --git a/application/static/.DS_Store b/application/static/.DS_Store
index a84805a192b6c17fa565ce563182b800239256bf..1711bbffbc10dcfc1620312ceef407b47128c7fe 100644
GIT binary patch
delta 146
zcmZoMXfc@J&&azmU^g=(?_@g`vB^p-2RY2l4RjQY%}gf0X6X#(W=La5WGG|EWJqSn
zXUJpFgRnev@{^Nt@{<@C7z7v?7{!6K#(yvXvKScHfU0tV`qCLv8H&-=woXoEJ&tUN
P<K|K}1IEql9Dn%%12QJK

delta 65
zcmZoMXfc@J&&a(oU^g=(_hdU3vB^p-2RV#PEOZo%j7=xMX6c-KjdcgIfaB)tYzB-I
M8<IA&bNuB80EQG4k^lez

diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index b6a8373..543ff6b 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -12,12 +12,14 @@ <h4 class="checkList__Heading">Show</h4>
                 <nav class="nav flex-column navLinks" role="tablist">
                     <a class="nav-link active" data-toggle="tab" href="#results" role="tab"><i class="fa fa-list"></i><span>Summary</span></a>
                     <a class="nav-link" data-toggle="tab" href="#editor" role="tab"><i class="fa fa-pencil-alt"></i><span>Editor</span></a>
+                     <a class="nav-link" data-toggle="tab" href="#schedule" role="tab"><i class="fa fa-clock"></i><span>Schedule</span></a>
                 
                 <hr>
                 <h4 class="checkList__Heading">Results</h4>
                 </nav>
             </div>
             <div class="tab-content resultsContainer">
+<<<<<<< HEAD
                 <div class="collectionHeader">
                     <span class="collectionName">{{context.collection_name}}</span>
                     <span>
@@ -27,6 +29,9 @@ <h4 class="checkList__Heading">Results</h4>
                         </span>
                     </span>
                 </div>
+=======
+                <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
+>>>>>>> feat(schedule): schedule collection checks
                 <div id="results" class="tab-pane active"></div>
                 <div id="editor" class="tab-pane">
                     <div id="checks">
@@ -46,6 +51,27 @@ <h4 class="checkList__Heading">Results</h4>
                     </div>
                           
                 </div>
+                <div id="schedule" class="tab-pane active">
+                    <div class="row">
+                        <div class='col-sm-6'>
+                            <div class="form-group">
+                                <div class='input-group date' id='datetimepicker3'>
+                                    <input type='text' class="form-control" />
+                                    <span class="input-group-addon">
+                                        <span class="glyphicon glyphicon-time"></span>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                        <script type="text/javascript">
+                            $(function () {
+                                $('#datetimepicker3').datetimepicker({
+                                    format: 'LT'
+                                });
+                            });
+                        </script>
+                    </div>
+                </div>
             </div>
         </div>
     </main>
diff --git a/application/views.py b/application/views.py
index c08f9a5..4b0044c 100644
--- a/application/views.py
+++ b/application/views.py
@@ -1,9 +1,7 @@
-from datetime import datetime
-
 from flask import Blueprint, render_template, request, jsonify
 
 from application.auth.helpers import (current_user, authentication_required)
-from application.models import Team, Collection, RequestAssertion, ResponseAssertion, ResponseSummary, Request, Header
+from application.models import Team, Collection, RequestAssertion, ResponseSummary, Request, Header
 from application.helpers import run_collection_checks
 
 app_view = Blueprint('app_view', __name__, template_folder='templates')
@@ -124,6 +122,9 @@ def collection_details(collection_id=None):
         results.append(responseSet)
     context['results'] = results
     context['collection_name'] = Collection.get(collection_id).name
+    collection = Collection.get(collection_id)
+    context["collection"] = collection.serialize()
+    
     return render_template('collection_details.html', context=context)
 
 
diff --git a/config.py b/config.py
index 1b342ed..fb3db55 100644
--- a/config.py
+++ b/config.py
@@ -44,6 +44,7 @@ class DevelopmentConfiguration(ConfigWithCustomDBEngineParams):
     DEBUG = True
     SQLALCHEMY_ECHO = True
     SQLALCHEMY_TRACK_MODIFICATIONS = True
+    ALLOWED_HOSTS = "http://localhost:5000"
 
 
 class TestingConfiguration(Config):
diff --git a/main.py b/main.py
index 0883c1b..7fff0ff 100644
--- a/main.py
+++ b/main.py
@@ -1,13 +1,17 @@
 import os
+import logging
 
 from flask import Flask
 from flask_migrate import Migrate
+import threading
+import time
 
 from config import app_configuration
 
 from application import models
 from application.views import app_view
 from application.auth.views import auth
+from application.helpers import collection_scheduler
 
 os.sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -31,13 +35,36 @@ def create_application(environment):
 
     # initilize migration commands
     Migrate(app, models.db)
-    
     return app
 
 
 app = create_application(os.getenv("FLASK_CONFIG") or "development")
 
+
+@app.before_first_request
+def active_job():
+    def run_job():
+        while True:
+            time.sleep(3)
+            collection_scheduler()
+    thread = threading.Thread(target=run_job)
+    thread.start()
+    
+
+def start_runner():
+    def start_loop():
+        while True:
+            logging.info('In start loop')
+            # collection_scheduler()
+            time.sleep(3)
+
+    logging.info('Started runner')
+    thread = threading.Thread(target=start_loop)
+    thread.start()
+
+
 if __name__ == "__main__":
     environment = os.getenv("FLASK_CONFIG")
     app = create_application(environment)
+    start_runner()
     app.run()
diff --git a/migrations/versions/5da1e973b109_.py b/migrations/versions/5da1e973b109_.py
new file mode 100644
index 0000000..4c12adf
--- /dev/null
+++ b/migrations/versions/5da1e973b109_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 5da1e973b109
+Revises: fac4670c01e6
+Create Date: 2018-04-04 14:06:43.047609
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '5da1e973b109'
+down_revision = 'fac4670c01e6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('Collection', sa.Column('schedule', sa.Time(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('Collection', 'schedule')
+    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
index 38e2f08..2a4874a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -51,6 +51,7 @@ PyYAML==3.12
 query-string==0.0.28
 requests==2.18.4
 rsa==3.4.2
+schedule==0.5.0
 six==1.11.0
 SQLAlchemy==1.2.2
 uritemplate==3.0.0
diff --git a/test/application/__init__.py b/test/application/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/test/application/test_auth.py b/test/application/test_auth.py
index f2a50c2..498f0ce 100644
--- a/test/application/test_auth.py
+++ b/test/application/test_auth.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase, user_payload
+from test.base import BaseTestCase, user_payload
 import json
 
 
diff --git a/test/application/test_auth_models.py b/test/application/test_auth_models.py
index 6d115bd..2a65ddc 100644
--- a/test/application/test_auth_models.py
+++ b/test/application/test_auth_models.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase, db
+from test.base import BaseTestCase
 from application.auth.models import User
 
 
diff --git a/test/application/test_collection_model.py b/test/application/test_collection_model.py
index cd62351..847aad9 100644
--- a/test/application/test_collection_model.py
+++ b/test/application/test_collection_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase, db
+from test.base import BaseTestCase
 from application.models import Collection, Team
 from application.auth.models import User
 
diff --git a/test/application/test_request_model.py b/test/application/test_request_model.py
index 0448763..c232e0c 100644
--- a/test/application/test_request_model.py
+++ b/test/application/test_request_model.py
@@ -1,5 +1,5 @@
-from ..base import BaseTestCase, db
-from application.models import Header, Request
+from test.base import BaseTestCase
+from application.models import Request
 
 
 class TestRequestModel(BaseTestCase):
diff --git a/test/application/test_response_model.py b/test/application/test_response_model.py
index 7ba98db..47375f1 100644
--- a/test/application/test_response_model.py
+++ b/test/application/test_response_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase
+from test.base import BaseTestCase
 from application.models import Response
 
 
diff --git a/test/application/test_team_model.py b/test/application/test_team_model.py
index 0ccd7a8..e317c2c 100644
--- a/test/application/test_team_model.py
+++ b/test/application/test_team_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase, db
+from test.base import BaseTestCase
 from application.models import Team
 from application.auth.models import User
 
diff --git a/test/application/test_views.py b/test/application/test_views.py
index c1860aa..93dcc7c 100644
--- a/test/application/test_views.py
+++ b/test/application/test_views.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase, user_payload
+from test.base import BaseTestCase, user_payload
 import json
 from application.models import db, Collection, Header, Request, RequestAssertion, Team
 from application.auth.models import User
diff --git a/test/base.py b/test/base.py
index 7906a64..ae65fbe 100644
--- a/test/base.py
+++ b/test/base.py
@@ -1,6 +1,6 @@
 from flask_testing import TestCase
 
-from application.models import db
+from application.base_model import db
 from main import create_application
 
 user_payload = {
@@ -11,7 +11,6 @@
 
 
 class BaseTestCase(TestCase):
-
     def create_app(self):
         self.app = create_application('testing')
         self.app_context = self.app.app_context()

From 6d7ef45ab7e8c6cbb4086b9b58aeb7462185ad0d Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Thu, 5 Apr 2018 11:30:47 +0300
Subject: [PATCH 2/9] feat(schedule): schedule collection checks

---
 application/helpers.py                        | 18 ++++++++++++++++++
 application/models.py                         |  4 ++--
 application/templates/collection_details.html |  4 ++++
 application/views.py                          |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/application/helpers.py b/application/helpers.py
index cb6398f..744b8b4 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -2,6 +2,7 @@
 import json
 import re
 from application.models import Request, Response, ResponseSummary, ResponseAssertion, Collection
+from application.models import Request, Collection
 
 
 def collection_scheduler():
@@ -84,3 +85,20 @@ def run_collection_checks(collection_id, run_from):
 		response_summary.responses.append(response)
 
 	response_summary.save()
+
+
+def make_get_request(url, headers=None):
+	request = requests.get(url, headers=headers)
+	try:
+		response_object = request.json()
+	except Exception:
+		response_object = request.content.decode("utf-8")
+		
+	response = {
+		"status_code": request.status_code,
+		"data": response_object,
+		"url": request.url,
+		"headers": json.dumps(dict(request.headers)),
+		"response_time": request.elapsed.total_seconds()
+	}
+	return response
diff --git a/application/models.py b/application/models.py
index 49f579c..e10e77a 100644
--- a/application/models.py
+++ b/application/models.py
@@ -31,11 +31,11 @@ class Collection(Base):
 	name = db.Column(db.String(128), nullable=False)
 	user_id = db.Column(db.Integer, db.ForeignKey('User.id'), nullable=False)
 	team_id = db.Column(db.Integer, db.ForeignKey('Team.id'))
-	requests = db.relationship('Request', backref='collection', cascade='all, delete-orphan')
+	schedule = db.Column(db.Time)
 	response_summary = db.relationship(
 		'ResponseSummary', backref='collection', lazy=True
 	)
-	schedule = db.Column(db.Time)
+	requests = db.relationship('Request', backref='collection', cascade='all, delete-orphan')
 	
 	def __str__(self):
 		return self.name
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index 543ff6b..a6db1e8 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -19,6 +19,7 @@ <h4 class="checkList__Heading">Results</h4>
                 </nav>
             </div>
             <div class="tab-content resultsContainer">
+<<<<<<< HEAD
 <<<<<<< HEAD
                 <div class="collectionHeader">
                     <span class="collectionName">{{context.collection_name}}</span>
@@ -29,6 +30,9 @@ <h4 class="checkList__Heading">Results</h4>
                         </span>
                     </span>
                 </div>
+=======
+                <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
+>>>>>>> feat(schedule): schedule collection checks
 =======
                 <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
 >>>>>>> feat(schedule): schedule collection checks
diff --git a/application/views.py b/application/views.py
index 4b0044c..361e316 100644
--- a/application/views.py
+++ b/application/views.py
@@ -72,7 +72,7 @@ def collections():
     return render_template('collections.html', context=context)
 
 
-@app_view.route('/collection-details/<collection_id>', methods=['GET'])
+@app_view.route('/collection-details/<collection_id>', methods=['GET', 'PUT'])
 @authentication_required
 def collection_details(collection_id=None):
     context = {}

From 8b0fb9cedd920eba594e822c559118914c4b7a93 Mon Sep 17 00:00:00 2001
From: Muhwezi Allan <allan.muhwezi@andela.com>
Date: Tue, 10 Apr 2018 17:55:23 +0300
Subject: [PATCH 3/9] feat (scheduler): add the scheduler slider

---
 application/static/css/nouislider.min.css     |  4 +
 application/static/css/nouislider.pips.css    | 98 +++++++++++++++++++
 application/static/css/scheduler.css          | 62 ++++++++++++
 application/static/js/nouislider.min.js       |  3 +
 application/static/js/scheduler.js            | 94 ++++++++++++++++++
 application/templates/base.html               |  7 +-
 application/templates/collection_details.html | 56 ++++++-----
 application/templates/settings.html           | 54 ++++++++++
 application/views.py                          | 25 ++++-
 9 files changed, 371 insertions(+), 32 deletions(-)
 create mode 100644 application/static/css/nouislider.min.css
 create mode 100644 application/static/css/nouislider.pips.css
 create mode 100644 application/static/css/scheduler.css
 create mode 100644 application/static/js/nouislider.min.js
 create mode 100644 application/static/js/scheduler.js
 create mode 100644 application/templates/settings.html

diff --git a/application/static/css/nouislider.min.css b/application/static/css/nouislider.min.css
new file mode 100644
index 0000000..d877717
--- /dev/null
+++ b/application/static/css/nouislider.min.css
@@ -0,0 +1,4 @@
+/*! nouislider - 8.0.2 - 2015-07-06 13:22:09 */
+
+
+.noUi-target,.noUi-target *{-webkit-touch-callout:none;-webkit-user-select:none;-ms-touch-action:none;-ms-user-select:none;-moz-user-select:none;-moz-box-sizing:border-box;box-sizing:border-box}.noUi-target{position:relative;direction:ltr}.noUi-base{width:100%;height:100%;position:relative;z-index:1}.noUi-origin{position:absolute;right:0;top:0;left:0;bottom:0}.noUi-handle{position:relative;z-index:1}.noUi-stacking .noUi-handle{z-index:10}.noUi-state-tap .noUi-origin{-webkit-transition:left .3s,top .3s;transition:left .3s,top .3s}.noUi-state-drag *{cursor:inherit!important}.noUi-base{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.noUi-horizontal{height:18px}.noUi-horizontal .noUi-handle{width:34px;height:28px;left:-17px;top:-6px}.noUi-vertical{width:18px}.noUi-vertical .noUi-handle{width:28px;height:34px;left:-6px;top:-17px}.noUi-background{background:#FAFAFA;box-shadow:inset 0 1px 1px #f0f0f0}.noUi-connect{background:#3FB8AF;box-shadow:inset 0 0 3px rgba(51,51,51,.45);-webkit-transition:background 450ms;transition:background 450ms}.noUi-origin{border-radius:2px}.noUi-target{border-radius:4px;border:1px solid #D3D3D3;box-shadow:inset 0 1px 1px #F0F0F0,0 3px 6px -5px #BBB}.noUi-target.noUi-connect{box-shadow:inset 0 0 3px rgba(51,51,51,.45),0 3px 6px -5px #BBB}.noUi-dragable{cursor:w-resize}.noUi-vertical .noUi-dragable{cursor:n-resize}.noUi-handle{border:1px solid #D9D9D9;border-radius:3px;background:#FFF;cursor:default;box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #EBEBEB,0 3px 6px -3px #BBB}.noUi-active{box-shadow:inset 0 0 1px #FFF,inset 0 1px 7px #DDD,0 3px 6px -3px #BBB}.noUi-handle:after,.noUi-handle:before{content:"";display:block;position:absolute;height:14px;width:1px;background:#E8E7E6;left:14px;top:6px}.noUi-handle:after{left:17px}.noUi-vertical .noUi-handle:after,.noUi-vertical .noUi-handle:before{width:14px;height:1px;left:6px;top:14px}.noUi-vertical .noUi-handle:after{top:17px}[disabled] .noUi-connect,[disabled].noUi-connect{background:#B8B8B8}[disabled] .noUi-handle,[disabled].noUi-origin{cursor:not-allowed}.noUi-pips,.noUi-pips *{-moz-box-sizing:border-box;box-sizing:border-box}.noUi-pips{position:absolute;font:400 12px Arial;color:#999}.noUi-value{width:40px;position:absolute;text-align:center}.noUi-value-sub{color:#ccc;font-size:10px}.noUi-marker{position:absolute;background:#CCC}.noUi-marker-large,.noUi-marker-sub{background:#AAA}.noUi-pips-horizontal{padding:10px 0;height:50px;top:100%;left:0;width:100%}.noUi-value-horizontal{margin-left:-20px;padding-top:20px}.noUi-value-horizontal.noUi-value-sub{padding-top:15px}.noUi-marker-horizontal.noUi-marker{margin-left:-1px;width:2px;height:5px}.noUi-marker-horizontal.noUi-marker-sub{height:10px}.noUi-marker-horizontal.noUi-marker-large{height:15px}.noUi-pips-vertical{padding:0 10px;height:100%;top:0;left:100%}.noUi-value-vertical{width:15px;margin-left:20px;margin-top:-5px}.noUi-marker-vertical.noUi-marker{width:5px;height:2px;margin-top:-1px}.noUi-marker-vertical.noUi-marker-sub{width:10px}.noUi-marker-vertical.noUi-marker-large{width:15px}
\ No newline at end of file
diff --git a/application/static/css/nouislider.pips.css b/application/static/css/nouislider.pips.css
new file mode 100644
index 0000000..f4f97bf
--- /dev/null
+++ b/application/static/css/nouislider.pips.css
@@ -0,0 +1,98 @@
+
+/* Base;
+ *
+ */
+.noUi-pips,
+.noUi-pips * {
+-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.noUi-pips {
+	position: absolute;
+	font: 400 12px Arial;
+	color: #999;
+}
+
+/* Values;
+ *
+ */
+.noUi-value {
+	width: 40px;
+	position: absolute;
+	text-align: center;
+}
+.noUi-value-sub {
+	color: #ccc;
+	font-size: 10px;
+}
+
+/* Markings;
+ *
+ */
+.noUi-marker {
+	position: absolute;
+	background: #CCC;
+}
+.noUi-marker-sub {
+	background: #AAA;
+}
+.noUi-marker-large {
+	background: #AAA;
+}
+
+/* Horizontal layout;
+ *
+ */
+.noUi-pips-horizontal {
+	padding: 10px 0;
+	height: 50px;
+	top: 100%;
+	left: 0;
+	width: 100%;
+}
+.noUi-value-horizontal {
+	margin-left: -20px;
+	padding-top: 20px;
+}
+.noUi-value-horizontal.noUi-value-sub {
+	padding-top: 15px;
+}
+
+.noUi-marker-horizontal.noUi-marker {
+	margin-left: -1px;
+	width: 2px;
+	height: 5px;
+}
+.noUi-marker-horizontal.noUi-marker-sub {
+	height: 10px;
+}
+.noUi-marker-horizontal.noUi-marker-large {
+	height: 15px;
+}
+
+/* Vertical layout;
+ *
+ */
+.noUi-pips-vertical {
+	padding: 0 10px;
+	height: 100%;
+	top: 0;
+	left: 100%;
+}
+.noUi-value-vertical {
+	width: 15px;
+	margin-left: 20px;
+	margin-top: -5px;
+}
+
+.noUi-marker-vertical.noUi-marker {
+	width: 5px;
+	height: 2px;
+	margin-top: -1px;
+}
+.noUi-marker-vertical.noUi-marker-sub {
+	width: 10px;
+}
+.noUi-marker-vertical.noUi-marker-large {
+	width: 15px;
+}
diff --git a/application/static/css/scheduler.css b/application/static/css/scheduler.css
new file mode 100644
index 0000000..b84b522
--- /dev/null
+++ b/application/static/css/scheduler.css
@@ -0,0 +1,62 @@
+.schedule-box {
+    text-align: center;
+}
+
+.schedule-title {
+    margin-bottom: 20px;
+    color: #83878c;
+    font-size: 2rem;
+}
+
+button {
+    font-size: 2rem !important;
+}
+
+.update-timeout-info {
+    line-height: 22px;
+}
+
+.update-timeout-label {
+    position: relative;
+    right: 3px;
+    display: inline-block;
+    text-align: right;
+    width: 100px;
+}
+
+.update-timeout-value {
+    font-size: 22px;
+    display: inline-block;
+    width: 100px;
+    text-align: left;
+    white-space: nowrap;
+
+}
+
+#period-slider {
+    margin: 20px 50px 80px 50px;
+}
+
+#period-slider.noUi-connect {
+  background: #22bc66;
+}
+
+#period-slider .noUi-value {
+    width: 60px;
+    margin-left: -30px;
+}
+
+.label-tag {
+    background-color: #eee;
+    color: #555;
+    font-style: normal;
+}
+
+
+#show-usage-modal  .modal-dialog {
+     width: 1600px;
+ }
+
+ #show-usage-modal .tab-content {
+     margin-top: 15px;
+ }
diff --git a/application/static/js/nouislider.min.js b/application/static/js/nouislider.min.js
new file mode 100644
index 0000000..5d41dbd
--- /dev/null
+++ b/application/static/js/nouislider.min.js
@@ -0,0 +1,3 @@
+/*! nouislider - 8.0.2 - 2015-07-06 13:22:09 */
+
+!function(a){if("function"==typeof define&&define.amd)define([],a);else if("object"==typeof exports){var b=require("fs");module.exports=a(),module.exports.css=function(){return b.readFileSync(__dirname+"/nouislider.min.css","utf8")}}else window.noUiSlider=a()}(function(){"use strict";function a(a){return a.filter(function(a){return this[a]?!1:this[a]=!0},{})}function b(a,b){return Math.round(a/b)*b}function c(a){var b=a.getBoundingClientRect(),c=a.ownerDocument,d=c.defaultView||c.parentWindow,e=c.documentElement,f=d.pageXOffset;return/webkit.*Chrome.*Mobile/i.test(navigator.userAgent)&&(f=0),{top:b.top+d.pageYOffset-e.clientTop,left:b.left+f-e.clientLeft}}function d(a){return"number"==typeof a&&!isNaN(a)&&isFinite(a)}function e(a){var b=Math.pow(10,7);return Number((Math.round(a*b)/b).toFixed(7))}function f(a,b,c){j(a,b),setTimeout(function(){k(a,b)},c)}function g(a){return Math.max(Math.min(a,100),0)}function h(a){return Array.isArray(a)?a:[a]}function i(a){var b=a.split(".");return b.length>1?b[1].length:0}function j(a,b){a.classList?a.classList.add(b):a.className+=" "+b}function k(a,b){a.classList?a.classList.remove(b):a.className=a.className.replace(new RegExp("(^|\\b)"+b.split(" ").join("|")+"(\\b|$)","gi")," ")}function l(a,b){a.classList?a.classList.contains(b):new RegExp("(^| )"+b+"( |$)","gi").test(a.className)}function m(a,b){return 100/(b-a)}function n(a,b){return 100*b/(a[1]-a[0])}function o(a,b){return n(a,a[0]<0?b+Math.abs(a[0]):b-a[0])}function p(a,b){return b*(a[1]-a[0])/100+a[0]}function q(a,b){for(var c=1;a>=b[c];)c+=1;return c}function r(a,b,c){if(c>=a.slice(-1)[0])return 100;var d,e,f,g,h=q(c,a);return d=a[h-1],e=a[h],f=b[h-1],g=b[h],f+o([d,e],c)/m(f,g)}function s(a,b,c){if(c>=100)return a.slice(-1)[0];var d,e,f,g,h=q(c,b);return d=a[h-1],e=a[h],f=b[h-1],g=b[h],p([d,e],(c-f)*m(f,g))}function t(a,c,d,e){if(100===e)return e;var f,g,h=q(e,a);return d?(f=a[h-1],g=a[h],e-f>(g-f)/2?g:f):c[h-1]?a[h-1]+b(e-a[h-1],c[h-1]):e}function u(a,b,c){var e;if("number"==typeof b&&(b=[b]),"[object Array]"!==Object.prototype.toString.call(b))throw new Error("noUiSlider: 'range' contains invalid value.");if(e="min"===a?0:"max"===a?100:parseFloat(a),!d(e)||!d(b[0]))throw new Error("noUiSlider: 'range' value isn't numeric.");c.xPct.push(e),c.xVal.push(b[0]),e?c.xSteps.push(isNaN(b[1])?!1:b[1]):isNaN(b[1])||(c.xSteps[0]=b[1])}function v(a,b,c){return b?void(c.xSteps[a]=n([c.xVal[a],c.xVal[a+1]],b)/m(c.xPct[a],c.xPct[a+1])):!0}function w(a,b,c,d){this.xPct=[],this.xVal=[],this.xSteps=[d||!1],this.xNumSteps=[!1],this.snap=b,this.direction=c;var e,f=[];for(e in a)a.hasOwnProperty(e)&&f.push([a[e],e]);for(f.sort(function(a,b){return a[0]-b[0]}),e=0;e<f.length;e++)u(f[e][1],f[e][0],this);for(this.xNumSteps=this.xSteps.slice(0),e=0;e<this.xNumSteps.length;e++)v(e,this.xNumSteps[e],this)}function x(a,b){if(!d(b))throw new Error("noUiSlider: 'step' is not numeric.");a.singleStep=b}function y(a,b){if("object"!=typeof b||Array.isArray(b))throw new Error("noUiSlider: 'range' is not an object.");if(void 0===b.min||void 0===b.max)throw new Error("noUiSlider: Missing 'min' or 'max' in 'range'.");a.spectrum=new w(b,a.snap,a.dir,a.singleStep)}function z(a,b){if(b=h(b),!Array.isArray(b)||!b.length||b.length>2)throw new Error("noUiSlider: 'start' option is incorrect.");a.handles=b.length,a.start=b}function A(a,b){if(a.snap=b,"boolean"!=typeof b)throw new Error("noUiSlider: 'snap' option must be a boolean.")}function B(a,b){if(a.animate=b,"boolean"!=typeof b)throw new Error("noUiSlider: 'animate' option must be a boolean.")}function C(a,b){if("lower"===b&&1===a.handles)a.connect=1;else if("upper"===b&&1===a.handles)a.connect=2;else if(b===!0&&2===a.handles)a.connect=3;else{if(b!==!1)throw new Error("noUiSlider: 'connect' option doesn't match handle count.");a.connect=0}}function D(a,b){switch(b){case"horizontal":a.ort=0;break;case"vertical":a.ort=1;break;default:throw new Error("noUiSlider: 'orientation' option is invalid.")}}function E(a,b){if(!d(b))throw new Error("noUiSlider: 'margin' option must be numeric.");if(a.margin=a.spectrum.getMargin(b),!a.margin)throw new Error("noUiSlider: 'margin' option is only supported on linear sliders.")}function F(a,b){if(!d(b))throw new Error("noUiSlider: 'limit' option must be numeric.");if(a.limit=a.spectrum.getMargin(b),!a.limit)throw new Error("noUiSlider: 'limit' option is only supported on linear sliders.")}function G(a,b){switch(b){case"ltr":a.dir=0;break;case"rtl":a.dir=1,a.connect=[0,2,1,3][a.connect];break;default:throw new Error("noUiSlider: 'direction' option was not recognized.")}}function H(a,b){if("string"!=typeof b)throw new Error("noUiSlider: 'behaviour' must be a string containing options.");var c=b.indexOf("tap")>=0,d=b.indexOf("drag")>=0,e=b.indexOf("fixed")>=0,f=b.indexOf("snap")>=0;a.events={tap:c||f,drag:d,fixed:e,snap:f}}function I(a,b){if(a.format=b,"function"==typeof b.to&&"function"==typeof b.from)return!0;throw new Error("noUiSlider: 'format' requires 'to' and 'from' methods.")}function J(a){var b,c={margin:0,limit:0,animate:!0,format:U};b={step:{r:!1,t:x},start:{r:!0,t:z},connect:{r:!0,t:C},direction:{r:!0,t:G},snap:{r:!1,t:A},animate:{r:!1,t:B},range:{r:!0,t:y},orientation:{r:!1,t:D},margin:{r:!1,t:E},limit:{r:!1,t:F},behaviour:{r:!0,t:H},format:{r:!1,t:I}};var d={connect:!1,direction:"ltr",behaviour:"tap",orientation:"horizontal"};return Object.keys(d).forEach(function(b){void 0===a[b]&&(a[b]=d[b])}),Object.keys(b).forEach(function(d){var e=b[d];if(void 0===a[d]){if(e.r)throw new Error("noUiSlider: '"+d+"' is required.");return!0}e.t(c,a[d])}),c.pips=a.pips,c.style=c.ort?"top":"left",c}function K(a,b,c){var d=a+b[0],e=a+b[1];return c?(0>d&&(e+=Math.abs(d)),e>100&&(d-=e-100),[g(d),g(e)]):[d,e]}function L(a){a.preventDefault();var b,c,d=0===a.type.indexOf("touch"),e=0===a.type.indexOf("mouse"),f=0===a.type.indexOf("pointer"),g=a;return 0===a.type.indexOf("MSPointer")&&(f=!0),d&&(b=a.changedTouches[0].pageX,c=a.changedTouches[0].pageY),(e||f)&&(b=a.clientX+window.pageXOffset,c=a.clientY+window.pageYOffset),g.points=[b,c],g.cursor=e||f,g}function M(a,b){var c=document.createElement("div"),d=document.createElement("div"),e=["-lower","-upper"];return a&&e.reverse(),j(d,T[3]),j(d,T[3]+e[b]),j(c,T[2]),c.appendChild(d),c}function N(a,b,c){switch(a){case 1:j(b,T[7]),j(c[0],T[6]);break;case 3:j(c[1],T[6]);case 2:j(c[0],T[7]);case 0:j(b,T[6])}}function O(a,b,c){var d,e=[];for(d=0;a>d;d+=1)e.push(c.appendChild(M(b,d)));return e}function P(a,b,c){j(c,T[0]),j(c,T[8+a]),j(c,T[4+b]);var d=document.createElement("div");return j(d,T[1]),c.appendChild(d),d}function Q(b,d){function e(a,b,c){if("range"===a||"steps"===a)return M.xVal;if("count"===a){var d,e=100/(b-1),f=0;for(b=[];(d=f++*e)<=100;)b.push(d);a="positions"}return"positions"===a?b.map(function(a){return M.fromStepping(c?M.getStep(a):a)}):"values"===a?c?b.map(function(a){return M.fromStepping(M.getStep(M.toStepping(a)))}):b:void 0}function m(b,c,d){var e=M.direction,f={},g=M.xVal[0],h=M.xVal[M.xVal.length-1],i=!1,j=!1,k=0;return M.direction=0,d=a(d.slice().sort(function(a,b){return a-b})),d[0]!==g&&(d.unshift(g),i=!0),d[d.length-1]!==h&&(d.push(h),j=!0),d.forEach(function(a,e){var g,h,l,m,n,o,p,q,r,s,t=a,u=d[e+1];if("steps"===c&&(g=M.xNumSteps[e]),g||(g=u-t),t!==!1&&void 0!==u)for(h=t;u>=h;h+=g){for(m=M.toStepping(h),n=m-k,q=n/b,r=Math.round(q),s=n/r,l=1;r>=l;l+=1)o=k+l*s,f[o.toFixed(5)]=["x",0];p=d.indexOf(h)>-1?1:"steps"===c?2:0,!e&&i&&(p=0),h===u&&j||(f[m.toFixed(5)]=[h,p]),k=m}}),M.direction=e,f}function n(a,b,c){function e(a){return["-normal","-large","-sub"][a]}function f(a,b,c){return'class="'+b+" "+b+"-"+h+" "+b+e(c[1])+'" style="'+d.style+": "+a+'%"'}function g(a,d){M.direction&&(a=100-a),d[1]=d[1]&&b?b(d[0],d[1]):d[1],i.innerHTML+="<div "+f(a,"noUi-marker",d)+"></div>",d[1]&&(i.innerHTML+="<div "+f(a,"noUi-value",d)+">"+c.to(d[0])+"</div>")}var h=["horizontal","vertical"][d.ort],i=document.createElement("div");return j(i,"noUi-pips"),j(i,"noUi-pips-"+h),Object.keys(a).forEach(function(b){g(b,a[b])}),i}function o(a){var b=a.mode,c=a.density||1,d=a.filter||!1,f=a.values||!1,g=a.stepped||!1,h=e(b,f,g),i=m(c,b,h),j=a.format||{to:Math.round};return I.appendChild(n(i,d,j))}function p(){return G["offset"+["Width","Height"][d.ort]]}function q(a,b){void 0!==b&&(b=Math.abs(b-d.dir)),Object.keys(R).forEach(function(c){var d=c.split(".")[0];a===d&&R[c].forEach(function(a){a(h(B()),b,r(Array.prototype.slice.call(Q)))})})}function r(a){return 1===a.length?a[0]:d.dir?a.reverse():a}function s(a,b,c,e){var f=function(b){return I.hasAttribute("disabled")?!1:l(I,T[14])?!1:(b=L(b),a===S.start&&void 0!==b.buttons&&b.buttons>1?!1:(b.calcPoint=b.points[d.ort],void c(b,e)))},g=[];return a.split(" ").forEach(function(a){b.addEventListener(a,f,!1),g.push([a,f])}),g}function t(a,b){var c,d,e=b.handles||H,f=!1,g=100*(a.calcPoint-b.start)/p(),h=e[0]===H[0]?0:1;if(c=K(g,b.positions,e.length>1),f=y(e[0],c[h],1===e.length),e.length>1){if(f=y(e[1],c[h?0:1],!1)||f)for(d=0;d<b.handles.length;d++)q("slide",d)}else f&&q("slide",h)}function u(a,b){var c=G.getElementsByClassName(T[15]),d=b.handles[0]===H[0]?0:1;c.length&&k(c[0],T[15]),a.cursor&&(document.body.style.cursor="",document.body.removeEventListener("selectstart",document.body.noUiListener));var e=document.documentElement;e.noUiListeners.forEach(function(a){e.removeEventListener(a[0],a[1])}),k(I,T[12]),q("set",d),q("change",d)}function v(a,b){var c=document.documentElement;if(1===b.handles.length&&(j(b.handles[0].children[0],T[15]),b.handles[0].hasAttribute("disabled")))return!1;a.stopPropagation();var d=s(S.move,c,t,{start:a.calcPoint,handles:b.handles,positions:[J[0],J[H.length-1]]}),e=s(S.end,c,u,{handles:b.handles});if(c.noUiListeners=d.concat(e),a.cursor){document.body.style.cursor=getComputedStyle(a.target).cursor,H.length>1&&j(I,T[12]);var f=function(){return!1};document.body.noUiListener=f,document.body.addEventListener("selectstart",f,!1)}}function w(a){var b,e,g=a.calcPoint,h=0;return a.stopPropagation(),H.forEach(function(a){h+=c(a)[d.style]}),b=h/2>g||1===H.length?0:1,g-=c(G)[d.style],e=100*g/p(),d.events.snap||f(I,T[14],300),H[b].hasAttribute("disabled")?!1:(y(H[b],e),q("slide",b),q("set",b),q("change",b),void(d.events.snap&&v(a,{handles:[H[h]]})))}function x(a){var b,c;if(!a.fixed)for(b=0;b<H.length;b+=1)s(S.start,H[b].children[0],v,{handles:[H[b]]});a.tap&&s(S.start,G,w,{handles:H}),a.drag&&(c=[G.getElementsByClassName(T[7])[0]],j(c[0],T[10]),a.fixed&&c.push(H[c[0]===H[0]?1:0].children[0]),c.forEach(function(a){s(S.start,a,v,{handles:H})}))}function y(a,b,c){var e=a!==H[0]?1:0,f=J[0]+d.margin,h=J[1]-d.margin,i=J[0]+d.limit,l=J[1]-d.limit;return H.length>1&&(b=e?Math.max(b,f):Math.min(b,h)),c!==!1&&d.limit&&H.length>1&&(b=e?Math.min(b,i):Math.max(b,l)),b=M.getStep(b),b=g(parseFloat(b.toFixed(7))),b===J[e]?!1:(a.style[d.style]=b+"%",a.previousSibling||(k(a,T[17]),b>50&&j(a,T[17])),J[e]=b,Q[e]=M.fromStepping(b),q("update",e),!0)}function z(a,b){var c,e,f;for(d.limit&&(a+=1),c=0;a>c;c+=1)e=c%2,f=b[e],null!==f&&f!==!1&&("number"==typeof f&&(f=String(f)),f=d.format.from(f),(f===!1||isNaN(f)||y(H[e],M.toStepping(f),c===3-d.dir)===!1)&&q("update",e))}function A(a){var b,c,e=h(a);for(d.dir&&d.handles>1&&e.reverse(),d.animate&&-1!==J[0]&&f(I,T[14],300),b=H.length>1?3:1,1===e.length&&(b=1),z(b,e),c=0;c<H.length;c++)q("set",c)}function B(){var a,b=[];for(a=0;a<d.handles;a+=1)b[a]=d.format.to(Q[a]);return r(b)}function C(){T.forEach(function(a){a&&k(I,a)}),I.innerHTML="",delete I.noUiSlider}function D(){var a=J.map(function(a,b){var c=M.getApplicableStep(a),d=i(String(c[2])),e=Q[b],f=100===a?null:c[2],g=Number((e-c[2]).toFixed(d)),h=0===a?null:g>=c[1]?c[2]:c[0]||!1;return[h,f]});return r(a)}function E(a,b){R[a]=R[a]||[],R[a].push(b),"update"===a.split(".")[0]&&H.forEach(function(a,b){q("update",b)})}function F(a){var b=a.split(".")[0],c=a.substring(b.length);Object.keys(R).forEach(function(a){var d=a.split(".")[0],e=a.substring(d.length);b&&b!==d||c&&c!==e||delete R[a]})}var G,H,I=b,J=[-1,-1],M=d.spectrum,Q=[],R={};if(I.noUiSlider)throw new Error("Slider was already initialized.");return G=P(d.dir,d.ort,I),H=O(d.handles,d.dir,G),N(d.connect,I,H),x(d.events),d.pips&&o(d.pips),{destroy:C,steps:D,on:E,off:F,get:B,set:A}}function R(a,b){if(!a.nodeName)throw new Error("noUiSlider.create requires a single element.");var c=J(b,a),d=Q(a,c);d.set(c.start),a.noUiSlider=d}var S=window.navigator.pointerEnabled?{start:"pointerdown",move:"pointermove",end:"pointerup"}:window.navigator.msPointerEnabled?{start:"MSPointerDown",move:"MSPointerMove",end:"MSPointerUp"}:{start:"mousedown touchstart",move:"mousemove touchmove",end:"mouseup touchend"},T=["noUi-target","noUi-base","noUi-origin","noUi-handle","noUi-horizontal","noUi-vertical","noUi-background","noUi-connect","noUi-ltr","noUi-rtl","noUi-dragable","","noUi-state-drag","","noUi-state-tap","noUi-active","","noUi-stacking"];w.prototype.getMargin=function(a){return 2===this.xPct.length?n(this.xVal,a):!1},w.prototype.toStepping=function(a){return a=r(this.xVal,this.xPct,a),this.direction&&(a=100-a),a},w.prototype.fromStepping=function(a){return this.direction&&(a=100-a),e(s(this.xVal,this.xPct,a))},w.prototype.getStep=function(a){return this.direction&&(a=100-a),a=t(this.xPct,this.xSteps,this.snap,a),this.direction&&(a=100-a),a},w.prototype.getApplicableStep=function(a){var b=q(a,this.xPct),c=100===a?2:1;return[this.xNumSteps[b-2],this.xVal[b-c],this.xNumSteps[b-c]]},w.prototype.convert=function(a){return this.getStep(this.toStepping(a))};var U={to:function(a){return a.toFixed(2)},from:Number};return{create:R}});
\ No newline at end of file
diff --git a/application/static/js/scheduler.js b/application/static/js/scheduler.js
new file mode 100644
index 0000000..f3d21f7
--- /dev/null
+++ b/application/static/js/scheduler.js
@@ -0,0 +1,94 @@
+$(function () {
+    
+    var MINUTE = {name: "min", nsecs: 60};
+    var HOUR = {name: "hour", nsecs: MINUTE.nsecs * 60};
+    var DAY = {name: "day", nsecs: HOUR.nsecs * 24};
+    var WEEK = {name: "week", nsecs: DAY.nsecs * 7};
+    var UNITS = [WEEK, DAY, HOUR, MINUTE];
+
+    var secsToText = function(total) {
+        var remainingSeconds = Math.floor(total);
+        var result = "";
+        for (var i=0, unit; unit=UNITS[i]; i++) {
+            if (unit === WEEK && remainingSeconds % unit.nsecs != 0) {
+                // Say "8 days" instead of "1 week 1 day"
+                continue
+            }
+
+            var count = Math.floor(remainingSeconds / unit.nsecs);
+            remainingSeconds = remainingSeconds % unit.nsecs;
+
+            if (count == 1) {
+                result += "1 " + unit.name + " ";
+            }
+
+            if (count > 1) {
+                result += count + " " + unit.name + "s ";
+            }
+        }
+
+        return result;
+    }
+
+    var periodSlider = document.getElementById("period-slider");
+    noUiSlider.create(periodSlider, {
+        start: [20],
+        connect: "lower",
+        range: {
+            'min': [60, 60],
+            '20%': [3600, 3600],
+            '40%': [86400, 86400],
+            '60%': [604800, 604800],
+            '80%': [2592000, 864000],
+            'max': 5184000,
+        },
+        pips: {
+            mode: 'values',
+            values: [60, 1800, 3600, 43200, 86400, 604800, 2592000, 5184000],
+            density: 4,
+            format: {
+                to: secsToText,
+                from: function() {}
+            }
+        }
+    });
+
+    periodSlider.noUiSlider.on("update", function(a, b, value) {
+        var rounded = Math.round(value);
+        $("#period-slider-value").text(secsToText(rounded));
+        $("#update-timeout-timeout").val(rounded);
+    });
+
+    $('[data-toggle="tooltip"]').tooltip();
+
+    $(".check-menu-remove").click(function() {
+        var $this = $(this);
+
+        $("#remove-check-form").attr("action", $this.data("url"));
+        $(".remove-check-name").text($this.data("name"));
+        $('#remove-check-modal').modal("show");
+
+        return false;
+    });
+
+});
+
+$(".update-timeout-form").submit(updateScheduler);
+
+function updateScheduler (event) {
+    var form = $(this);
+    var id = form.attr('id');
+    console.log(id);
+
+    var form_data = $(this).serializeArray();
+    console.log(form_data);
+    $.ajax({
+        type: 'PUT',
+        contentType: 'application/json',
+        url: '/collection-details/' + id,
+        data: form_data,
+        success: function(data) {
+            console.log('Put was performed.');
+        }
+    });
+}
diff --git a/application/templates/base.html b/application/templates/base.html
index 6cf7d30..b124a6b 100644
--- a/application/templates/base.html
+++ b/application/templates/base.html
@@ -27,6 +27,11 @@
     <link href="{{ url_for('static', filename = "css/offcanvas.css") }}" rel="stylesheet">
     <link href="{{ url_for('static', filename = "css/main.css") }}" rel="stylesheet">
     <link href="{{ url_for('static', filename = "css/collection_details.css") }}" rel="stylesheet">
+
+    <link href="{{ url_for('static', filename = "css/nouislider.min.css") }}" rel="stylesheet">
+    <link href="{{ url_for('static', filename = "css/nouislider.pips.css") }}" rel="stylesheet">
+    <link href="{{ url_for('static', filename = "css/scheduler.css") }}" rel="stylesheet">
+
     <!-- <link href="../static/css/main.css" rel="stylesheet"> -->
     <script src="{{ url_for('static', filename = "js/jquery-3.3.1.min.js") }}" ></script>
     <script src="https://apis.google.com/js/platform.js" async defer></script>
@@ -53,7 +58,7 @@
             <a class="nav-link" href="{{ url_for('app_view.team') }}">Team</a>
           </li>
           <li class="nav-item dropdown">
-            <a class="nav-link" href="#" id="dropdown01">Settings</a>
+            <a class="nav-link" href="{{ url_for('app_view.settings') }}" id="dropdown01">Settings</a>
           </li>
         </ul>
           {% if session.name %}
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index a6db1e8..0574261 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -12,15 +12,13 @@ <h4 class="checkList__Heading">Show</h4>
                 <nav class="nav flex-column navLinks" role="tablist">
                     <a class="nav-link active" data-toggle="tab" href="#results" role="tab"><i class="fa fa-list"></i><span>Summary</span></a>
                     <a class="nav-link" data-toggle="tab" href="#editor" role="tab"><i class="fa fa-pencil-alt"></i><span>Editor</span></a>
-                     <a class="nav-link" data-toggle="tab" href="#schedule" role="tab"><i class="fa fa-clock"></i><span>Schedule</span></a>
+                    <a class="nav-link" data-toggle="tab" href="#schedule" role="tab"><i class="fa fa-clock"></i><span>Schedule</span></a>
                 
                 <hr>
                 <h4 class="checkList__Heading">Results</h4>
                 </nav>
             </div>
             <div class="tab-content resultsContainer">
-<<<<<<< HEAD
-<<<<<<< HEAD
                 <div class="collectionHeader">
                     <span class="collectionName">{{context.collection_name}}</span>
                     <span>
@@ -30,12 +28,7 @@ <h4 class="checkList__Heading">Results</h4>
                         </span>
                     </span>
                 </div>
-=======
                 <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
->>>>>>> feat(schedule): schedule collection checks
-=======
-                <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
->>>>>>> feat(schedule): schedule collection checks
                 <div id="results" class="tab-pane active"></div>
                 <div id="editor" class="tab-pane">
                     <div id="checks">
@@ -55,25 +48,33 @@ <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
                     </div>
                           
                 </div>
-                <div id="schedule" class="tab-pane active">
-                    <div class="row">
-                        <div class='col-sm-6'>
-                            <div class="form-group">
-                                <div class='input-group date' id='datetimepicker3'>
-                                    <input type='text' class="form-control" />
-                                    <span class="input-group-addon">
-                                        <span class="glyphicon glyphicon-time"></span>
-                                    </span>
+                <div id="schedule" class="tab-pane">
+                    <div class="schedule-box">
+                        <div class="schedule-title">
+                            Set the period between the pings to the requests in the collection
+                        </div>
+                        <form class="update-timeout-form" method="put" action="" id="{{ context["collection"]['id'] }}">
+                            <input type="hidden" name="time" id="update-timeout-timeout" />
+                            <div>
+                                <div>
+                                    <div class="update-timeout-info text-center">
+                                        <span
+                                            class="update-timeout-label"
+                                            data-toggle="tooltip"
+                                            title="Expected period between pings.">
+                                            Period:
+                                        </span>
+                                        <span
+                                            id="period-slider-value"
+                                            class="update-timeout-value">
+                                            1 day
+                                        </span>
+                                    </div>
+                                    <div id="period-slider"></div>
                                 </div>
+                                <button type="submit" class="btn btn-secondary btn-lg">Save</button>
                             </div>
-                        </div>
-                        <script type="text/javascript">
-                            $(function () {
-                                $('#datetimepicker3').datetimepicker({
-                                    format: 'LT'
-                                });
-                            });
-                        </script>
+                        </form>
                     </div>
                 </div>
             </div>
@@ -83,7 +84,8 @@ <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
         var context = {{ context|tojson }};
     </script>
     <script src="{{ url_for('static', filename='js/dashboard.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/collection_details.js') }}"></script> 
-    
+    <script src="{{ url_for('static', filename='js/collection_details.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/scheduler.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/nouislider.min.js') }}"></script>
     {% endblock %}
 </body>
\ No newline at end of file
diff --git a/application/templates/settings.html b/application/templates/settings.html
new file mode 100644
index 0000000..0533e43
--- /dev/null
+++ b/application/templates/settings.html
@@ -0,0 +1,54 @@
+{% extends 'base.html' %}
+{% from 'banner.html' import banner %}
+<body>
+{% block body %}
+    <main role="main" class="container">
+      {{ banner() }}
+
+      <div class="container-box">
+
+        <div id="update-timeout-modal">
+            <div class="schedule-box">
+                Set the time between the pings to the requests in the collection
+                <form id="update-timeout-form" method="post">
+                    <input type="hidden" name="timeout" id="update-timeout-timeout" />
+                    <div class="modal-content">
+                        <div class="modal-body">
+                            <div class="update-timeout-info text-center">
+                                <span
+                                    class="update-timeout-label"
+                                    data-toggle="tooltip"
+                                    title="Expected time between pings.">
+                                    Period
+                                </span>
+                                <span
+                                    id="period-slider-value"
+                                    class="update-timeout-value">
+                                    1 day
+                                </span>
+                            </div>
+                            <div id="period-slider"></div>
+
+                            <div class="update-timeout-terms">
+                                <p>
+                                    <span>Period</span>
+                                    Expected time between pings.
+                                </p>
+                            </div>
+
+                        </div>
+                        <div class="modal-footer">
+                            <button type="submit" class="btn btn-primary">Save</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+      </div>
+    </main>
+
+    <script src="{{ url_for('static', filename='js/checks.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/nouislider.min.js') }}"></script>
+
+{% endblock %}
+</body>
\ No newline at end of file
diff --git a/application/views.py b/application/views.py
index 361e316..bb8dc13 100644
--- a/application/views.py
+++ b/application/views.py
@@ -207,7 +207,24 @@ def update_collection_checks(collection_id=None):
             assertion.value = _assertion['value']
             assertion.request_id = check.id
             assertion.save()
-    response = jsonify(dict(
-        errors=errors
-    ))
-    return response
+
+    if request.method == 'PUT':
+        try:
+            collection = Collection.get(collection_id)
+            payload = request.get_json()
+            print(payload)
+            collection.schedule = payload.get("time")
+            collection.save()
+        except Exception as e:
+            print(e)
+    
+    return render_template('collection_details.html')
+
+
+@app_view.route('/settings', methods=['GET'])
+@authentication_required
+def settings():
+    context = dict()
+    context["title"] = "Settings"
+
+    return render_template("settings.html", context=context)

From 522287f33fe68e66d2edd5b2005fca437957df91 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Wed, 11 Apr 2018 14:43:02 +0300
Subject: [PATCH 4/9] schedule save

---
 application/static/js/dashboard.js            |  3 +-
 application/static/js/scheduler.js            | 20 +++++------
 application/templates/collection_details.html | 34 ++++++++-----------
 application/views.py                          |  8 ++---
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/application/static/js/dashboard.js b/application/static/js/dashboard.js
index cc19999..810b5c7 100644
--- a/application/static/js/dashboard.js
+++ b/application/static/js/dashboard.js
@@ -248,4 +248,5 @@ function isURL(str) {
     return urlregex.test(str);
 }
 
-$.each(context.checks, createCheck)
+$.each(context.checks, createCheck);
+
diff --git a/application/static/js/scheduler.js b/application/static/js/scheduler.js
index f3d21f7..f753b45 100644
--- a/application/static/js/scheduler.js
+++ b/application/static/js/scheduler.js
@@ -1,15 +1,15 @@
 $(function () {
-    
+
     var MINUTE = {name: "min", nsecs: 60};
     var HOUR = {name: "hour", nsecs: MINUTE.nsecs * 60};
     var DAY = {name: "day", nsecs: HOUR.nsecs * 24};
     var WEEK = {name: "week", nsecs: DAY.nsecs * 7};
     var UNITS = [WEEK, DAY, HOUR, MINUTE];
 
-    var secsToText = function(total) {
+    var secsToText = function (total) {
         var remainingSeconds = Math.floor(total);
         var result = "";
-        for (var i=0, unit; unit=UNITS[i]; i++) {
+        for (var i = 0, unit; unit = UNITS[i]; i++) {
             if (unit === WEEK && remainingSeconds % unit.nsecs != 0) {
                 // Say "8 days" instead of "1 week 1 day"
                 continue
@@ -48,12 +48,13 @@ $(function () {
             density: 4,
             format: {
                 to: secsToText,
-                from: function() {}
+                from: function () {
+                }
             }
         }
     });
 
-    periodSlider.noUiSlider.on("update", function(a, b, value) {
+    periodSlider.noUiSlider.on("update", function (a, b, value) {
         var rounded = Math.round(value);
         $("#period-slider-value").text(secsToText(rounded));
         $("#update-timeout-timeout").val(rounded);
@@ -61,7 +62,7 @@ $(function () {
 
     $('[data-toggle="tooltip"]').tooltip();
 
-    $(".check-menu-remove").click(function() {
+    $(".check-menu-remove").click(function () {
         var $this = $(this);
 
         $("#remove-check-form").attr("action", $this.data("url"));
@@ -75,7 +76,7 @@ $(function () {
 
 $(".update-timeout-form").submit(updateScheduler);
 
-function updateScheduler (event) {
+function updateScheduler(event) {
     var form = $(this);
     var id = form.attr('id');
     console.log(id);
@@ -83,11 +84,10 @@ function updateScheduler (event) {
     var form_data = $(this).serializeArray();
     console.log(form_data);
     $.ajax({
-        type: 'PUT',
-        contentType: 'application/json',
+        type: 'POST',
         url: '/collection-details/' + id,
         data: form_data,
-        success: function(data) {
+        success: function (data) {
             console.log('Put was performed.');
         }
     });
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index 0574261..e7f71e9 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -53,27 +53,23 @@ <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
                         <div class="schedule-title">
                             Set the period between the pings to the requests in the collection
                         </div>
-                        <form class="update-timeout-form" method="put" action="" id="{{ context["collection"]['id'] }}">
+                        <form class="update-timeout-form" method="post" action="" id="context['collection']['id']">
                             <input type="hidden" name="time" id="update-timeout-timeout" />
-                            <div>
-                                <div>
-                                    <div class="update-timeout-info text-center">
-                                        <span
-                                            class="update-timeout-label"
-                                            data-toggle="tooltip"
-                                            title="Expected period between pings.">
-                                            Period:
-                                        </span>
-                                        <span
-                                            id="period-slider-value"
-                                            class="update-timeout-value">
-                                            1 day
-                                        </span>
-                                    </div>
-                                    <div id="period-slider"></div>
-                                </div>
-                                <button type="submit" class="btn btn-secondary btn-lg">Save</button>
+                            <div class="update-timeout-info text-center">
+                                <span
+                                    class="update-timeout-label"
+                                    data-toggle="tooltip"
+                                    title="Expected period between pings.">
+                                    Period:
+                                </span>
+                                <span
+                                    id="period-slider-value"
+                                    class="update-timeout-value">
+                                    1 day
+                                </span>
                             </div>
+                            <div id="period-slider"></div>
+                            <button type="submit" class="btn btn-secondary btn-lg">Save</button>
                         </form>
                     </div>
                 </div>
diff --git a/application/views.py b/application/views.py
index bb8dc13..77889a3 100644
--- a/application/views.py
+++ b/application/views.py
@@ -72,7 +72,7 @@ def collections():
     return render_template('collections.html', context=context)
 
 
-@app_view.route('/collection-details/<collection_id>', methods=['GET', 'PUT'])
+@app_view.route('/collection-details/<collection_id>', methods=['GET', 'POST'])
 @authentication_required
 def collection_details(collection_id=None):
     context = {}
@@ -208,12 +208,12 @@ def update_collection_checks(collection_id=None):
             assertion.request_id = check.id
             assertion.save()
 
-    if request.method == 'PUT':
+    if request.method == 'POST':
         try:
             collection = Collection.get(collection_id)
-            payload = request.get_json()
+            payload = request.form["time"]
             print(payload)
-            collection.schedule = payload.get("time")
+            collection.schedule = payload
             collection.save()
         except Exception as e:
             print(e)

From 0a9cebf3b1a89bcfdc45b99063b4fbc539cbab24 Mon Sep 17 00:00:00 2001
From: Muhwezi Allan <allan.muhwezi@andela.com>
Date: Wed, 11 Apr 2018 15:31:32 +0300
Subject: [PATCH 5/9] feat(scheduler): implement the editing of the interval of
 a collection

- change the schedule field to interval
---
 application/models.py                         |  2 +-
 application/static/js/scheduler.js            |  3 +-
 application/templates/collection_details.html |  2 +-
 application/templates/settings.html           | 40 -------------------
 application/views.py                          |  7 ++--
 .../{5da1e973b109_.py => 1ddfa7ff398d_.py}    | 12 +++---
 6 files changed, 14 insertions(+), 52 deletions(-)
 rename migrations/versions/{5da1e973b109_.py => 1ddfa7ff398d_.py} (62%)

diff --git a/application/models.py b/application/models.py
index e10e77a..99cd3cb 100644
--- a/application/models.py
+++ b/application/models.py
@@ -31,10 +31,10 @@ class Collection(Base):
 	name = db.Column(db.String(128), nullable=False)
 	user_id = db.Column(db.Integer, db.ForeignKey('User.id'), nullable=False)
 	team_id = db.Column(db.Integer, db.ForeignKey('Team.id'))
-	schedule = db.Column(db.Time)
 	response_summary = db.relationship(
 		'ResponseSummary', backref='collection', lazy=True
 	)
+	interval = db.Column(db.Integer)
 	requests = db.relationship('Request', backref='collection', cascade='all, delete-orphan')
 	
 	def __str__(self):
diff --git a/application/static/js/scheduler.js b/application/static/js/scheduler.js
index f753b45..e292039 100644
--- a/application/static/js/scheduler.js
+++ b/application/static/js/scheduler.js
@@ -77,6 +77,7 @@ $(function () {
 $(".update-timeout-form").submit(updateScheduler);
 
 function updateScheduler(event) {
+    event.preventDefault();
     var form = $(this);
     var id = form.attr('id');
     console.log(id);
@@ -84,7 +85,7 @@ function updateScheduler(event) {
     var form_data = $(this).serializeArray();
     console.log(form_data);
     $.ajax({
-        type: 'POST',
+        type: 'PUT',
         url: '/collection-details/' + id,
         data: form_data,
         success: function (data) {
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index e7f71e9..024b243 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -53,7 +53,7 @@ <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
                         <div class="schedule-title">
                             Set the period between the pings to the requests in the collection
                         </div>
-                        <form class="update-timeout-form" method="post" action="" id="context['collection']['id']">
+                        <form class="update-timeout-form" method="PUT" action="" id="{{ context['collection']['id'] }}">
                             <input type="hidden" name="time" id="update-timeout-timeout" />
                             <div class="update-timeout-info text-center">
                                 <span
diff --git a/application/templates/settings.html b/application/templates/settings.html
index 0533e43..dd83cfb 100644
--- a/application/templates/settings.html
+++ b/application/templates/settings.html
@@ -7,48 +7,8 @@
 
       <div class="container-box">
 
-        <div id="update-timeout-modal">
-            <div class="schedule-box">
-                Set the time between the pings to the requests in the collection
-                <form id="update-timeout-form" method="post">
-                    <input type="hidden" name="timeout" id="update-timeout-timeout" />
-                    <div class="modal-content">
-                        <div class="modal-body">
-                            <div class="update-timeout-info text-center">
-                                <span
-                                    class="update-timeout-label"
-                                    data-toggle="tooltip"
-                                    title="Expected time between pings.">
-                                    Period
-                                </span>
-                                <span
-                                    id="period-slider-value"
-                                    class="update-timeout-value">
-                                    1 day
-                                </span>
-                            </div>
-                            <div id="period-slider"></div>
-
-                            <div class="update-timeout-terms">
-                                <p>
-                                    <span>Period</span>
-                                    Expected time between pings.
-                                </p>
-                            </div>
-
-                        </div>
-                        <div class="modal-footer">
-                            <button type="submit" class="btn btn-primary">Save</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
       </div>
     </main>
 
-    <script src="{{ url_for('static', filename='js/checks.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/nouislider.min.js') }}"></script>
-
 {% endblock %}
 </body>
\ No newline at end of file
diff --git a/application/views.py b/application/views.py
index 77889a3..440b825 100644
--- a/application/views.py
+++ b/application/views.py
@@ -72,7 +72,7 @@ def collections():
     return render_template('collections.html', context=context)
 
 
-@app_view.route('/collection-details/<collection_id>', methods=['GET', 'POST'])
+@app_view.route('/collection-details/<collection_id>', methods=['GET', 'PUT'])
 @authentication_required
 def collection_details(collection_id=None):
     context = {}
@@ -211,9 +211,10 @@ def update_collection_checks(collection_id=None):
     if request.method == 'POST':
         try:
             collection = Collection.get(collection_id)
-            payload = request.form["time"]
+            payload = request.form["time"] # this is time in seconds
             print(payload)
-            collection.schedule = payload
+            print(collection)
+            collection.interval = payload
             collection.save()
         except Exception as e:
             print(e)
diff --git a/migrations/versions/5da1e973b109_.py b/migrations/versions/1ddfa7ff398d_.py
similarity index 62%
rename from migrations/versions/5da1e973b109_.py
rename to migrations/versions/1ddfa7ff398d_.py
index 4c12adf..453c9cc 100644
--- a/migrations/versions/5da1e973b109_.py
+++ b/migrations/versions/1ddfa7ff398d_.py
@@ -1,16 +1,16 @@
 """empty message
 
-Revision ID: 5da1e973b109
+Revision ID: 1ddfa7ff398d
 Revises: fac4670c01e6
-Create Date: 2018-04-04 14:06:43.047609
+Create Date: 2018-04-11 15:12:03.208534
 
 """
 from alembic import op
 import sqlalchemy as sa
-
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = '5da1e973b109'
+revision = '1ddfa7ff398d'
 down_revision = 'fac4670c01e6'
 branch_labels = None
 depends_on = None
@@ -18,11 +18,11 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('Collection', sa.Column('schedule', sa.Time(), nullable=True))
+    op.add_column('Collection', sa.Column('interval', sa.Integer(), nullable=True))
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('Collection', 'schedule')
+    op.drop_column('Collection', 'interval')
     # ### end Alembic commands ###

From 6f01d996b35a2f8bb4b2adb614d49396faee4df5 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Fri, 13 Apr 2018 10:48:15 +0300
Subject: [PATCH 6/9] add scheduler

---
 application/helpers.py                            | 10 ++++++----
 application/templates/collection_details.html     |  3 ++-
 application/views.py                              | 10 ++++++----
 main.py                                           |  8 ++++----
 migrations/versions/1ddfa7ff398d_.py              |  2 +-
 test/application/test_header_model.py             |  2 +-
 test/application/test_request_assertion_model.py  |  2 +-
 test/application/test_response_assertion_model.py |  2 +-
 test/application/test_response_summary_model.py   |  2 +-
 9 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/application/helpers.py b/application/helpers.py
index 744b8b4..36efb54 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -5,10 +5,12 @@
 from application.models import Request, Collection
 
 
-def collection_scheduler():
-	collections = Collection.fetch_all()
-	for collection in collections:
-		run_collection_checks(collection.id)
+def collection_scheduler(app_context):
+	with app_context:
+		collections = Collection.fetch_all()
+		for collection in collections:
+			if collection.interval:
+				run_collection_checks(collection.id, collection.interval)
 
 
 def valid_url(url):
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index 024b243..546a78a 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -1,4 +1,5 @@
-{% extends "base.html" %} {% from 'banner.html' import banner %}
+{% extends "base.html" %}
+{% from 'banner.html' import banner %}
 
 <body>
     {% block body %}
diff --git a/application/views.py b/application/views.py
index 440b825..265805d 100644
--- a/application/views.py
+++ b/application/views.py
@@ -124,6 +124,7 @@ def collection_details(collection_id=None):
     context['collection_name'] = Collection.get(collection_id).name
     collection = Collection.get(collection_id)
     context["collection"] = collection.serialize()
+    context["title"] = "Collection"
     
     return render_template('collection_details.html', context=context)
 
@@ -212,14 +213,15 @@ def update_collection_checks(collection_id=None):
         try:
             collection = Collection.get(collection_id)
             payload = request.form["time"] # this is time in seconds
-            print(payload)
-            print(collection)
             collection.interval = payload
             collection.save()
         except Exception as e:
             print(e)
-    
-    return render_template('collection_details.html')
+    context = {}
+    collection = Collection.get(collection_id)
+    context["collection"] = collection.serialize()
+    context["title"] = "Collection Detail"
+    return render_template('collection_details.html', context=context)
 
 
 @app_view.route('/settings', methods=['GET'])
diff --git a/main.py b/main.py
index 7fff0ff..671290c 100644
--- a/main.py
+++ b/main.py
@@ -45,8 +45,8 @@ def create_application(environment):
 def active_job():
     def run_job():
         while True:
-            time.sleep(3)
-            collection_scheduler()
+            time.sleep(10)
+            collection_scheduler(app.app_context())
     thread = threading.Thread(target=run_job)
     thread.start()
     
@@ -55,8 +55,8 @@ def start_runner():
     def start_loop():
         while True:
             logging.info('In start loop')
-            # collection_scheduler()
-            time.sleep(3)
+            collection_scheduler(app.app_context())
+            time.sleep(10)
 
     logging.info('Started runner')
     thread = threading.Thread(target=start_loop)
diff --git a/migrations/versions/1ddfa7ff398d_.py b/migrations/versions/1ddfa7ff398d_.py
index 453c9cc..7cb6758 100644
--- a/migrations/versions/1ddfa7ff398d_.py
+++ b/migrations/versions/1ddfa7ff398d_.py
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '1ddfa7ff398d'
-down_revision = 'fac4670c01e6'
+down_revision = '76baf41309fa'
 branch_labels = None
 depends_on = None
 
diff --git a/test/application/test_header_model.py b/test/application/test_header_model.py
index 52b40f3..bbe026e 100644
--- a/test/application/test_header_model.py
+++ b/test/application/test_header_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase
+from test.base import BaseTestCase
 from application.models import Header
 
 
diff --git a/test/application/test_request_assertion_model.py b/test/application/test_request_assertion_model.py
index c2c2a1c..d171c4f 100644
--- a/test/application/test_request_assertion_model.py
+++ b/test/application/test_request_assertion_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase
+from test.base import BaseTestCase
 from application.models import RequestAssertion
 
 
diff --git a/test/application/test_response_assertion_model.py b/test/application/test_response_assertion_model.py
index b7157a0..6c0d039 100644
--- a/test/application/test_response_assertion_model.py
+++ b/test/application/test_response_assertion_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase
+from test.base import BaseTestCase
 from application.models import ResponseAssertion
 
 
diff --git a/test/application/test_response_summary_model.py b/test/application/test_response_summary_model.py
index 1fb3775..fdf6314 100644
--- a/test/application/test_response_summary_model.py
+++ b/test/application/test_response_summary_model.py
@@ -1,4 +1,4 @@
-from ..base import BaseTestCase
+from test.base import BaseTestCase
 from application.models import ResponseSummary
 
 

From f8042861f50adf5adaecb6b81a7bab1521b4c200 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Wed, 25 Apr 2018 23:01:17 +0300
Subject: [PATCH 7/9] feat(tasks): background checks with threads

---
 application/helpers.py | 120 +++++++++++++++++++++--------------------
 application/threads.py |  47 ++++++++++++++++
 application/views.py   |  21 +++++---
 main.py                |  30 -----------
 4 files changed, 121 insertions(+), 97 deletions(-)
 create mode 100644 application/threads.py

diff --git a/application/helpers.py b/application/helpers.py
index 36efb54..d0b6a9d 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -28,65 +28,67 @@ def valid_url(url):
 	
 
 def run_collection_checks(collection_id, run_from):
-	checks = Request.filter_by(collection_id=collection_id)
-	response_summary = ResponseSummary(
-		status='success',
-		failures=0,
-		run_from=run_from,
-		collection_id=collection_id
-	)
-
-	for check in checks:
-		headers = {}
-		for header in check.headers:
-			headers[header.key] = header.value
-
-		if check.method == "GET":
-			result = requests.get(check.url, headers=headers, verify=False)
-		response = Response(
-			status_code=result.status_code,
-			response_time=int(result.elapsed.total_seconds()),
-			headers=json.dumps(dict(result.headers)),
-			status='success',
-			failures=0,
-			request_id=check.id,
-			response_summary_id=response_summary.id
-		)
-		try:
-			data = json.dumps(result.json())
-		except json.decoder.JSONDecodeError:
-			data = str(result.content)
-		response.data = data
-
-		for assertion in check.assertions:
-			response_assertion = ResponseAssertion(
-				assertion_type=assertion.assertion_type,
-				comparison=assertion.comparison,
-				value=assertion.value,
-				status='failed',
-				request_assertion_id=assertion.id,
-				response_id=response.id)
-			if assertion.assertion_type == 'Status Code':
-				if assertion.value == response.status_code:
-					response_assertion.status = "success"
-			else:
-				if 'less' in assertion.comparison:
-					if response.response_time <= assertion.value:
-						response_assertion.status = "success"
-				else:
-					if response.response_time >= assertion.value:
-						response_assertion.status = "success"
-			if response_assertion.status == 'failed':
-				response.failures += 1
-				response.status = 'failed'
-			response.response_assertions.append(response_assertion)
-	
-		if response.status == 'failed':
-			response_summary.failures += 1
-			response_summary.status = 'failed'
-		response_summary.responses.append(response)
-
-	response_summary.save()
+	print("Running checks now..................", collection_id)
+	# checks = Request.filter_by(collection_id=collection_id)
+	# response_summary = ResponseSummary(
+	# 	status='success',
+	# 	failures=0,
+	# 	run_from=run_from,
+	# 	collection_id=collection_id
+	# )
+	# print("Response ***************", response_summary)
+	#
+	# for check in checks:
+	# 	headers = {}
+	# 	for header in check.headers:
+	# 		headers[header.key] = header.value
+	#
+	# 	if check.method == "GET":
+	# 		result = requests.get(check.url, headers=headers, verify=False)
+	# 	response = Response(
+	# 		status_code=result.status_code,
+	# 		response_time=int(result.elapsed.total_seconds()),
+	# 		headers=json.dumps(dict(result.headers)),
+	# 		status='success',
+	# 		failures=0,
+	# 		request_id=check.id,
+	# 		response_summary_id=response_summary.id
+	# 	)
+	# 	try:
+	# 		data = json.dumps(result.json())
+	# 	except json.decoder.JSONDecodeError:
+	# 		data = str(result.content)
+	# 	response.data = data
+	#
+	# 	for assertion in check.assertions:
+	# 		response_assertion = ResponseAssertion(
+	# 			assertion_type=assertion.assertion_type,
+	# 			comparison=assertion.comparison,
+	# 			value=assertion.value,
+	# 			status='failed',
+	# 			request_assertion_id=assertion.id,
+	# 			response_id=response.id)
+	# 		if assertion.assertion_type == 'Status Code':
+	# 			if assertion.value == response.status_code:
+	# 				response_assertion.status = "success"
+	# 		else:
+	# 			if 'less' in assertion.comparison:
+	# 				if response.response_time <= assertion.value:
+	# 					response_assertion.status = "success"
+	# 			else:
+	# 				if response.response_time >= assertion.value:
+	# 					response_assertion.status = "success"
+	# 		if response_assertion.status == 'failed':
+	# 			response.failures += 1
+	# 			response.status = 'failed'
+	# 		response.response_assertions.append(response_assertion)
+	#
+	# 	if response.status == 'failed':
+	# 		response_summary.failures += 1
+	# 		response_summary.status = 'failed'
+	# 	response_summary.responses.append(response)
+	#
+	# response_summary.save()
 
 
 def make_get_request(url, headers=None):
diff --git a/application/threads.py b/application/threads.py
new file mode 100644
index 0000000..5f1faf5
--- /dev/null
+++ b/application/threads.py
@@ -0,0 +1,47 @@
+import time
+import logging
+from threading import Thread, Lock
+from queue import Queue
+from application.models import Collection
+from application.helpers import run_collection_checks
+
+logger = logging.getLogger(__name__)
+
+thread_lock = Lock()
+
+
+class RequestWorker(Thread):
+	def __init__(self, name, counter, queue):
+		Thread.__init__(self)
+		self.name = name
+		self.counter = counter
+		self.queue = queue
+		
+	def run(self):
+		logger.info("Starting " + self.name)
+		thread_lock.acquire()
+		collection_id, interval = self.queue.get()
+		# time.sleep(interval)
+		run_collection_checks(collection_id, interval)
+		thread_lock.release()
+		
+
+def checks_runner(app_context):
+	ts = time.time()
+	queue = Queue()
+	threads = []
+	while True:
+		with app_context:
+			collections = Collection.fetch_all()
+		thread_list = [y for y in collections if y.interval]
+		for collection in thread_list:
+			time.sleep(collection.interval)
+			worker = RequestWorker(collection.name, len(thread_list), queue)
+			worker.daemon = True
+			worker.start()
+			threads.append(worker)
+			logger.info('Queueing {}'.format(collection.name))
+			queue.put((collection.id, collection.interval))
+		queue.join()
+		logger.info('Took {}'.format(time.time() - ts))
+
diff --git a/application/views.py b/application/views.py
index 265805d..b81b7f2 100644
--- a/application/views.py
+++ b/application/views.py
@@ -1,4 +1,5 @@
 from flask import Blueprint, render_template, request, jsonify
+import logging
 
 from application.auth.helpers import (current_user, authentication_required)
 from application.models import Team, Collection, RequestAssertion, ResponseSummary, Request, Header
@@ -6,6 +7,8 @@
 
 app_view = Blueprint('app_view', __name__, template_folder='templates')
 
+logger = logging.getLogger(__name__)
+
 
 @app_view.route('/dashboard', methods=['POST', 'GET'])
 @authentication_required
@@ -98,6 +101,16 @@ def collection_details(collection_id=None):
 
     response_summaries = ResponseSummary.filter_by(collection_id=collection_id)
     results = []
+    
+    if request.method == 'PUT':
+        try:
+            collection = Collection.get(collection_id)
+            payload = request.form["time"] # this is time in seconds
+            collection.interval = payload
+            collection.save()
+        except Exception as e:
+            logger.error(e)
+
     for response_summary in response_summaries:
         responseSet = {}
         summary = response_summary.serialize()
@@ -209,14 +222,6 @@ def update_collection_checks(collection_id=None):
             assertion.request_id = check.id
             assertion.save()
 
-    if request.method == 'POST':
-        try:
-            collection = Collection.get(collection_id)
-            payload = request.form["time"] # this is time in seconds
-            collection.interval = payload
-            collection.save()
-        except Exception as e:
-            print(e)
     context = {}
     collection = Collection.get(collection_id)
     context["collection"] = collection.serialize()
diff --git a/main.py b/main.py
index 671290c..f2ff847 100644
--- a/main.py
+++ b/main.py
@@ -1,17 +1,13 @@
 import os
-import logging
 
 from flask import Flask
 from flask_migrate import Migrate
-import threading
-import time
 
 from config import app_configuration
 
 from application import models
 from application.views import app_view
 from application.auth.views import auth
-from application.helpers import collection_scheduler
 
 os.sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -30,10 +26,7 @@ def create_application(environment):
     app.config.from_object(app_configuration[environment])
     app.register_blueprint(app_view)
     app.register_blueprint(auth)
-    # initialize SQLAlchemy
     models.db.init_app(app)
-
-    # initilize migration commands
     Migrate(app, models.db)
     return app
 
@@ -41,30 +34,7 @@ def create_application(environment):
 app = create_application(os.getenv("FLASK_CONFIG") or "development")
 
 
-@app.before_first_request
-def active_job():
-    def run_job():
-        while True:
-            time.sleep(10)
-            collection_scheduler(app.app_context())
-    thread = threading.Thread(target=run_job)
-    thread.start()
-    
-
-def start_runner():
-    def start_loop():
-        while True:
-            logging.info('In start loop')
-            collection_scheduler(app.app_context())
-            time.sleep(10)
-
-    logging.info('Started runner')
-    thread = threading.Thread(target=start_loop)
-    thread.start()
-
-
 if __name__ == "__main__":
     environment = os.getenv("FLASK_CONFIG")
     app = create_application(environment)
-    start_runner()
     app.run()

From 0b01463afd27ecd8cb6c59b421856536a8ccbe91 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Fri, 27 Apr 2018 01:17:19 +0300
Subject: [PATCH 8/9] feat(celery): implementation of background schedule with
 celery

---
 .env.sample                     |  2 ++
 .gitignore                      |  4 +++
 README.md                       |  6 +++++
 application/helpers.py          |  2 +-
 application/monitoring_tasks.py | 47 +++++++++++++++++++++++++++++++++
 celery_worker.py                |  6 +++++
 config.py                       | 23 +++++++++++++++-
 main.py                         |  7 ++---
 requirements.txt                |  6 +++++
 9 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 application/monitoring_tasks.py
 create mode 100644 celery_worker.py

diff --git a/.env.sample b/.env.sample
index 912c36b..b42c8ac 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,2 +1,4 @@
 SQLALCHEMY_DATABASE_URI=postgresql://username:password@host:port/name_of_db
 FLASK_APP=main.py
+REDIS_URL="redis://localhost:6379"
+CELERY_BROKER_URL="redis://localhost:6379"
diff --git a/.gitignore b/.gitignore
index 7e4547b..e72eaba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,10 @@ __pycache__/
 
 .pytest_cache
 
+celery-worker.db
+celerybeat-schedule.db
+celerybeat.pid
+
 # Distribution / packaging
 .Python
 build/
diff --git a/README.md b/README.md
index c372c69..495da80 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,12 @@
  
  ```$ python manage.py db upgrade```
  
+ # Celery and Background Tasks
+ - Start the celery beat
+ ```celery beat -A celery_worker.celery --loglevel=info```
+  - Start the celery worker
+ ```celery worker -A celery_worker.celery --loglevel=info```
+ 
  
  # Running the application
  `$ flask run`
diff --git a/application/helpers.py b/application/helpers.py
index d0b6a9d..ef7cd05 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -28,7 +28,7 @@ def valid_url(url):
 	
 
 def run_collection_checks(collection_id, run_from):
-	print("Running checks now..................", collection_id)
+	print("Running checks now..................2", collection_id)
 	# checks = Request.filter_by(collection_id=collection_id)
 	# response_summary = ResponseSummary(
 	# 	status='success',
diff --git a/application/monitoring_tasks.py b/application/monitoring_tasks.py
new file mode 100644
index 0000000..8a53692
--- /dev/null
+++ b/application/monitoring_tasks.py
@@ -0,0 +1,47 @@
+import os
+import redis
+import logging
+from celery.task.base import periodic_task
+from datetime import timedelta
+import time
+from main import celery
+
+from application.models import Collection
+from application.helpers import run_collection_checks
+
+logger = logging.getLogger(__name__)
+
+
+url = os.environ.get("REDIS_URL") or "redis://localhost:6379"
+REDIS_CONN = redis.StrictRedis.from_url(url=url)
+
+
+try:
+    REDIS_CONN.ping()
+    logger.info("Redis is connected!")
+except redis.ConnectionError:
+    logger.error("Redis connection error!")
+
+
+@celery.task(name='tasks.async_monitoring_checks')
+def monitoring_checks():
+    logger.info("Running Monitoring checks")
+    try:
+        collections = Collection.fetch_all()
+        scheduled_collections = [y for y in collections if y.interval]
+        for collection in scheduled_collections:
+            time.sleep(collection.interval)
+            run_collection_checks(collection.id, collection.interval)
+    except Exception as e:
+        logger.error(e)
+
+
+def async_monitoring_checks():
+    """ Asynchronous task, called from API endpoint. """
+    monitoring_checks.delay()
+    return
+
+
+@periodic_task(run_every=timedelta(seconds=60))
+def periodic_monitoring_checks():
+    return monitoring_checks()
diff --git a/celery_worker.py b/celery_worker.py
new file mode 100644
index 0000000..9aaa6cc
--- /dev/null
+++ b/celery_worker.py
@@ -0,0 +1,6 @@
+import os
+from main import create_application, celery
+
+
+app = create_application(os.getenv('FLASK_CONFIG') or 'development')
+app.app_context().push()
diff --git a/config.py b/config.py
index fb3db55..0473999 100644
--- a/config.py
+++ b/config.py
@@ -1,11 +1,20 @@
 import os
 from os.path import dirname, join
 from dotenv import load_dotenv
+from datetime import timedelta
 
 dotenv_path = join(dirname(__file__), '.env')
 load_dotenv(dotenv_path)
 secret_key = os.urandom(24)
 
+# Create Celery beat schedule:
+celery_get_request_schedule = {
+        'schedule-name': {
+            'task': 'application.monitoring_tasks.periodic_monitoring_checks',
+            'schedule': timedelta(seconds=30),
+        },
+    }
+
 
 class Config(object):
     BASE_DIR = dirname(__file__)
@@ -25,6 +34,11 @@ class Config(object):
     MAIL_USE_SSL = True
     MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
     MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
+    CELERYBEAT_SCHEDULE = celery_get_request_schedule
+    CELERY_BROKER_URL = os.environ.get('REDIS_URL')
+    CELERY_RESULT_BACKEND = os.environ.get('REDIS_URL')
+    CELERY_IMPORTS = ("application.monitoring_tasks",)
+    REDIS_URL = os.environ.get('REDIS_URL')
 
 
 class ConfigWithCustomDBEngineParams(Config):
@@ -44,7 +58,13 @@ class DevelopmentConfiguration(ConfigWithCustomDBEngineParams):
     DEBUG = True
     SQLALCHEMY_ECHO = True
     SQLALCHEMY_TRACK_MODIFICATIONS = True
-    ALLOWED_HOSTS = "http://localhost:5000"
+
+    CELERY_BROKER_URL = 'redis://localhost:6379/0'
+    CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
+    REDIS_HOST = 'localhost'
+    REDIS_PASSWORD = ''
+    REDIS_PORT = 6379
+    REDIS_URL = 'redis://localhost:6379/0'
 
 
 class TestingConfiguration(Config):
@@ -52,6 +72,7 @@ class TestingConfiguration(Config):
     SQLALCHEMY_DATABASE_URI = "sqlite:///" + Config.BASE_DIR \
                               + "/test/test_db.sqlite"
     PAGE_LIMIT = 2
+    REDIS_URL = 'redis://localhost:6379/0'
 
 
 app_configuration = {
diff --git a/main.py b/main.py
index f2ff847..1e97ab2 100644
--- a/main.py
+++ b/main.py
@@ -1,22 +1,22 @@
 import os
 
+from celery import Celery
 from flask import Flask
 from flask_migrate import Migrate
 
 from config import app_configuration
-
 from application import models
 from application.views import app_view
 from application.auth.views import auth
 
 os.sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-# You must configure these 3 values from Google APIs console
-# https://code.google.com/apis/console
 GOOGLE_CLIENT_ID = '886619612646-5uteafhidohmbkd2fej7fdfl0iso5vgd.apps.googleusercontent.com'
 GOOGLE_CLIENT_SECRET = 'sx1hzvBhxhj_PHRfo5jVwWYn'
 REDIRECT_URI = '/dashboard'  # one of the Redirect URIs from Google APIs console
 
+celery = Celery(__name__, broker=os.environ.get('CELERY_BROKER_URL'))
+
 
 def create_application(environment):
     app = Flask(
@@ -26,6 +26,7 @@ def create_application(environment):
     app.config.from_object(app_configuration[environment])
     app.register_blueprint(app_view)
     app.register_blueprint(auth)
+    celery.conf.update(app.config)
     models.db.init_app(app)
     Migrate(app, models.db)
     return app
diff --git a/requirements.txt b/requirements.txt
index 2a4874a..0499582 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,12 @@
 alembic==0.9.7
+amqp==2.2.2
 aniso8601==2.0.0
 attrs==17.4.0
 autopep8==1.3.4
 beautifulsoup4==4.6.0
+billiard==3.5.0.3
 blinker==1.4
+celery==4.1.0
 certifi==2018.1.18
 chardet==3.0.4
 click==6.7
@@ -27,6 +30,7 @@ idna==2.6
 isort==4.2.15
 itsdangerous==0.24
 Jinja2==2.10
+kombu==4.1.0
 Mako==1.0.7
 MarkupSafe==1.0
 oauth2client==4.1.2
@@ -49,6 +53,7 @@ python3-openid==3.1.0
 pytz==2017.3
 PyYAML==3.12
 query-string==0.0.28
+redis==2.10.6
 requests==2.18.4
 rsa==3.4.2
 schedule==0.5.0
@@ -56,4 +61,5 @@ six==1.11.0
 SQLAlchemy==1.2.2
 uritemplate==3.0.0
 urllib3==1.22
+vine==1.1.4
 Werkzeug==0.14.1

From 6f74c9d85594cee34e81f109564cf08baac276c4 Mon Sep 17 00:00:00 2001
From: Ashaba <jnashaba4@gmail.com>
Date: Wed, 2 May 2018 00:03:56 +0300
Subject: [PATCH 9/9] feat(celery): background checks implementation

---
 .gitignore                                    |   1 +
 application/base_model.py                     |   4 +
 application/helpers.py                        | 147 ++++++++----------
 application/monitoring_tasks.py               |   4 +-
 application/static/js/dashboard.js            |   7 +-
 application/templates/collection_details.html |   3 +-
 application/views.py                          |  16 +-
 config.py                                     |   2 +-
 manage.py                                     |   9 ++
 migrations/versions/859d4718b1c4_.py          | 146 +++++++++++++++++
 test/application/test_helpers.py              |  17 ++
 test/application/test_monitoring.py           |  16 ++
 12 files changed, 277 insertions(+), 95 deletions(-)
 create mode 100644 migrations/versions/859d4718b1c4_.py
 create mode 100644 test/application/test_helpers.py
 create mode 100644 test/application/test_monitoring.py

diff --git a/.gitignore b/.gitignore
index e72eaba..0406257 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ __pycache__/
 celery-worker.db
 celerybeat-schedule.db
 celerybeat.pid
+dump.rdb
 
 # Distribution / packaging
 .Python
diff --git a/application/base_model.py b/application/base_model.py
index ce7ca6e..d9c05cc 100644
--- a/application/base_model.py
+++ b/application/base_model.py
@@ -1,8 +1,11 @@
+import logging
 from sqlalchemy.sql import func
 from sqlalchemy.exc import SQLAlchemyError
 from flask_sqlalchemy import SQLAlchemy
 db = SQLAlchemy()
 
+logger = logging.getLogger(__name__)
+
 
 class Base(db.Model):
     """Base models.
@@ -31,6 +34,7 @@ def save(self):
             return True
         except SQLAlchemyError as e:
             db.session.rollback()
+            logger.error("database operation error: ", e)
             return False
 
     def __repr__(self):
diff --git a/application/helpers.py b/application/helpers.py
index ef7cd05..eff73b2 100644
--- a/application/helpers.py
+++ b/application/helpers.py
@@ -1,16 +1,8 @@
 import requests
 import json
 import re
-from application.models import Request, Response, ResponseSummary, ResponseAssertion, Collection
-from application.models import Request, Collection
-
-
-def collection_scheduler(app_context):
-	with app_context:
-		collections = Collection.fetch_all()
-		for collection in collections:
-			if collection.interval:
-				run_collection_checks(collection.id, collection.interval)
+from application.models import Response, ResponseSummary, ResponseAssertion
+from application.models import Request
 
 
 def valid_url(url):
@@ -25,84 +17,75 @@ def valid_url(url):
 		return True
 	else:
 		return False
-	
+
 
 def run_collection_checks(collection_id, run_from):
-	print("Running checks now..................2", collection_id)
-	# checks = Request.filter_by(collection_id=collection_id)
-	# response_summary = ResponseSummary(
-	# 	status='success',
-	# 	failures=0,
-	# 	run_from=run_from,
-	# 	collection_id=collection_id
-	# )
-	# print("Response ***************", response_summary)
-	#
-	# for check in checks:
-	# 	headers = {}
-	# 	for header in check.headers:
-	# 		headers[header.key] = header.value
-	#
-	# 	if check.method == "GET":
-	# 		result = requests.get(check.url, headers=headers, verify=False)
-	# 	response = Response(
-	# 		status_code=result.status_code,
-	# 		response_time=int(result.elapsed.total_seconds()),
-	# 		headers=json.dumps(dict(result.headers)),
-	# 		status='success',
-	# 		failures=0,
-	# 		request_id=check.id,
-	# 		response_summary_id=response_summary.id
-	# 	)
-	# 	try:
-	# 		data = json.dumps(result.json())
-	# 	except json.decoder.JSONDecodeError:
-	# 		data = str(result.content)
-	# 	response.data = data
-	#
-	# 	for assertion in check.assertions:
-	# 		response_assertion = ResponseAssertion(
-	# 			assertion_type=assertion.assertion_type,
-	# 			comparison=assertion.comparison,
-	# 			value=assertion.value,
-	# 			status='failed',
-	# 			request_assertion_id=assertion.id,
-	# 			response_id=response.id)
-	# 		if assertion.assertion_type == 'Status Code':
-	# 			if assertion.value == response.status_code:
-	# 				response_assertion.status = "success"
-	# 		else:
-	# 			if 'less' in assertion.comparison:
-	# 				if response.response_time <= assertion.value:
-	# 					response_assertion.status = "success"
-	# 			else:
-	# 				if response.response_time >= assertion.value:
-	# 					response_assertion.status = "success"
-	# 		if response_assertion.status == 'failed':
-	# 			response.failures += 1
-	# 			response.status = 'failed'
-	# 		response.response_assertions.append(response_assertion)
-	#
-	# 	if response.status == 'failed':
-	# 		response_summary.failures += 1
-	# 		response_summary.status = 'failed'
-	# 	response_summary.responses.append(response)
-	#
-	# response_summary.save()
+	request_check = Request.filter_by(collection_id=collection_id)
+	response_summary = ResponseSummary(
+		run_from=run_from,
+		collection_id=collection_id
+	)
+	for req in request_check:
+		headers = {}
+		for header in req.headers:
+			headers[header.key] = header.value
+		response = make_request(req.url, req.method, headers=headers)
+		response.request_id = req.id
+		response.response_summary_id = response_summary.id
+		
+		failures, status = test_assertions(response, req)
+
+		response_summary.failures = failures
+		response_summary.status = status
+		response_summary.responses.append(response)
+	response_summary.save()
 
 
-def make_get_request(url, headers=None):
-	request = requests.get(url, headers=headers)
+def make_request(url, method, headers=None):
+	request = requests.get(url, headers=headers, verify=False)
 	try:
 		response_object = request.json()
 	except Exception:
 		response_object = request.content.decode("utf-8")
-		
-	response = {
-		"status_code": request.status_code,
-		"data": response_object,
-		"url": request.url,
-		"headers": json.dumps(dict(request.headers)),
-		"response_time": request.elapsed.total_seconds()
-	}
+	
+	response = Response(
+		status_code=request.status_code,
+		response_time=int(request.elapsed.total_seconds()),
+		headers=json.dumps(dict(request.headers)),
+		data=response_object,
+	)
+
 	return response
+
+
+def test_assertions(response, req):
+	failures = 0
+	status = "success"
+	for assertion in req.assertions:
+		response_assertion = ResponseAssertion(
+			assertion_type=assertion.assertion_type,
+			comparison=assertion.comparison,
+			value=assertion.value,
+			request_assertion_id=assertion.id,
+			response_id=response.id)
+		
+		if 'less' in assertion.comparison:
+			if response.response_time <= assertion.value:
+				response_assertion.status = status
+			else:
+				failures += 1
+				status = "failed"
+		
+		if assertion.assertion_type == 'Status Code':
+			if assertion.value == response.status_code:
+				response_assertion.status = status
+			else:
+				failures += 1
+				status = "failed"
+		response.failures = failures
+		response.status = status
+		response.response_assertions.append(response_assertion)
+		response.save()
+	
+	return failures, status
+
diff --git a/application/monitoring_tasks.py b/application/monitoring_tasks.py
index 8a53692..50fdfab 100644
--- a/application/monitoring_tasks.py
+++ b/application/monitoring_tasks.py
@@ -31,7 +31,7 @@ def monitoring_checks():
         scheduled_collections = [y for y in collections if y.interval]
         for collection in scheduled_collections:
             time.sleep(collection.interval)
-            run_collection_checks(collection.id, collection.interval)
+            run_collection_checks(collection.id, "Terminal")
     except Exception as e:
         logger.error(e)
 
@@ -42,6 +42,6 @@ def async_monitoring_checks():
     return
 
 
-@periodic_task(run_every=timedelta(seconds=60))
+@periodic_task(run_every=timedelta(seconds=0))
 def periodic_monitoring_checks():
     return monitoring_checks()
diff --git a/application/static/js/dashboard.js b/application/static/js/dashboard.js
index 810b5c7..a53ccf4 100644
--- a/application/static/js/dashboard.js
+++ b/application/static/js/dashboard.js
@@ -92,7 +92,7 @@ function getFormData(form) {
     var headersAndAssertions = {
         headers: [],
         assertions: []
-    }
+    };
 
     form.find('[name]').each(function (index1, value1) {
         var field = $(this),
@@ -126,6 +126,7 @@ function getFormData(form) {
         });
     });
 
+
     $.each(list_entries.assertionSources, function(index, sourceName) {
         headersAndAssertions.assertions.push({
             assertion_type: sourceName,
@@ -189,11 +190,11 @@ function createCheck(index, checkData) {
     var headersContainer = check.find('#headers');
     check.find('.addHeader').click(function() {
         createHeader(check, {});
-    })
+    });
 
     check.find('.addAssertion').click(function() {
         createAnAssertion(check, {});
-    })
+    });
     checkId++;
 
     if($.isEmptyObject(checkData) == false) {
diff --git a/application/templates/collection_details.html b/application/templates/collection_details.html
index 546a78a..c478019 100644
--- a/application/templates/collection_details.html
+++ b/application/templates/collection_details.html
@@ -31,6 +31,7 @@ <h4 class="checkList__Heading">Results</h4>
                 </div>
                 <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
                 <div id="results" class="tab-pane active"></div>
+
                 <div id="editor" class="tab-pane">
                     <div id="checks">
                         <div class="header">
@@ -47,8 +48,8 @@ <h3 class="collectionName">{{ context["collection"]["name"] }} </h3>
                         <div id="checksFormContainer"></div>
                         <span class="add-button" id="addCheck">+ Add check</span>
                     </div>
-                          
                 </div>
+
                 <div id="schedule" class="tab-pane">
                     <div class="schedule-box">
                         <div class="schedule-title">
diff --git a/application/views.py b/application/views.py
index b81b7f2..92819e2 100644
--- a/application/views.py
+++ b/application/views.py
@@ -17,6 +17,7 @@ def dashboard():
     context["title"] = "Dashboard"
     if request.method == 'POST':
         payload = request.get_json()
+        
         def handle_request(n):
             if n < 1:
                 return "no data"
@@ -221,12 +222,15 @@ def update_collection_checks(collection_id=None):
             assertion.value = _assertion['value']
             assertion.request_id = check.id
             assertion.save()
-
-    context = {}
-    collection = Collection.get(collection_id)
-    context["collection"] = collection.serialize()
-    context["title"] = "Collection Detail"
-    return render_template('collection_details.html', context=context)
+    response = jsonify(dict(
+        errors=errors
+    ))
+    return response
+    # context = {}
+    # collection = Collection.get(collection_id)
+    # context["collection"] = collection.serialize()
+    # context["title"] = "Collection Detail"
+    # return render_template('collection_details.html', context=context)
 
 
 @app_view.route('/settings', methods=['GET'])
diff --git a/config.py b/config.py
index 0473999..fb1e32c 100644
--- a/config.py
+++ b/config.py
@@ -11,7 +11,7 @@
 celery_get_request_schedule = {
         'schedule-name': {
             'task': 'application.monitoring_tasks.periodic_monitoring_checks',
-            'schedule': timedelta(seconds=30),
+            'schedule': timedelta(seconds=300),
         },
     }
 
diff --git a/manage.py b/manage.py
index 2a0fa32..819f081 100644
--- a/manage.py
+++ b/manage.py
@@ -3,6 +3,15 @@
 from flask_migrate import Migrate, MigrateCommand
 from flask_script import Manager, Shell
 
+from application.base_model import db
+from application.models import Collection, Team, Request, Response, team_members
+from application.auth.models import User
+from main import create_application
+import os
+
+from flask_migrate import Migrate, MigrateCommand
+from flask_script import Manager, Shell
+
 from application.base_model import db
 from application.models import Collection, Team, Request, Response, team_members
 from application.auth.models import User
diff --git a/migrations/versions/859d4718b1c4_.py b/migrations/versions/859d4718b1c4_.py
new file mode 100644
index 0000000..8492a0d
--- /dev/null
+++ b/migrations/versions/859d4718b1c4_.py
@@ -0,0 +1,146 @@
+"""empty message
+
+Revision ID: 859d4718b1c4
+Revises: 1ddfa7ff398d
+Create Date: 2018-04-30 18:53:37.626915
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '859d4718b1c4'
+down_revision = '1ddfa7ff398d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('User',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('name', sa.String(length=250), nullable=False),
+    sa.Column('email', sa.String(length=250), nullable=True),
+    sa.Column('image_url', sa.String(), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('email')
+    )
+    op.create_table('Team',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('name', sa.String(length=128), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['User.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('Collection',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('name', sa.String(length=128), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('team_id', sa.Integer(), nullable=True),
+    sa.Column('interval', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['team_id'], ['Team.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['User.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('team_members',
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('team_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['team_id'], ['Team.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['User.id'], )
+    )
+    op.create_table('Request',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('collection_id', sa.Integer(), nullable=True),
+    sa.Column('method', sa.String(length=128), nullable=False),
+    sa.Column('body', sa.String(length=255), nullable=True),
+    sa.Column('url', sa.String(length=255), nullable=False),
+    sa.ForeignKeyConstraint(['collection_id'], ['Collection.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('ResponseSummary',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('status', sa.String(), nullable=False),
+    sa.Column('failures', sa.Integer(), nullable=False),
+    sa.Column('run_from', sa.String(), nullable=True),
+    sa.Column('collection_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['collection_id'], ['Collection.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('Header',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('key', sa.String(), nullable=False),
+    sa.Column('value', sa.String(), nullable=False),
+    sa.Column('request_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['request_id'], ['Request.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('RequestAssertion',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('assertion_type', sa.String(), nullable=False),
+    sa.Column('comparison', sa.String(), nullable=False),
+    sa.Column('value', sa.Integer(), nullable=False),
+    sa.Column('request_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['request_id'], ['Request.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('Response',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('status_code', sa.Integer(), nullable=False),
+    sa.Column('status', sa.String(), nullable=True),
+    sa.Column('failures', sa.Integer(), nullable=False),
+    sa.Column('response_time', sa.Integer(), nullable=True),
+    sa.Column('data', sa.String(), nullable=False),
+    sa.Column('headers', sa.String(), nullable=False),
+    sa.Column('request_id', sa.Integer(), nullable=False),
+    sa.Column('response_summary_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['request_id'], ['Request.id'], ),
+    sa.ForeignKeyConstraint(['response_summary_id'], ['ResponseSummary.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('ResponseAssertion',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('date_created', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
+    sa.Column('date_modified', sa.DateTime(), nullable=True),
+    sa.Column('assertion_type', sa.String(), nullable=False),
+    sa.Column('comparison', sa.String(), nullable=False),
+    sa.Column('value', sa.Integer(), nullable=False),
+    sa.Column('status', sa.String(), nullable=True),
+    sa.Column('request_assertion_id', sa.Integer(), nullable=False),
+    sa.Column('response_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['request_assertion_id'], ['RequestAssertion.id'], ),
+    sa.ForeignKeyConstraint(['response_id'], ['Response.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('ResponseAssertion')
+    op.drop_table('Response')
+    op.drop_table('RequestAssertion')
+    op.drop_table('Header')
+    op.drop_table('ResponseSummary')
+    op.drop_table('Request')
+    op.drop_table('team_members')
+    op.drop_table('Collection')
+    op.drop_table('Team')
+    op.drop_table('User')
+    # ### end Alembic commands ###
diff --git a/test/application/test_helpers.py b/test/application/test_helpers.py
new file mode 100644
index 0000000..3c16760
--- /dev/null
+++ b/test/application/test_helpers.py
@@ -0,0 +1,17 @@
+from test.base import BaseTestCase
+from application.helpers import valid_url, make_request
+from application.models import Response
+
+
+class TestHelpers(BaseTestCase):
+	def test_valid_url(self):
+		valid_url_test = valid_url("http://test.com")
+		self.assertTrue(valid_url_test)
+		
+	def test_invalid_url(self):
+		invalid_url_test = valid_url("test.com")
+		self.assertFalse(invalid_url_test)
+		
+	def test_make_request(self):
+		req = make_request("http://test.com", "GET")
+		self.assertIsInstance(req, Response)
diff --git a/test/application/test_monitoring.py b/test/application/test_monitoring.py
new file mode 100644
index 0000000..e2902ac
--- /dev/null
+++ b/test/application/test_monitoring.py
@@ -0,0 +1,16 @@
+import os
+import redis
+from test.base import BaseTestCase
+from application.monitoring_tasks import monitoring_checks
+
+
+class TestMonitoring(BaseTestCase):
+	def test_redis_server(self):
+		url = os.environ.get("REDIS_URL") or "redis://localhost:6379"
+		redis_connection = redis.StrictRedis.from_url(url=url)
+		self.assertTrue(redis_connection)
+		
+	def test_monitoring_checks_with_no_data(self):
+		monitoring = monitoring_checks()
+		self.assertIsNone(monitoring)
+