#422 updated to core 72 and storage 68

self-xdsd · Apr 14, 2021 · 78aac39 · 78aac39
1 parent a80562c
commit 78aac39
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,8 @@
 
 	<properties>
 		<java.version>11</java.version>
-        <self.core.version>0.0.71</self.core.version>
-        <self.storage.version>0.0.67</self.storage.version>
+        <self.core.version>0.0.72</self.core.version>
+        <self.storage.version>0.0.68</self.storage.version>
     </properties>
 
 	<dependencies>

diff --git a/src/main/java/com/selfxdsd/selfweb/api/ProjectManagersApi.java b/src/main/java/com/selfxdsd/selfweb/api/ProjectManagersApi.java
@@ -114,7 +114,8 @@ public ResponseEntity<String> register(@Valid final PmInput newPm) {
                     newPm.getUsername(),
                     newPm.getProvider(),
                     newPm.getToken(),
-                    newPm.getCommission()
+                    newPm.getCommission(),
+                    newPm.getContributorCommission()
                 );
             response = ResponseEntity.ok(
                 new JsonProjectManager(registered).toString()

diff --git a/src/main/java/com/selfxdsd/selfweb/api/input/PmInput.java b/src/main/java/com/selfxdsd/selfweb/api/input/PmInput.java
@@ -32,6 +32,8 @@
  * @version $Id$
  * @since 0.0.1
  * @checkstyle JavadocMethod (200 lines)
+ * @checkstyle MemberName (200 lines)
+ * @checkstyle HiddenField (200 lines)
  */
 public class PmInput {
 
@@ -64,11 +66,17 @@ public class PmInput {
     private String token;
 
     /**
-     * PM's commission.
+     * Project's commission.
      */
-    @Positive(message = "PM's commission must be a positive number!")
+    @Positive(message = "Project's commission must be a positive number!")
     private double commission;
 
+    /**
+     * Contributor's commission.
+     */
+    @Positive(message = "Contributor's commission must be a positive number!")
+    private double contributorCommission;
+
     public String getUserId() {
         return userId;
     }
@@ -108,4 +116,12 @@ public double getCommission() {
     public void setCommission(final double comm) {
         this.commission = comm;
     }
+
+    public double getContributorCommission() {
+        return contributorCommission;
+    }
+
+    public void setContributorCommission(final double contributorCommission) {
+        this.contributorCommission = contributorCommission;
+    }
 }
diff --git a/src/main/java/com/selfxdsd/selfweb/api/output/JsonInvoicedTask.java b/src/main/java/com/selfxdsd/selfweb/api/output/JsonInvoicedTask.java
@@ -49,7 +49,10 @@ public JsonInvoicedTask(final InvoicedTask task) {
                 .add("value", task.value().divide(BigDecimal.valueOf(100)))
                 .add(
                     "commission",
-                    task.commission().divide(BigDecimal.valueOf(100))
+                    task.projectCommission().divide(BigDecimal.valueOf(100))
+                ).add(
+                    "contributorCommission",
+                    task.contributorCommission().divide(BigDecimal.valueOf(100))
                 ).build()
         );
     }

diff --git a/src/main/java/com/selfxdsd/selfweb/api/output/JsonProjectManager.java b/src/main/java/com/selfxdsd/selfweb/api/output/JsonProjectManager.java
@@ -48,8 +48,11 @@ public JsonProjectManager(final ProjectManager manager) {
                 .add("userId", manager.userId())
                 .add("username", manager.username())
                 .add("provider", manager.provider().name())
-                .add("commission", manager.percentage())
-                .build()
+                .add("commission", manager.projectPercentage())
+                .add(
+                    "contributorCommission",
+                    manager.contributorPercentage()
+                ).build()
         );
     }
 }
