Merge pull request #5 from upwork/v1.1.0

V1.1.0
upwork · Oct 12, 2015 · f9de4ee · f9de4ee
2 parents 4ae1706 + 298334e
commit f9de4ee
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Release History
 
+## 1.1.0
+* Get Categories (V1) is now fully depricated
+* Added new Activities API - Assign to specific engagement the list of activities
+
 ## 1.0.2
 * bug fixes
 

diff --git a/example-android/app/libs/java-upwork.jar b/example-android/app/libs/java-upwork.jar
diff --git a/lib/java-upwork.jar b/lib/java-upwork.jar
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.Upwork</groupId>
   <artifactId>api</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <packaging>jar</packaging>
   <name>java-upwork</name>
   <description>JAVA bindings for Upwork API</description>

diff --git a/src/com/Upwork/api/Routers/Activities/Engagement.java b/src/com/Upwork/api/Routers/Activities/Engagement.java
@@ -28,7 +28,7 @@
 	author = "Maksym Novozhylov <[email protected]>",
 	date = "6/4/2014",
 	currentRevision = 1,
-	lastModified = "6/4/2014",
+	lastModified = "24/09/2015",
 	lastModifiedBy = "Maksym Novozhylov",
 	reviewers = {"Yiota Tsakiri"}
 )
@@ -43,12 +43,12 @@ public Engagement(OAuthClient client) {
 		oClient.setEntryPoint(ENTRY_POINT);
 	}
 
-	/**
+   /**
      * List activities for specific engagement
      *
      * @param   engagement_ref Engagement reference
      * @throws	JSONException If error occurred
-	 * @return	{@link JSONObject}
+     * @return	{@link JSONObject}
      */
     public JSONObject getSpecific(String engagement_ref) throws JSONException {
         return oClient.get("/tasks/v2/tasks/contracts/" + engagement_ref);
@@ -62,10 +62,22 @@ public JSONObject getSpecific(String engagement_ref) throws JSONException {
      * @param   engagement Engagement
      * @param   params Parameters
      * @throws	JSONException If error occurred
-	 * @return	{@link JSONObject}
+     * @return	{@link JSONObject}
      */
     public JSONObject assign(String company, String team, String engagement, HashMap<String, String> params) throws JSONException {
         return oClient.put("/otask/v1/tasks/companies/" + company + "/teams/" + team + "/engagements/" + engagement + "/tasks", params);
     }
 
+    /**
+     * Assign engagements to the list of activities
+     *
+     * @param   engagement_ref Engagement reference
+     * @param   params Parameters
+     * @throws	JSONException If error occurred
+     * @return	{@link JSONObject}
+     */
+    public JSONObject assignToEngagement(String engagement_ref, HashMap<String, String> params) throws JSONException {
+        return oClient.put("/tasks/v2/tasks/contracts/" + engagement_ref, params);
+    }
+
 }
diff --git a/test/com/Upwork/api/Routers/Activities/EngagementTest.java b/test/com/Upwork/api/Routers/Activities/EngagementTest.java
@@ -31,4 +31,11 @@ public class EngagementTest extends Helper {
 
         assertTrue(json instanceof JSONObject);
 	}
-}
+
+	@Test public void assignToEngagement() throws Exception {
+		Engagement activities = new Engagement(client);
+    	JSONObject json = activities.assignToEngagement("1234", new HashMap<String, String>());
+
+        assertTrue(json instanceof JSONObject);
+	}
+}