From ae64087c36923b203c4f8663abe67afefe1abfe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Ace=C3=B1olaza?= <chanacenolaza@gmail.com>
Date: Wed, 15 Apr 2015 14:59:10 -0300
Subject: [PATCH] Added REST proxy class

---
 .../JiraConnectorFactory.cs                   |  18 +-
 .../Rest/JiraRestProxy.cs                     | 298 ++++++++++++++++++
 .../VersionOne.JiraConnector.csproj           |  10 +
 VersionOne.JiraConnector/packages.config      |   4 +
 .../JiraHostedService.cs                      |  89 ++++--
 VersionOne.ServiceHost/App.config             |  16 +-
 .../VersionOne.ServiceHost.csproj             |   4 +
 VersionOne.ServiceHost/packages.config        |   4 +
 8 files changed, 399 insertions(+), 44 deletions(-)
 create mode 100644 VersionOne.JiraConnector/Rest/JiraRestProxy.cs
 create mode 100644 VersionOne.JiraConnector/packages.config
 create mode 100644 VersionOne.ServiceHost/packages.config

diff --git a/VersionOne.JiraConnector/JiraConnectorFactory.cs b/VersionOne.JiraConnector/JiraConnectorFactory.cs
index e1fe1ac..75b7619 100644
--- a/VersionOne.JiraConnector/JiraConnectorFactory.cs
+++ b/VersionOne.JiraConnector/JiraConnectorFactory.cs
@@ -1,22 +1,28 @@
 /*(c) Copyright 2012, VersionOne, Inc. All rights reserved. (c)*/
 using System;
+using VersionOne.JiraConnector.Rest;
 using VersionOne.JiraConnector.Soap;
 
