Fix bug in Workflow Override API and Modify fields Signature

README.md

@@ -437,7 +437,7 @@ public class Main {
 - `getWorkflowOverrideById(overrideId)`
 - `updateWorkflowOverride(workflowId, tenantId)`
 - `updateWorkflowOverrideById(overrideId)`
-- `deleteWorkflow(overrideId)`
+- `deleteWorkflowOverride(overrideId)`
 
 ### Notification
 

src/main/java/co/novu/api/blueprints/pojos/Blueprint.java

@@ -1,4 +1,5 @@
 package co.novu.api.blueprints.pojos;
+
 import co.novu.api.common.PreferenceSettings;
 import co.novu.api.common.Step;
 import co.novu.api.common.Trigger;

src/main/java/co/novu/api/blueprints/pojos/Filters.java

@@ -1,10 +1,13 @@
 package co.novu.api.blueprints.pojos;
+
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class Filters {
    private List<String> children;
-   private String _id;
+   @SerializedName("_id")
+   private String id;
 }

src/main/java/co/novu/api/blueprints/pojos/General.java

@@ -1,4 +1,5 @@
 package co.novu.api.blueprints.pojos;
+
 import lombok.Data;
 
 import java.util.List;

src/main/java/co/novu/api/blueprints/pojos/Popular.java

@@ -1,4 +1,5 @@
 package co.novu.api.blueprints.pojos;
+
 import lombok.Data;
 
 import java.util.List;

src/main/java/co/novu/api/blueprints/pojos/Template.java

@@ -1,23 +1,32 @@
 package co.novu.api.blueprints.pojos;
+
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class Template {
-    private String _id;
+    @SerializedName("_id")
+    private String id;
     private String type;
     private Boolean active;
     private String subject;
     private List<Content> content;
     private String contentType;
-    private String _environmentId;
-    private String _organizationId;
-    private String _creatorId;
-    private String _parentId;
-    private String _layoutId;
+    @SerializedName("_environmentId")
+    private String environmentId;
+    @SerializedName("_organizationId")
+    private String organizationId;
+    @SerializedName("_creatorId")
+    private String creatorId;
+    @SerializedName("_parentId")
+    private String parentId;
+    @SerializedName("_layoutId")
+    private String layoutId;
     private List<Variables> variables;
     private String createdAt;
     private String updatedAt;
-    private Long __v;
+    @SerializedName("__v")
+    private Long version;
 }

src/main/java/co/novu/api/blueprints/pojos/Timed.java

@@ -1,4 +1,5 @@
 package co.novu.api.blueprints.pojos;
+
 import lombok.Data;
 
 import java.util.List;

src/main/java/co/novu/api/blueprints/pojos/Variables.java

@@ -7,5 +7,5 @@ public class Variables {
     private String name;
     private String type;
     private Boolean required;
-    private String Id;
+    private String id;
 }

src/main/java/co/novu/api/common/NotificationGroup.java

@@ -18,5 +18,5 @@ public class NotificationGroup {
     private String createdAt;
     private String updatedAt;
     @SerializedName("__v")
-    private String v;
+    private String version;
 }

src/main/java/co/novu/api/common/PreferenceSettings.java

@@ -1,12 +1,14 @@
 package co.novu.api.common;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public class PreferenceSettings {
     private Boolean email;
     private Boolean sms;
-    private Boolean in_app;
+    @SerializedName("in_app")
+    private Boolean inApp;
     private Boolean chat;
     private Boolean push;
 }

src/main/java/co/novu/api/common/Step.java

@@ -1,20 +1,24 @@
 package co.novu.api.common;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class Step {
-    private String _id;
-    private String _templateId;
+    @SerializedName("_id")
+    private String id;
+    @SerializedName("_templateId")
+    private String templateId;
     private Boolean active;
     private Boolean shouldStopOnFail;
     private Object template;
     private Object replyCallback;
     private String uuid;
     private String name;
-    private String _parentId;
+    @SerializedName("_parentId")
+    private String parentId;
     private Object filters;
     private Object metadata;
 }

src/main/java/co/novu/api/environments/responses/EnvironmentResponse.java

@@ -2,19 +2,23 @@
 
 import co.novu.api.environments.pojos.ApiKey;
 import co.novu.api.environments.pojos.Widget;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class EnvironmentResponse {
-    private String _id;
+    @SerializedName("_id")
+    private String id;
     private String name;
     private String identifier;
-    private String _organizationId;
+    @SerializedName("_organizationId")
+    private String organizationId;
     private List<ApiKey> apiKeys;
     private Widget widget;
     private String createdAt;
     private String updatedAt;
-    private String _parentId;
+    @SerializedName("_parentId")
+    private String parentId;
 }

src/main/java/co/novu/api/layouts/responses/CreateLayoutResponseData.java

@@ -1,9 +1,10 @@
 package co.novu.api.layouts.responses;
 
-
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public class CreateLayoutResponseData {
-    private String _id;
+    @SerializedName("_id")
+    private String id;
 }

src/main/java/co/novu/api/layouts/responses/LayoutResponse.java

@@ -1,15 +1,20 @@
 package co.novu.api.layouts.responses;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class LayoutResponse {
-    private String _id;
-    private String _organizationId;
-    private String _environmentId;
-    private String _creatorId;
+    @SerializedName("_id")
+    private String id;
+    @SerializedName("_organizationId")
+    private String organizationId;
+    @SerializedName("_environmentId")
+    private String environmentId;
+    @SerializedName("_creatorId")
+    private String creatorId;
     private String name;
     private String description;
     private String channel;
@@ -20,5 +25,6 @@ public class LayoutResponse {
     private Boolean isDeleted;
     private String createdAt;
     private String updatedAt;
-    private String _parentId;
+    @SerializedName("_parentId")
+    private String parentId;
 }

src/main/java/co/novu/api/notifications/pojos/Job.java

@@ -1,17 +1,20 @@
 package co.novu.api.notifications.pojos;
 
 import co.novu.api.common.Step;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class Job {
-    private String _id;
+    @SerializedName("_id")
+    private String id;
     private Object digest;
     private String status;
     private Object payload;
-    private String _notificationId;
+    @SerializedName("_notificationId")
+    private String notificationId;
     private String type;
     private String createdAt;
     private String updatedAt;

src/main/java/co/novu/api/tenants/pojos/Tenant.java

@@ -1,11 +1,14 @@
 package co.novu.api.tenants.pojos;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public class Tenant {
-    private String _environmentId;
-    private String _id;
+    @SerializedName("_environmentId")
+    private String environmentId;
+    @SerializedName("_id")
+    private String id;
     private String createdAt;
     private Object data;
     private String identifier;

src/main/java/co/novu/api/workflowoverrides/WorkflowOverrideApi.java

@@ -1,12 +1,9 @@
 package co.novu.api.workflowoverrides;
 
-import co.novu.api.workflowoverrides.pojos.WorkflowOverride;
-
 import co.novu.api.workflowoverrides.request.CreateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.request.UpdateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.response.BulkWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.DeleteWorkflowOverrideResponse;
-import co.novu.api.workflowoverrides.response.GetWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.WorkflowOverrideResponse;
 import retrofit2.Call;
 import retrofit2.http.Body;
@@ -27,7 +24,7 @@ public interface WorkflowOverrideApi {
     Call<WorkflowOverrideResponse> createWorkflowOverride(@Body CreateWorkflowOverrideRequest request);
 
     @GET(ENDPOINT)
-    Call<GetWorkflowOverridesResponse> getWorkflowOverrides(@QueryMap Map<String, Object> params);
+    Call<BulkWorkflowOverridesResponse> getWorkflowOverrides(@QueryMap Map<String, Object> params);
 
     @GET(ENDPOINT + "/workflows/{workflowId}/tenants/{tenantId}")
     Call<WorkflowOverrideResponse> getWorkflowOverride(@Path("workflowId") String workflowId, @Path("tenantId") String tenantId);

src/main/java/co/novu/api/workflowoverrides/WorkflowOverrideHandler.java

@@ -1,12 +1,10 @@
 package co.novu.api.workflowoverrides;
 
-import co.novu.api.workflowoverrides.pojos.WorkflowOverride;
 import co.novu.api.workflowoverrides.request.CreateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.request.GetWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.request.UpdateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.response.BulkWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.DeleteWorkflowOverrideResponse;
-import co.novu.api.workflowoverrides.response.GetWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.WorkflowOverrideResponse;
 import co.novu.common.rest.NovuNetworkException;
 import co.novu.common.rest.RestHandler;
@@ -32,11 +30,11 @@ public WorkflowOverrideResponse createWorkflowOverride(CreateWorkflowOverrideReq
         return restHandler.extractResponse(response);
     }
 
-    public GetWorkflowOverridesResponse getWorkflowOverrides(GetWorkflowOverrideRequest request) throws IOException, NovuNetworkException {
+    public BulkWorkflowOverridesResponse getWorkflowOverrides(GetWorkflowOverrideRequest request) throws IOException, NovuNetworkException {
         Map<String, Object> params = new HashMap<>();
         if (request.getPage() != null) params.put("page", request.getPage());
         if (request.getLimit() != null) params.put("limit", request.getLimit());
-        Response<GetWorkflowOverridesResponse> response = workflowOverrideApi.getWorkflowOverrides(params).execute();
+        Response<BulkWorkflowOverridesResponse> response = workflowOverrideApi.getWorkflowOverrides(params).execute();
         return restHandler.extractResponse(response);
     }
 

src/main/java/co/novu/api/workflowoverrides/request/UpdateWorkflowOverrideRequest.java

@@ -7,5 +7,5 @@
 @Data
 public class UpdateWorkflowOverrideRequest {
     private Boolean active;
-    private PreferenceSettings data;
+    private PreferenceSettings preferenceSettings;
 }

src/main/java/co/novu/common/base/Novu.java

@@ -108,13 +108,11 @@
 import co.novu.api.workflowgroups.responses.GetWorkflowGroupsResponse;
 import co.novu.api.workflowgroups.responses.WorkflowGroupResponse;
 import co.novu.api.workflowoverrides.WorkflowOverrideHandler;
-import co.novu.api.workflowoverrides.pojos.WorkflowOverride;
 import co.novu.api.workflowoverrides.request.CreateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.request.GetWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.request.UpdateWorkflowOverrideRequest;
 import co.novu.api.workflowoverrides.response.BulkWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.DeleteWorkflowOverrideResponse;
-import co.novu.api.workflowoverrides.response.GetWorkflowOverridesResponse;
 import co.novu.api.workflowoverrides.response.WorkflowOverrideResponse;
 import co.novu.api.workflows.WorkflowHandler;
 import co.novu.api.workflows.requests.UpdateWorkflowRequest;
@@ -996,11 +994,11 @@ public WorkflowOverrideResponse createWorkflowOverride(CreateWorkflowOverrideReq
         }
     }
 
-    public GetWorkflowOverridesResponse getWorkflowOverrides(GetWorkflowOverrideRequest request) throws IOException, NovuNetworkException {
+    public BulkWorkflowOverridesResponse getWorkflowOverrides(GetWorkflowOverrideRequest request) throws IOException, NovuNetworkException {
         try {
             return workflowOverrideHandler.getWorkflowOverrides(request);
         } catch (Exception e) {
-            log.error("Error fetching Workflow-Override", e);
+            log.error("Error fetching bulk Workflow-Override", e);
             throw e;
         }
     }
@@ -1018,7 +1016,7 @@ public WorkflowOverrideResponse getWorkflowOverrideById(String overrideId) throw
         try {
             return workflowOverrideHandler.getWorkflowOverrideById(overrideId);
         } catch (Exception e) {
-            log.error("Error fetching Workflow-Override", e);
+            log.error("Error fetching Workflow-Override by id", e);
             throw e;
         }
     }
@@ -1027,7 +1025,7 @@ public WorkflowOverrideResponse updateWorkflowOverrideById(String overrideId, Up
         try {
             return workflowOverrideHandler.updateWorkflowOverrideById(overrideId, request);
         } catch (Exception e) {
-            log.error("Error updating Workflow-Override", e);
+            log.error("Error updating Workflow-Override by id", e);
             throw e;
         }
     }