Execution Plans and other updates

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

@@ -232,7 +232,7 @@ public interface GeoLocationBasedService {
 
     /**
      * Create Geo alerts
-     */
+    */
     @POST
     @Path("alerts/{alertType}/{deviceType}/{deviceId}")
     @ApiOperation(
@@ -295,6 +295,60 @@ public interface GeoLocationBasedService {
                     required = true)
             @PathParam("alertType") String alertType);
 
+
+    /**
+     * Create Geo alerts for geo-dashboard
+     */
+    @POST
+    @Path("/alerts/{alertType}")
+    @ApiOperation(
+            consumes = "application/json",
+            produces = "application/json",
+            httpMethod = "POST",
+            value = "Create Geo alerts for the device",
+            notes = "",
+            response = Response.class,
+            tags = "Geo Service Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:geo-service:alerts-manage")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(
+                    code = 200,
+                    message = "OK.",
+                    response = Response.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body")
+                    }),
+            @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 createGeoAlertsForGeoDashboard(
+            @ApiParam(
+                    name = "alert",
+                    value = "The alert object",
+                    required = true)
+            @Valid Alert alert,
+            @ApiParam(
+                    name = "alertType",
+                    value = "The alert type, such as Within, Speed, Stationary",
+                    required = true)
+            @PathParam("alertType") String alertType);
+
     /**
      * Update Geo alerts
      */

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java