diff --git a/src/test/java/com/selfxdsd/selfweb/api/ContractsApiTestCase.java b/src/test/java/com/selfxdsd/selfweb/api/ContractsApiTestCase.java
@@ -401,7 +401,7 @@ private Project mockActiveProject(
         Mockito.when(manager.id()).thenReturn(1);
         Mockito.when(manager.userId()).thenReturn("123");
         Mockito.when(manager.username()).thenReturn("zoeself");
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
         final Provider prov = Mockito.mock(Provider.class);
         Mockito.when(prov.name()).thenReturn("github");
         Mockito.when(manager.provider()).thenReturn(prov);

diff --git a/src/test/java/com/selfxdsd/selfweb/api/ProjectManagersApiTestCase.java b/src/test/java/com/selfxdsd/selfweb/api/ProjectManagersApiTestCase.java
@@ -110,7 +110,8 @@ public void registerManagerWorksForAdmin() {
                 "zoe",
                 "github",
                 "token123",
-                8.0
+                8.0,
+                5.0
             )
         ).thenReturn(registered);
         Mockito.when(core.projectManagers()).thenReturn(all);
@@ -121,6 +122,7 @@ public void registerManagerWorksForAdmin() {
         input.setProvider("github");
         input.setToken("token123");
         input.setCommission(8.0);
+        input.setContributorCommission(5.0);
 
         final ResponseEntity<String> resp = new ProjectManagersApi(user, core)
             .register(input);
@@ -169,7 +171,7 @@ private ProjectManager mockManager(final int id) {
         final Provider provider = Mockito.mock(Provider.class);
         Mockito.when(provider.name()).thenReturn("github");
         Mockito.when(manager.provider()).thenReturn(provider);
-        Mockito.when(manager.percentage()).thenReturn(8.0);
+        Mockito.when(manager.projectPercentage()).thenReturn(8.0);
         return manager;
     }
 }
diff --git a/src/test/java/com/selfxdsd/selfweb/api/ProjectsApiTestCase.java b/src/test/java/com/selfxdsd/selfweb/api/ProjectsApiTestCase.java
@@ -617,7 +617,7 @@ private Project mockActiveProject(
         Mockito.when(manager.id()).thenReturn(1);
         Mockito.when(manager.userId()).thenReturn("123");
         Mockito.when(manager.username()).thenReturn("zoeself");
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
         final Provider prov = Mockito.mock(Provider.class);
         Mockito.when(prov.name()).thenReturn("github");
         Mockito.when(manager.provider()).thenReturn(prov);

diff --git a/src/test/java/com/selfxdsd/selfweb/api/output/JsonInvoicedTaskTestCase.java b/src/test/java/com/selfxdsd/selfweb/api/output/JsonInvoicedTaskTestCase.java
@@ -59,9 +59,12 @@ public void hasInvoicedTaskId(){
 
         Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(100));
 
-        Mockito.when(invoicedTask.commission())
+        Mockito.when(invoicedTask.projectCommission())
             .thenReturn(BigDecimal.valueOf(100));
-
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(30));
+
         final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
 
         MatcherAssert.assertThat(
@@ -92,9 +95,12 @@ public void hasIssueId(){
 
         Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(100));
 
-        Mockito.when(invoicedTask.commission())
+        Mockito.when(invoicedTask.projectCommission())
             .thenReturn(BigDecimal.valueOf(100));
-
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(30));
+
         final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
 
         MatcherAssert.assertThat(
@@ -124,8 +130,11 @@ public void hasEstimation(){
 
         Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(100));
 
-        Mockito.when(invoicedTask.commission())
+        Mockito.when(invoicedTask.projectCommission())
             .thenReturn(BigDecimal.valueOf(100));
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(30));
 
         final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
 
@@ -156,8 +165,11 @@ public void hasValue(){
 
         Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(1000));
 
-        Mockito.when(invoicedTask.commission())
+        Mockito.when(invoicedTask.projectCommission())
             .thenReturn(BigDecimal.valueOf(100));
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(30));
 
         final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
 
