Geo service alerts history method added

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoService.java

@@ -340,6 +340,74 @@ public interface GeoService {
                     required = true)
             @PathParam("executionPlanType") String executionPlanType);
 
+    /**
+     * Retrieve Geo alerts history
+     */
+    @GET
+    @Path("alerts/history/{deviceType}/{deviceId}")
+    @ApiOperation(
+            consumes = "application/json",
+            produces = "application/json",
+            httpMethod = "GET",
+            value = "Retrieve Geo alerts history for the device",
+            notes = "",
+            response = Response.class,
+            tags = "Geo Service Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:analytics")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(
+                    code = 200,
+                    message = "OK.",
+                    response = Response.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body"),
+                            @ResponseHeader(
+                                    name = "Last-Modified",
+                                    description = "Date and time the resource was last modified.\n" +
+                                            "Used by caches, or in conditional requests.")
+                    }),
+            @ApiResponse(
+                    code = 400,
+                    message = "Bad Request. \n Invalid Device Identifiers found.",
+                    response = Response.class),
+            @ApiResponse(
+                    code = 401,
+                    message = "Unauthorized. \n Unauthorized request."),
+            @ApiResponse(
+                    code = 500,
+                    message = "Internal Server Error. \n Error on retrieving stats",
+                    response = Response.class)
+    })
+    Response getGeoAlertsHistory(
+            @ApiParam(
+                    name = "deviceId",
+                    value = "The registered device Id.",
+                    required = true)
+            @PathParam("deviceId") String deviceId,
+            @ApiParam(
+                    name = "device-type",
+                    value = "The device type, such as ios, android or windows.",
+                    required = true)
+            @PathParam("deviceType")
+            @Size(max = 45)
+                    String deviceType,
+            @ApiParam(
+                    name = "from",
+            value = "Get stats from what time",
+            required = true)
+            @QueryParam("from") long from,
+            @ApiParam(
+                    name = "to",
+                    value = "Get stats up to what time",
+                    required = true)
+            @QueryParam("to") long to);
 
     @DELETE
     @Path("alerts/{executionPlanType}/{deviceType}/{deviceId}")

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoServiceImpl.java

@@ -73,7 +73,7 @@ public class GeoServiceImpl implements GeoService {
     public Response getGeoDeviceStats(@PathParam("deviceId") String deviceId,
                                       @PathParam("deviceType") String deviceType,
                                       @QueryParam("from") long from, @QueryParam("to") long to) {
-        String tableName = "ORG_WSO2_GEO_FUSEDSPATIALEVENT";
+        String tableName = "IOT_PER_DEVICE_STREAM_GEO_FUSEDSPATIALEVENT";
         String fromDate = String.valueOf(from);
         String toDate = String.valueOf(to);
         String query = "id:" + deviceId + " AND type:" + deviceType;
@@ -265,6 +265,56 @@ public class GeoServiceImpl implements GeoService {
         }
     }
 
+    @Path("alerts/history/{deviceType}/{deviceId}")
+    @GET
+    @Consumes("application/json")
+    @Produces("application/json")
+    public Response getGeoAlertsHistory(@PathParam("deviceId") String deviceId,
+                                        @PathParam("deviceType") String deviceType,
+                                        @QueryParam("from") long from, @QueryParam("to") long to) {
+        String tableName = "IOT_PER_DEVICE_STREAM_GEO_ALERTNOTIFICATIONS";
+        String fromDate = String.valueOf(from);
+        String toDate = String.valueOf(to);
+        String query = "id:" + deviceId + " AND type:" + deviceType;
+        if (from != 0 || to != 0) {
+            query += " AND timeStamp : [" + fromDate + " TO " + toDate + "]";
+        }
+        try {
+            if (!DeviceMgtAPIUtils.getDeviceAccessAuthorizationService().isUserAuthorized(
+                    new DeviceIdentifier(deviceId, deviceType),
+                    DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS)) {
+                return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build();
+            }
+            List<SortByField> sortByFields = new ArrayList<>();
+            SortByField sortByField = new SortByField("timeStamp", SortType.ASC);
+            sortByFields.add(sortByField);
+
+            // this is the user who initiates the request
+            String authorizedUser = MultitenantUtils.getTenantAwareUsername(
+                    CarbonContext.getThreadLocalCarbonContext().getUsername());
+
+            try {
+                String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser);
+                int tenantId = DeviceMgtAPIUtils.getRealmService().getTenantManager().getTenantId(tenantDomain);
+                AnalyticsDataAPI analyticsDataAPI = DeviceMgtAPIUtils.getAnalyticsDataAPI();
+                List<SearchResultEntry> searchResults = analyticsDataAPI.search(tenantId, tableName, query,
+                                                                                0,
+                                                                                100,
+                                                                                sortByFields);
+                List<Event> events = getEventBeans(analyticsDataAPI, tenantId, tableName, new ArrayList<String>(),
+                                                   searchResults);
+                return Response.ok().entity(events).build();
+            } catch (AnalyticsException | UserStoreException e) {
+                log.error("Failed to perform search on table: " + tableName + " : " + e.getMessage(), e);
+                throw DeviceMgtUtil.buildBadRequestException(
+                        Constants.ErrorMessages.STATUS_BAD_REQUEST_MESSAGE_DEFAULT);
+            }
+        } catch (DeviceAccessAuthorizationException e) {
+            log.error(e.getErrorMessage());
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).build();
+        }
+    }
+
     private List<Event> getEventBeans(AnalyticsDataAPI analyticsDataAPI, int tenantId, String tableName,
                                       List<String> columns,
                                       List<SearchResultEntry> searchResults) throws AnalyticsException {