-namespace VersionOne.JiraConnector {
-    public class JiraConnectorFactory {
+namespace VersionOne.JiraConnector
+{
+    public class JiraConnectorFactory
+    {
         public readonly JiraConnectorType ConnectorType;
 
-        public JiraConnectorFactory(JiraConnectorType connectorType) {
+        public JiraConnectorFactory(JiraConnectorType connectorType)
+        {
             ConnectorType = connectorType;
         }
 
-        public IJiraConnector Create(string url, string username, string password) {
-            switch (ConnectorType) {
+        public IJiraConnector Create(string url, string username, string password)
+        {
+            switch (ConnectorType)
+            {
                 case JiraConnectorType.Soap:
                     return new JiraSoapProxy(url, username, password);
 
                 case JiraConnectorType.Rest:
-                    throw new NotImplementedException();
+                    return new JiraRestProxy(url, username, password);
 
                 default:
                     throw new NotSupportedException();
diff --git a/VersionOne.JiraConnector/Rest/JiraRestProxy.cs b/VersionOne.JiraConnector/Rest/JiraRestProxy.cs
new file mode 100644
index 0000000..f0103ad
--- /dev/null
+++ b/VersionOne.JiraConnector/Rest/JiraRestProxy.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Net;
+using RestSharp;
+using System.Web.Helpers;
+using VersionOne.JiraConnector.Exceptions;
+
+namespace VersionOne.JiraConnector.Rest
+{
+    public class JiraRestProxy : IJiraConnector
+    {
+        private readonly RestClient client;
+
+        public JiraRestProxy(string baseUrl)
+            : this(baseUrl, string.Empty, string.Empty)
+        {
+        }
+
+        public JiraRestProxy(string baseUrl, string username, string password)
+        {
+            client = new RestClient(baseUrl);
+
+            if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
+            {
+                client.Authenticator = new HttpBasicAuthenticator(username, password);
+            }
+        }
+
+        public void Login()
+        {
+            //throw new NotImplementedException();
+        }
+
+        public void Logout()
+        {
+            //throw new NotImplementedException();
+        }
+
+        public Issue[] GetIssuesFromFilter(string issueFilterId)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "search",
+                RequestFormat = DataFormat.Json
+            };
+            request.AddQueryParameter("jql", string.Format("filter={0}", issueFilterId));
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return ((IEnumerable<dynamic>)data.issues).Select(i => (Issue)CreateIssue(i)).ToArray();
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public Issue UpdateIssue(string issueKey, string fieldName, string fieldValue)
+        {
+            dynamic editMetadata = GetEditMetadata(issueKey);
+            dynamic fieldMeta = editMetadata.fields[fieldName];
+
+            if (fieldMeta == null)
+                throw new JiraException("Field metadata is missing", null);
+            if (fieldMeta.schema.type == null)
+                throw new JiraException("Field metadata is missing a type", null);
+
+            var request = new RestRequest
+            {
+                Method = Method.PUT,
+                Resource = "issue/{issueIdOrKey}",
+                RequestFormat = DataFormat.Json,
+            };
+            request.AddUrlSegment("issueIdOrKey", issueKey);
+
+            dynamic body;
+            if (fieldMeta.schema.type.Equals("array"))
+            {
+                dynamic operation = new ExpandoObject();
+                ((IDictionary<string, object>)operation).Add(fieldName, new List<dynamic>
+                {
+                    new
+                    {
+                        set = new List<string> { fieldValue }
+                    }
+                });
+                body = new { update = operation };
+            }
+            else
+            {
+                dynamic field = new ExpandoObject();
+                ((IDictionary<string, object>)field).Add(fieldName, fieldValue);
+                body = new { fields = field };
+            }
+            request.AddBody(body);
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.NoContent))
+                return GetIssue(issueKey);
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public IList<Item> GetPriorities()
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "priority",
+                RequestFormat = DataFormat.Json
+            };
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return ((IEnumerable<dynamic>)data).Select(i => new Item(i.id, i.name)).ToList();
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public IList<Item> GetProjects()
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "project",
+                RequestFormat = DataFormat.Json
+            };
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return ((IEnumerable<dynamic>)data).Select(i => new Item(i.id, i.name)).ToList();
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public void AddComment(string issueKey, string comment)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.POST,
+                Resource = "issue/{issueIdOrKey}/comment",
+                RequestFormat = DataFormat.Json,
+            };
+            request.AddUrlSegment("issueIdOrKey", issueKey);
+
+            request.AddBody(new { body = comment });
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.Created))
+                return;
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public void ProgressWorkflow(string issueKey, string action, string assignee)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.POST,
+                Resource = "issue/{issueIdOrKey}/transitions",
+                RequestFormat = DataFormat.Json,
+            };
+            request.AddUrlSegment("issueIdOrKey", issueKey);
+
+            dynamic body = new ExpandoObject();
+            ((IDictionary<string, object>)body).Add("transition", new { id = action });
+            if (assignee != null)
+                ((IDictionary<string, object>)body).Add("fields", new { assignee = new { name = assignee } });
+            request.AddBody(body);
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.NoContent))
+                return;
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public IEnumerable<Item> GetAvailableActions(string issueId)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "issue/{issueIdOrKey}/transitions?expand=transitions.fields",
+                RequestFormat = DataFormat.Json
+            };
+            request.AddUrlSegment("issueIdOrKey", issueId);
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return ((IEnumerable<dynamic>)data.transitions).Select(i => new Item(i.id, i.name)).ToList();
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        public IEnumerable<Item> GetCustomFields()
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "field",
+                RequestFormat = DataFormat.Json
+            };
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return ((IEnumerable<dynamic>)data).Where(i => i.custom).Select(i => new Item(i.id, i.name)).ToList();
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        private dynamic GetEditMetadata(string issueIdOrKey)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "issue/{issueIdOrKey}/editmeta",
+                RequestFormat = DataFormat.Json
+            };
+            request.AddUrlSegment("issueIdOrKey", issueIdOrKey);
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+                return Json.Decode(response.Content);
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        private Issue GetIssue(string issueIdOrKey)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "issue/{issueIdOrKey}",
+                RequestFormat = DataFormat.Json
+            };
+            request.AddUrlSegment("issueIdOrKey", issueIdOrKey);
+
+            var response = client.Execute(request);
+
+            if (response.StatusCode.Equals(HttpStatusCode.OK))
+            {
+                dynamic data = Json.Decode(response.Content);
+                return CreateIssue(data);
+            }
+            if (response.StatusCode.Equals(HttpStatusCode.Unauthorized))
+                throw new JiraLoginException();
+            throw new JiraException(response.StatusDescription, new Exception(response.Content));
+        }
+
+        private Issue CreateIssue(dynamic data)
+        {
+            return new Issue
+            {
+                Id = data.id,
+                Key = data.key,
+                Summary = data.fields.summary,
+                Description = data.fields.description,
+                Project = data.fields.project != null ? data.fields.project.name : string.Empty,
+                IssueType = data.fields.issuetype != null ? data.fields.issuetype.name : string.Empty,
+                Assignee = data.fields.assignee != null ? data.fields.assignee.name : string.Empty,
+                Priority = data.fields.priority != null ? data.fields.priority.name : string.Empty
+            };
+        }
+    }
+}
diff --git a/VersionOne.JiraConnector/VersionOne.JiraConnector.csproj b/VersionOne.JiraConnector/VersionOne.JiraConnector.csproj
index 4549654..c3d1561 100644
--- a/VersionOne.JiraConnector/VersionOne.JiraConnector.csproj
+++ b/VersionOne.JiraConnector/VersionOne.JiraConnector.csproj
@@ -72,12 +72,20 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="RestSharp, Version=105.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -91,6 +99,7 @@
     <Compile Include="Item.cs" />
     <Compile Include="JiraConnectorFactory.cs" />
     <Compile Include="JiraConnectorType.cs" />