@@ -277,7 +277,7 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
         String action = (isUpdate ? "updating" : "creating");
         try {
             eventprocessorStub = getEventProcessorAdminServiceStub();
-            String parsedTemplate = parseTemplate(alertType, parseMap);
+            String parsedTemplate = parseTemplateForDeviceClusters(alertType, parseMap);
             String validationResponse = eventprocessorStub.validateExecutionPlan(parsedTemplate);
             if (validationResponse.equals("success")) {
                 if (isUpdate) {
@@ -765,6 +765,28 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
         }
     }
 
+    private String parseTemplateForDeviceClusters(String alertType, Map<String, String> parseMap) throws
+            GeoLocationBasedServiceException {
+        String templatePath = "alerts/Geo-ExecutionPlan-" + alertType + "_alert_for_deviceClusters.siddhiql";
+        InputStream resource = getClass().getClassLoader().getResourceAsStream(templatePath);
+        if (resource == null) {
+            throw new GeoLocationBasedServiceException("Could not find template in path : " + templatePath);
+        }
+        try {
+            //Read template
+            String template = IOUtils.toString(resource, StandardCharsets.UTF_8.toString());
+            //Replace variables
+            for (Map.Entry<String, String> parseEntry : parseMap.entrySet()) {
+                String find = "\\$" + parseEntry.getKey();
+                template = template.replaceAll(find, parseEntry.getValue());
+            }
+            return template;
+        } catch (IOException e) {
+            throw new GeoLocationBasedServiceException(
+                    "Error occurred while populating the template for the Within Alert", e);
+        }
+    }
+
     private void updateRegistry(String path, DeviceIdentifier identifier, Object content, Map<String, String> options)
             throws GeoLocationBasedServiceException {
         try {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/alerts/Geo-ExecutionPlan-Exit_alert_for_deviceClusters.siddhiql

@@ -0,0 +1,21 @@
+/* Enter a unique ExecutionPlan */
+@Plan:name('$executionPlanName')
+
+/* Enter a unique description for ExecutionPlan */
+-- @Plan:description('ExecutionPlan')
+
+/* define streams/tables and write queries here ... */
+
+@Import('org.wso2.geo.StandardSpatialEvents:1.0.0')
+define stream dataIn (id string, latitude double, longitude double, timeStamp long, type string ,speed float, heading float, eventId string);
+
+@Export('org.wso2.geo.ProcessedSpatialEvents:1.0.0')
+define stream dataOut (id string, latitude double, longitude double, timeStamp long, type string ,speed float, heading float, eventId string, state string, information string);
+
+from dataIn[geo:within(longitude,latitude,"$geoFenceGeoJSON")==false]#geodashboard:subscribe()
+select id , latitude, longitude,timeStamp, type, speed, heading ,eventId , "ALERTED" as state, "This device is outside $areaName area!!!" as information
+insert into dataOut;
+from dataIn[geo:within(longitude,latitude,"$geoFenceGeoJSON")!=false]
+select id, latitude, longitude,timeStamp, type, speed, heading ,eventId , "NORMAL" as state, "" as information
+insert into dataOut;
+

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/alerts/Geo-ExecutionPlan-Speed_alert_for_deviceClusters.siddhiql

@@ -0,0 +1,21 @@
+/* Enter a unique ExecutionPlan */
+@Plan:name('Geo-ExecutionPlan-Speed---_alert')
+
+/* Enter a unique description for ExecutionPlan */
+-- @Plan:description('ExecutionPlan')
+
+/* define streams/tables and write queries here ... */
+
+@Import('org.wso2.geo.StandardSpatialEvents:1.0.0')
+define stream dataIn (id string, latitude double, longitude double, timeStamp long, type string, speed float, heading float, eventId string);
+
+@Export('org.wso2.geo.ProcessedSpatialEvents:1.0.0')
+define stream dataOut (id string, latitude double, longitude double, timeStamp long, type string, speed float, heading float, eventId string, state string, information string);
+
+from dataIn[speed >= $speedAlertValue]#geodashboard:subscribe()
+select id , latitude, longitude,timeStamp, type ,speed, heading ,eventId , "ALERTED" as state, "This device movement is not normal!!" as information
+insert into dataOut;
+from dataIn[speed < $speedAlertValue]
+select id , latitude, longitude,timeStamp, type ,speed, heading ,eventId , "NORMAL" as state, "This device movement is normal"  as information
+insert into dataOut;
+

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/alerts/Geo-ExecutionPlan-Traffic_alert_for_deviceClusters.siddhiql

@@ -0,0 +1,17 @@
+/* Enter a unique ExecutionPlan */
+@Plan:name('$executionPlanName')
+
+/* Enter a unique description for ExecutionPlan */
+-- @Plan:description('ExecutionPlan')
+
+/* define streams/tables and write queries here ... */
+
+@Import('rawGeoStream:1.0.0')
+define stream dataIn (id string, timeStamp long, geometry string, state string, information string);
+
+@Export('AlertsNotifications:1.0.0')
+define stream dataOut (id string, state string, information string, timeStamp long, latitude double, longitude double);
+
+from dataIn[geo:intersects(geometry, "$geoFenceGeoJSON")==true and geodashboard:needToNotify(id, str:concat(information, state), "sendFirst") == true]
+select id, state, str:concat("Traffic alert in $areaName. State: ", state, " ", information) as information, timeStamp, 0.0 as latitude, 0.0 as longitude
+insert into dataOut

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/resources/alerts/Geo-ExecutionPlan-Within_alert_for_deviceClusters.siddhiql

@@ -0,0 +1,20 @@
+/* Enter a unique ExecutionPlan */
+@Plan:name('$executionPlanName')
+
+/* Enter a unique description for ExecutionPlan */
+-- @Plan:description('ExecutionPlan')
+
+/* define streams/tables and write queries here ... */
+
+@Import('org.wso2.geo.StandardSpatialEvents:1.0.0')
+define stream dataIn (id string, latitude double, longitude double, timeStamp long, type string ,speed float, heading float, eventId string);
+
+@Export('org.wso2.geo.ProcessedSpatialEvents:1.0.0')
+define stream dataOut (id string, latitude double, longitude double, timeStamp long, type string ,speed float, heading float, eventId string, state string, information string);
+
+from dataIn[geo:within(longitude,latitude,"$geoFenceGeoJSON")==true]#geodashboard:subscribe()
+select id , latitude, longitude,timeStamp, type, speed, heading ,eventId , "ALERTED" as state, "This device is in $areaName restricted area!!!" as information
+insert into dataOut;
+from dataIn[geo:within(longitude,latitude,"$geoFenceGeoJSON")!=true]
+select id , latitude, longitude,timeStamp, type, speed, heading ,eventId , "NORMAL" as state, "" as information
+insert into dataOut;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js

@@ -10,8 +10,7 @@
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUTna innawa kiala
- WARRANTIES OR CONDITIONS OF ANY
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.