@@ -188,8 +200,11 @@ public void hasCommission(){
 
         Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(100));
 
-        Mockito.when(invoicedTask.commission())
+        Mockito.when(invoicedTask.projectCommission())
             .thenReturn(BigDecimal.valueOf(3000));
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(30));
 
         final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
 
@@ -198,4 +213,39 @@ public void hasCommission(){
             Matchers.equalTo(30)
         );
     }
+
+    /**
+     * JsonInvoicedTask has contributor commission.
+     */
+    @Test
+    public void hasContributorCommission(){
+        final InvoicedTask invoicedTask = Mockito.mock(InvoicedTask.class);
+
+        Mockito.when(invoicedTask.invoicedTaskId()).thenReturn(123);
+
+        Task task = Mockito.mock(Task.class);
+
+        Mockito.when(task.issueId()).thenReturn("123");
+
+        Mockito.when(invoicedTask.task()).thenReturn(task);
+
+        Mockito.when(task.estimation()).thenReturn(2);
+
+        Mockito.when(invoicedTask.task()).thenReturn(task);
+
+        Mockito.when(invoicedTask.value()).thenReturn(BigDecimal.valueOf(100));
+
+        Mockito.when(invoicedTask.projectCommission())
+            .thenReturn(BigDecimal.valueOf(3000));
+
+        Mockito.when(invoicedTask.contributorCommission())
+            .thenReturn(BigDecimal.valueOf(2000));
+
+        final JsonObject jsonInvoicedTask = new JsonInvoicedTask(invoicedTask);
+
+        MatcherAssert.assertThat(
+            jsonInvoicedTask.getInt("contributorCommission"),
+            Matchers.equalTo(20)
+        );
+    }
 }
diff --git a/src/test/java/com/selfxdsd/selfweb/api/output/JsonProjectTestCase.java b/src/test/java/com/selfxdsd/selfweb/api/output/JsonProjectTestCase.java
@@ -71,7 +71,7 @@ public void hasRepoFullName(){
         Mockito.when(provider.name()).thenReturn("Github");
 
         Mockito.when(manager.provider()).thenReturn(provider);        
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
 
         Mockito.when(project.projectManager()).thenReturn(manager);
 
@@ -123,7 +123,7 @@ public void hasProvider(){
         Mockito.when(provider.name()).thenReturn("Github");
 
         Mockito.when(manager.provider()).thenReturn(provider);
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
 
         Mockito.when(project.projectManager()).thenReturn(manager);
 
@@ -176,7 +176,7 @@ public void hasOwner(){
         Mockito.when(provider.name()).thenReturn("Github");
 
         Mockito.when(manager.provider()).thenReturn(provider);
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
 
         Mockito.when(project.projectManager()).thenReturn(manager);
 
@@ -230,7 +230,7 @@ public void hasManager(){
         Mockito.when(provider.name()).thenReturn("Github");
 
         Mockito.when(manager.provider()).thenReturn(provider);
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
 
         Mockito.when(project.projectManager()).thenReturn(manager);
 
@@ -257,8 +257,11 @@ public void hasManager(){
                 .add("userId", manager.userId())
                 .add("username", manager.username())
                 .add("provider", manager.provider().name())
-                .add("commission", manager.percentage())
-                .build())
+                .add("commission", manager.projectPercentage())
+                .add(
+                    "contributorCommission",
+                    manager.contributorPercentage()
+                ).build())
         );       
 
     }
@@ -290,7 +293,7 @@ public void hasWallet(){
         Mockito.when(provider.name()).thenReturn("Github");
 
         Mockito.when(manager.provider()).thenReturn(provider);
-        Mockito.when(manager.percentage()).thenReturn(6.5);
+        Mockito.when(manager.projectPercentage()).thenReturn(6.5);
 
         Mockito.when(project.projectManager()).thenReturn(manager);