+    <Compile Include="Rest\JiraRestProxy.cs" />
     <Compile Include="Soap\JiraSoapProxy.cs" />
     <Compile Include="Soap\JiraSoapService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -118,6 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/VersionOne.JiraConnector/packages.config b/VersionOne.JiraConnector/packages.config
new file mode 100644
index 0000000..02326fb
--- /dev/null
+++ b/VersionOne.JiraConnector/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/VersionOne.ServiceHost.JiraServices/JiraHostedService.cs b/VersionOne.ServiceHost.JiraServices/JiraHostedService.cs
index aa9fcf4..6b0b44c 100644
--- a/VersionOne.ServiceHost.JiraServices/JiraHostedService.cs
+++ b/VersionOne.ServiceHost.JiraServices/JiraHostedService.cs
@@ -17,14 +17,16 @@
 using ConfigurationException = VersionOne.ServiceHost.Core.Utility.ConfigurationException;
 using StartupChecker = VersionOne.ServiceHost.JiraServices.StartupValidation.StartupChecker;
 
-namespace VersionOne.ServiceHost.JiraServices {
+namespace VersionOne.ServiceHost.JiraServices
+{
     /// <summary>
     /// A service that:
     ///		1) Polls JIRA on a configurable interval for Issues to create in VersionOne.
     ///		2) Listens for Defects created in VersionOne and updates the corresponding issues in JIRA.
     /// </summary>
-    public class JiraHostedService : IHostedService, IComponentProvider {
-        public class IntervalSync {}
+    public class JiraHostedService : IHostedService, IComponentProvider
+    {
+        public class IntervalSync { }
 
         private IJiraIssueProcessor jiraProcessor;
         private IEventManager eventManager;
@@ -34,31 +36,38 @@ public class IntervalSync {}
 
         private StartupChecker startupChecker;
 
-        public void Initialize(XmlElement config, IEventManager eventManager, IProfile profile) {
+        public void Initialize(XmlElement config, IEventManager eventManager, IProfile profile)
+        {
             this.eventManager = eventManager;
             this.config = config;
             logger = new Logger(eventManager);
 
-            try {
+            try
+            {
                 jiraConfig = GetValuesFromConfiguration();
-            } catch(Exception ex) {
+            }
+            catch (Exception ex)
+            {
                 logger.Log(LogMessage.SeverityType.Error, "Error during reading settings from configuration file.", ex);
                 return;
             }
 
-            if(jiraConfig.Url == null) {
+            if (jiraConfig.Url == null)
+            {
                 throw new ConfigurationException("Cannot initialize JIRA Service without a URL");
             }
         }
 
-        public void Start() {
+        public void Start()
+        {
             startupChecker.Initialize();
             eventManager.Subscribe(typeof(IntervalSync), OnInterval);
             eventManager.Subscribe(typeof(WorkitemCreationResult), OnWorkitemCreated);
             eventManager.Subscribe(typeof(WorkitemStateChangeCollection), OnWorkitemStateChanged);
         }
 
-        private JiraServiceConfiguration GetValuesFromConfiguration() {
+        private JiraServiceConfiguration GetValuesFromConfiguration()
+        {
             jiraConfig = new JiraServiceConfiguration();
 
             ConfigurationReader.ReadConfigurationValues(jiraConfig, config);
@@ -77,10 +86,12 @@ private JiraServiceConfiguration GetValuesFromConfiguration() {
             return jiraConfig;
         }
 
-        private JiraFilter GetFilterFromConfiguration(string nodeName) {
+        private JiraFilter GetFilterFromConfiguration(string nodeName)
+        {
             var node = config[nodeName];
-            
-            if(node == null) {
+
+            if (node == null)
+            {
                 throw new JiraConfigurationException("Can't read filter information");
             }
 
@@ -97,37 +108,47 @@ private JiraFilter GetFilterFromConfiguration(string nodeName) {
         /// Timer interval on which to poll JIRA. See app config file for time in milliseconds.
         /// </summary>
         /// <param name="pubobj">Not used</param>
-        private void OnInterval(object pubobj) {
+        private void OnInterval(object pubobj)
+        {
             logger.Log(LogMessage.SeverityType.Info, "Starting processing...");
             IList<Workitem> workitems = new List<Workitem>();
 
-            try {
+            try
+            {
                 logger.Log(LogMessage.SeverityType.Info, "Getting issues from JIRA.");
 
-                if(jiraConfig.OpenDefectFilter.Enabled) {
+                if (jiraConfig.OpenDefectFilter.Enabled)
+                {
                     var bugs = jiraProcessor.GetIssues<Defect>(jiraConfig.OpenDefectFilter.Id);
 
-                    if(bugs.Count > 0) {
+                    if (bugs.Count > 0)
+                    {
                         logger.Log(string.Format("Found {0} defects in JIRA to create in VersionOne.", bugs.Count));
                     }
 
-                    foreach(var bug in bugs) {
+                    foreach (var bug in bugs)
+                    {
                         workitems.Add(bug);
                     }
                 }
 
-                if(jiraConfig.OpenStoryFilter.Enabled) {
+                if (jiraConfig.OpenStoryFilter.Enabled)
+                {
                     var stories = jiraProcessor.GetIssues<Story>(jiraConfig.OpenStoryFilter.Id);
 
-                    if(stories.Count > 0) {
+                    if (stories.Count > 0)
+                    {
                         logger.Log(string.Format("Found {0} stories in JIRA to create in VersionOne.", stories.Count));
                     }
 
-                    foreach(var story in stories) {
+                    foreach (var story in stories)
+                    {
                         workitems.Add(story);
                     }
                 }
-            } catch(Exception ex) {
+            }
+            catch (Exception ex)
+            {
                 logger.Log(LogMessage.SeverityType.Error, string.Format("Error getting Issues from JIRA: {0}", ex.Message));
                 return;
             }
@@ -136,7 +157,8 @@ private void OnInterval(object pubobj) {
             workitems = workitems.Distinct().ToList();
 
             // Create Workitem in V1 
-            foreach(var item in workitems) {
+            foreach (var item in workitems)
+            {
                 item.ExternalSystemName = jiraConfig.SourceFieldValue;
                 eventManager.Publish(item);
             }
@@ -153,32 +175,39 @@ private void OnInterval(object pubobj) {
         /// We update the Issue in JIRA to reflect that.
         /// </summary>
         /// <param name="pubobj">WorkitemCreationResult of created defect.</param>
-        private void OnWorkitemCreated(object pubobj) {
+        private void OnWorkitemCreated(object pubobj)
+        {
             var creationResult = pubobj as WorkitemCreationResult;
 
-            if(creationResult != null) {
+            if (creationResult != null)
+            {
                 jiraProcessor.OnWorkitemCreated(creationResult);
             }
         }
 
-        private void OnWorkitemStateChanged(object pubobj) {
+        private void OnWorkitemStateChanged(object pubobj)
+        {
             var stateChangeCollection = pubobj as WorkitemStateChangeCollection;
 
-            if(stateChangeCollection == null) {
+            if (stateChangeCollection == null)
+            {
                 return;
             }
 
-            foreach(var stateChangeResult in stateChangeCollection) {
+            foreach (var stateChangeResult in stateChangeCollection)
+            {
                 stateChangeResult.ChangesProcessed = true;
 
-                if(!jiraProcessor.OnWorkitemStateChanged(stateChangeResult)) {
+                if (!jiraProcessor.OnWorkitemStateChanged(stateChangeResult))
+                {
                     stateChangeResult.ChangesProcessed = false;
                 }
             }
         }
 
-        public void RegisterComponents(IKernel container) {
-            var connector = new JiraConnectorFactory(JiraConnectorType.Soap).Create(jiraConfig.Url, jiraConfig.UserName, jiraConfig.Password);
+        public void RegisterComponents(IKernel container)
+        {
+            var connector = new JiraConnectorFactory(JiraConnectorType.Rest).Create(jiraConfig.Url, jiraConfig.UserName, jiraConfig.Password);
 
             container.Rebind<IEventManager>().ToConstant(eventManager);
             container.Rebind<ILogger>().ToConstant(logger);
diff --git a/VersionOne.ServiceHost/App.config b/VersionOne.ServiceHost/App.config
index fe013c1..d260c8c 100644
--- a/VersionOne.ServiceHost/App.config
+++ b/VersionOne.ServiceHost/App.config
@@ -42,12 +42,12 @@
     <JiraService disabled="0" class="VersionOne.ServiceHost.JiraServices.JiraHostedService, VersionOne.ServiceHost.JiraServices">
       
       <!-- JIRA Connectivity -->
-      <JIRAUrl>http://jira-6.cloudapp.net:8080/rpc/soap/jirasoapservice-v2</JIRAUrl>
+      <JIRAUrl>http://jira-64.cloudapp.net:8080/rest/api/latest</JIRAUrl>
       <JIRAUserName>admin</JIRAUserName>
       <JIRAPassword>admin</JIRAPassword>
 
-      <CreateDefectFilter disabled="0" id="10101"/>     <!--Id of the filter used to find issues that need to have defects created-->
-      <CreateStoryFilter disabled="0" id="10102"/>      <!--Id of the filter used to find issues that need to have stories created-->
+      <CreateDefectFilter disabled="0" id="10300"/>     <!--Id of the filter used to find issues that need to have defects created-->
+      <CreateStoryFilter disabled="0" id="10200"/>      <!--Id of the filter used to find issues that need to have stories created-->
 
       <!-- Fields to update to prevent creating multiple Workitems in VersionOne -->
       <!-- Not all of these fields are required, consult the documentation on how to set them -->
@@ -55,12 +55,12 @@
       <CreateFieldValue>Open</CreateFieldValue>         <!-- Value to set in CreateFieldId -->
       <CloseFieldId>customfield_10001</CloseFieldId>    <!-- ID of JIRA field to update when a V1 defect is closed -->
       <CloseFieldValue>Closed</CloseFieldValue>         <!-- Value to set in CloseFieldId -->
-      <ProgressWorkflow>21</ProgressWorkflow>            <!-- ID of JIRA Transition to set after a V1 defect is created -->
-      <ProgressWorkflowClosed>31</ProgressWorkflowClosed><!-- ID of JIRA Transition to set after a V1 defect is closed -->
+      <ProgressWorkflow>11</ProgressWorkflow>            <!-- ID of JIRA Transition to set after a V1 defect is created -->
+      <ProgressWorkflowClosed>21</ProgressWorkflowClosed><!-- ID of JIRA Transition to set after a V1 defect is closed -->
       <AssigneeStateChanged>-1</AssigneeStateChanged>   <!-- Name to set the assignee to field to when a V1 defect is closed (optional) Note: In JIRA 3.10.2 a value of -1 caused 'Automatic' assignment -->
 
       <!-- These elements are used to create a link in VersionOne to JIRA issue (we replace #key# with JIRA Issue id) -->
-      <JIRAIssueUrlTemplate>http://jira-6.cloudapp.net:8080/browse/#key#</JIRAIssueUrlTemplate>
+      <JIRAIssueUrlTemplate>http://jira-64.cloudapp.net:8080/browse/#key#</JIRAIssueUrlTemplate>
       <JIRAIssueUrlTitle>JIRA</JIRAIssueUrlTitle>
 
       <!-- What to set the 'Source' field to. Make sure this value exists in VersionOne. -->
@@ -72,7 +72,7 @@
       <!-- Mapping for projects from JIRA to VersionOne -->
       <ProjectMappings>
         <Mapping>
-          <JIRAProject>ScrumTest</JIRAProject>
+          <JIRAProject>JIRA Integration Test</JIRAProject>
           <VersionOneProject id="Scope:6991"></VersionOneProject>
         </Mapping>
       </ProjectMappings>
@@ -99,7 +99,7 @@
 
     <!-- Jira Poll Timer -->
     <JiraServiceTimer disabled="0" class="VersionOne.ServiceHost.Core.Services.TimePublisherService, VersionOne.ServiceHost.Core">
-      <Interval>2000</Interval>
+      <Interval>5000</Interval>
       <PublishClass>VersionOne.ServiceHost.JiraServices.JiraHostedService+IntervalSync, VersionOne.ServiceHost.JiraServices</PublishClass>
     </JiraServiceTimer>
 
diff --git a/VersionOne.ServiceHost/VersionOne.ServiceHost.csproj b/VersionOne.ServiceHost/VersionOne.ServiceHost.csproj
index 497cbb7..7393d83 100644
--- a/VersionOne.ServiceHost/VersionOne.ServiceHost.csproj
+++ b/VersionOne.ServiceHost/VersionOne.ServiceHost.csproj
@@ -79,6 +79,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="RestSharp">
+      <HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Configuration.Install" />
@@ -107,6 +110,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="profile.xml">
diff --git a/VersionOne.ServiceHost/packages.config b/VersionOne.ServiceHost/packages.config
new file mode 100644
index 0000000..02326fb
--- /dev/null
+++ b/VersionOne.ServiceHost/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.0.1" targetFramework="net451" />
+</packages>
\ No newline at end of file