From d01aa2026d3d745e6b0d5e98507aefe16f97577d Mon Sep 17 00:00:00 2001 From: osh Date: Thu, 17 Feb 2022 13:58:15 +0530 Subject: [PATCH 1/6] fixes https://gitlab.com/entgra/product-iots/-/issues/1226 Adding the new billing API --- .../device/mgt/jaxrs/beans/DeviceList.java | 11 + .../service/api/DeviceManagementService.java | 74 ++++++ .../impl/DeviceManagementServiceImpl.java | 45 ++++ .../device/mgt/common/DeviceBilling.java | 225 ++++++++++++++++++ .../device/mgt/common/PaginationResult.java | 11 + .../device/mgt/common/cost/mgt/Costdata.java | 76 ++++++ .../carbon/device/mgt/core/dao/DeviceDAO.java | 27 ++- .../dao/impl/device/GenericDeviceDAOImpl.java | 62 ++++- .../dao/impl/device/OracleDeviceDAOImpl.java | 11 + .../impl/device/PostgreSQLDeviceDAOImpl.java | 11 + .../impl/device/SQLServerDeviceDAOImpl.java | 11 + .../dao/util/DeviceManagementDAOUtil.java | 25 ++ .../DeviceManagementProviderService.java | 36 ++- .../DeviceManagementProviderServiceImpl.java | 139 ++++++++--- 14 files changed, 713 insertions(+), 51 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java index 5adb83af03..770ab690c4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java @@ -35,10 +35,21 @@ public class DeviceList extends BasePaginatedResult { return devices; } + @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) + private double totalCost; + public void setList(List devices) { this.devices = devices; } + public double getTotalCost() { + return totalCost; + } + + public void setTotalCost(double totalCost) { + this.totalCost = totalCost; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index eb1d952491..c19f050ffd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -343,6 +343,80 @@ public interface DeviceManagementService { @QueryParam("limit") int limit); + + @GET + @Path("/billing") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation( + produces = MediaType.APPLICATION_JSON, + httpMethod = "GET", + value = "Getting Cost details of devices in a tenant", + notes = "Provides individual cost and total cost of all devices per tenant.", + tags = "Device Management", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + }) + } + ) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "OK. \n Successfully fetched the list of devices.", + response = DeviceList.class, + responseHeaders = { + @ResponseHeader( + name = "Content-Type", + description = "The content type of the body"), + @ResponseHeader( + name = "ETag", + description = "Entity Tag of the response resource.\n" + + "Used by caches, or in conditional requests."), + @ResponseHeader( + name = "Last-Modified", + description = "Date and time the resource was last modified.\n" + + "Used by caches, or in conditional requests."), + }), + @ApiResponse( + code = 304, + message = "Not Modified. \n Empty body because the client already has the latest version of " + + "the requested resource.\n"), + @ApiResponse( + code = 400, + message = "The incoming request has more than one selection criteria defined via the query parameters.", + response = ErrorResponse.class), + @ApiResponse( + code = 404, + message = "The search criteria did not match any device registered with the server.", + response = ErrorResponse.class), + @ApiResponse( + code = 406, + message = "Not Acceptable.\n The requested media type is not supported."), + @ApiResponse( + code = 500, + message = "Internal Server Error. \n Server error occurred while fetching the device list.", + response = ErrorResponse.class) + }) + Response getDevicesBilling( + @ApiParam( + name = "tenantDomain", + value = "The tenant domain.", + required = false, + defaultValue = "nita") + String tenantDomain, + @ApiParam( + name = "offset", + value = "The starting pagination index for the complete list of qualified items.", + required = false, + defaultValue = "0") + @QueryParam("offset") + int offset, + @ApiParam( + name = "limit", + value = "Provide how many device details you require from the starting pagination index/offset.", + required = false, + defaultValue = "10") + @QueryParam("limit") + int limit); + @GET @Produces(MediaType.APPLICATION_JSON) @ApiOperation( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index 804029a13c..e1c9e8fb15 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -340,6 +340,51 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } } + @GET + @Override + @Path("/billing") + public Response getDevicesBilling( + @DefaultValue("nita") + @QueryParam ("tenantDomain") String tenantDomain, + @QueryParam("offset") int offset, + @DefaultValue("10") + @QueryParam("limit") int limit) { + try { + RequestValidationUtil.validatePaginationParameters(offset, limit); + DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); +// DeviceAccessAuthorizationService deviceAccessAuthorizationService = +// DeviceMgtAPIUtils.getDeviceAccessAuthorizationService(); + PaginationRequest request = new PaginationRequest(offset, limit); + PaginationResult result; + DeviceList devices = new DeviceList(); + + try { + result = dms.getAllDevicesBillings(request, true, tenantDomain); + } catch (Exception exception) { + String msg = "------------------TEST ERROR-----------------------"; + log.error(msg, exception); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } + + int resultCount = result.getRecordsTotal(); + if (resultCount == 0) { + Response.status(Response.Status.OK).entity(devices).build(); + } + + devices.setList((List) result.getData()); + devices.setCount(result.getRecordsTotal()); + devices.setTotalCost(result.getTotalCost()); + return Response.status(Response.Status.OK).entity(devices).build(); + } + catch (Exception e) { + String msg = "Error occurred while fetching all enrolled devices"; + log.error(msg, e); + return Response.serverError().entity( + new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); + } + } + @GET @Override @Path("/user-devices") diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java new file mode 100644 index 0000000000..4eaa3fa7dd --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * you may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "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. + */ +package org.wso2.carbon.device.mgt.common; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.Gson; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.wso2.carbon.device.mgt.common.app.mgt.Application; +import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; +import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshotWrapper; + +import java.io.Serializable; +import java.util.List; + +@ApiModel(value = "DeviceBilling", description = "This class carries all information related to a managed device.") +public class DeviceBilling implements Serializable { + + private static final long serialVersionUID = 1998101711L; + + @ApiModelProperty(name = "id", value = "ID of the device in the device information database.", + required = false) + private int id; + + @ApiModelProperty(name = "name", value = "The device name that can be set on the device by the device user.", + required = true) + private String name; +// +// @ApiModelProperty(name = "type", value = "The OS type of the device.", required = true) +// private String type; + + @ApiModelProperty(name = "description", value = "Additional information on the device.", required = false) + private String description; + + @ApiModelProperty(name = "cost", value = "Cost charged per device.", required = false) + private Double cost; + + @ApiModelProperty(name = "deviceIdentifier", value = "This is a 64-bit number (as a hex string) that is randomly" + + " generated when the user first sets up the device and should" + + " remain constant for the lifetime of the user's device." + + " The value may change if a factory reset is performed on " + + "the device.", + required = false) + private String deviceIdentifier; + + @ApiModelProperty(name = "daysSinceEnrolled", value = "Number of days gone since device enrollment date to current date.", + required = false) + private int daysSinceEnrolled; + + @ApiModelProperty(name = "daysUsed", value = "Number of days gone since device enrollment date to date device was removed.", + required = false) + private int daysUsed; + + @ApiModelProperty(name = "enrolmentInfo", value = "This defines the device registration related information. " + + "It is mandatory to define this information.", required = false) + private EnrolmentInfo enrolmentInfo; + +// @ApiModelProperty(name = "features", value = "List of features.", required = false) +// private List features; + +// private List properties; + + @ApiModelProperty(name = "advanceInfo", value = "This defines the device registration related information. " + + "It is mandatory to define this information.", required = false) + private DeviceInfo deviceInfo; + +// @ApiModelProperty(name = "applications", value = "This represents the application list installed into the device", +// required = false) +// private List applications; + +// @ApiModelProperty( +// name = "historySnapshot", +// value = "device history snapshots") +// @JsonProperty(value = "historySnapshot") +// private DeviceLocationHistorySnapshotWrapper historySnapshot; + + public DeviceBilling() { + } + + public DeviceBilling(String name, String description, EnrolmentInfo enrolmentInfo) { + this.name = name; + this.description = description; + this.enrolmentInfo = enrolmentInfo; + } + + public DeviceBilling(String name, String description, String deviceId, EnrolmentInfo enrolmentInfo) { + this.name = name; + this.description = description; + this.deviceIdentifier = deviceId; + this.enrolmentInfo = enrolmentInfo; + } + + public int getDaysUsed() { + return daysUsed; + } + + public void setDaysUsed(int daysUsed) { + this.daysUsed = daysUsed; + } + + public int getDaysSinceEnrolled() { + return daysSinceEnrolled; + } + + public void setDaysSinceEnrolled(int daysSinceEnrolled) { + this.daysSinceEnrolled = daysSinceEnrolled; + } + + public Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceIdentifier() { + return deviceIdentifier; + } + + public void setDeviceIdentifier(String deviceIdentifier) { + this.deviceIdentifier = deviceIdentifier; + } + + public EnrolmentInfo getEnrolmentInfo() { + return enrolmentInfo; + } + + public void setEnrolmentInfo(EnrolmentInfo enrolmentInfo) { + this.enrolmentInfo = enrolmentInfo; + } + + public DeviceInfo getDeviceInfo() { + return deviceInfo; + } + + public void setDeviceInfo(DeviceInfo deviceInfo) { + this.deviceInfo = deviceInfo; + } + + public static class Property { + + private String name; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + + @Override + public String toString() { + return new Gson().toJson(this); + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof DeviceBilling)) + return false; + + DeviceBilling device = (DeviceBilling) o; + + return getDeviceIdentifier().equals(device.getDeviceIdentifier()); + + } + + @Override + public int hashCode() { + return getDeviceIdentifier().hashCode(); + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java index 148cc1781a..9bb9fc5920 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java @@ -44,6 +44,17 @@ public class PaginationResult implements Serializable { @ApiModelProperty(name = "data", value = "This holds the database records that matches given criteria", required = true) private List data; + @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) + private double totalCost; + + public double getTotalCost() { + return totalCost; + } + + public void setTotalCost(double totalCost) { + this.totalCost = totalCost; + } + public int getRecordsTotal() { return recordsTotal; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java new file mode 100644 index 0000000000..28d4fe0eed --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + * + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "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. + */ + +package org.wso2.carbon.device.mgt.common.cost.mgt; + +import com.google.gson.Gson; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.sql.Timestamp; +import java.util.Date; + +@XmlRootElement(name = "Cost") +public class Costdata { + + private String tenantDomain; + private Double cost; + private Timestamp subscriptionBeginning; + private Timestamp subscriptionEnd; + + @XmlElement(name = "tenantDomain", required = true) + public String getTenantDomain() { + return tenantDomain; + } + + public void setTenantDomain(String tenantDomain) { + this.tenantDomain = tenantDomain; + } + + @XmlElement(name = "cost", required = true) + public Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } + + @XmlElement(name = "subscriptionBeginning", required = true) + public Timestamp getSubscriptionBeginning() { + return subscriptionBeginning; + } + + public void setSubscriptionBeginning(Timestamp subscriptionBeginning) { + this.subscriptionBeginning = subscriptionBeginning; + } + + @XmlElement(name = "subscriptionEnd", required = true) + public Timestamp getSubscriptionEnd() { + return subscriptionEnd; + } + + public void setSubscriptionEnd(Timestamp subscriptionEnd) { + this.subscriptionEnd = subscriptionEnd; + } + + @Override + public String toString() { + return new Gson().toJson(this); + } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java index 40eefe935e..e34c208077 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java @@ -36,12 +36,8 @@ package org.wso2.carbon.device.mgt.core.dao; import org.apache.commons.collections.map.SingletonMap; -import org.wso2.carbon.device.mgt.common.Device; -import org.wso2.carbon.device.mgt.common.DeviceIdentifier; -import org.wso2.carbon.device.mgt.common.EnrolmentInfo; +import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status; -import org.wso2.carbon.device.mgt.common.PaginationRequest; -import org.wso2.carbon.device.mgt.common.Count; import org.wso2.carbon.device.mgt.common.configuration.mgt.DevicePropertyInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot; @@ -49,7 +45,6 @@ import org.wso2.carbon.device.mgt.common.device.details.DeviceMonitoringData; import org.wso2.carbon.device.mgt.common.geo.service.GeoQuery; import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster; -import org.wso2.carbon.device.mgt.common.geo.service.GeoCoordinate; import java.sql.SQLException; import java.util.Date; @@ -297,6 +292,26 @@ public interface DeviceDAO { */ List getDevices(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; + /** + * This method is used to retrieve the not removed devices of a given tenant as a paginated result. + * + * @param request PaginationRequest object holding the data for pagination + * @param tenantId tenant id. + * @return returns paginated list of not removed devices of tenant. + * @throws DeviceManagementDAOException + */ + List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; + + /** + * This method is used to retrieve the removed devices of a given tenant as a paginated result. + * + * @param request PaginationRequest object holding the data for pagination + * @param tenantId tenant id. + * @return rreturns paginated list of removed devices of tenant. + * @throws DeviceManagementDAOException + */ + List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; + /** * This method is used to retrieve the devices of a given tenant as a paginated result, along the lines of * activeServerCount and serverIndex diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java index eb3fa87f54..c79e46ebc8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java @@ -18,13 +18,9 @@ package org.wso2.carbon.device.mgt.core.dao.impl.device; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.common.Count; -import org.wso2.carbon.device.mgt.common.Device; -import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; -import org.wso2.carbon.device.mgt.common.PaginationRequest; +import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; @@ -187,6 +183,62 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { } } + @Override + public List getDeviceBillList(PaginationRequest request, int tenantId) + throws DeviceManagementDAOException { + Connection conn; + PreparedStatement stmt = null; + List devices = new ArrayList<>(); + try { + conn = this.getConnection(); + String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, STATUS,\n" + + "TIMESTAMPDIFF('DAY', CURDATE(), DATE_OF_ENROLMENT) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + + "where e.TENANT_ID= ? and d.ID=e.DEVICE_ID and STATUS !='REMOVED' LIMIT 10"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, tenantId); + ResultSet rs = stmt.executeQuery(); + + while (rs.next()) { + DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, false); + devices.add(device); + } + } catch (SQLException e) { + throw new DeviceManagementDAOException("Error occurred while fetching the list of devices belongs to '" + + request.getOwner() + "'", e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, null); + } + return devices; + } + + @Override + public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) + throws DeviceManagementDAOException { + Connection conn; + PreparedStatement stmt = null; + List devices = new ArrayList<>(); + try { + conn = this.getConnection(); + String sql = "select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, DATE_OF_LAST_UPDATE, STATUS, " + + "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, DATE_OF_LAST_UPDATE) AS DAYS_USED from DM_DEVICE d, DM_ENROLMENT e" + + " where e.TENANT_ID=? and d.ID=e.DEVICE_ID and STATUS ='REMOVED'\n"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, tenantId); + ResultSet rs = stmt.executeQuery(); + + while (rs.next()) { + DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, true); + devices.add(device); + } + } catch (SQLException e) { + throw new DeviceManagementDAOException("Error occurred while fetching the list of devices belongs to '" + + request.getOwner() + "'", e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, null); + } + return devices; + } + @Override public List getAllocatedDevices(PaginationRequest request, int tenantId, int activeServerCount, int serverIndex) throws DeviceManagementDAOException { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java index f2a91cae45..76f0ed7c5a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Count; import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceBilling; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; @@ -187,6 +188,16 @@ public class OracleDeviceDAOImpl extends AbstractDeviceDAOImpl { } } + @Override + public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + + @Override + public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + @Override public List getAllocatedDevices(PaginationRequest request, int tenantId, int activeServerCount, int serverIndex) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java index 66313603cb..f25319a9b0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Count; import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceBilling; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; @@ -178,6 +179,16 @@ public class PostgreSQLDeviceDAOImpl extends AbstractDeviceDAOImpl { } } + @Override + public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + + @Override + public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + @Override public List getAllocatedDevices(PaginationRequest request, int tenantId, int activeServerCount, int serverIndex) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java index ae4b25b431..3c87242653 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.Count; import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceBilling; import org.wso2.carbon.device.mgt.common.PaginationRequest; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; @@ -188,6 +189,16 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl { } } + @Override + public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + + @Override + public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + return null; + } + @Override public List getAllocatedDevices(PaginationRequest request, int tenantId, int activeServerCount, int serverIndex) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java index 8beb17b5a0..bd43651a80 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.device.mgt.common.Device; +import org.wso2.carbon.device.mgt.common.DeviceBilling; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; @@ -152,6 +153,16 @@ public final class DeviceManagementDAOUtil { return enrolmentInfo; } + public static EnrolmentInfo loadEnrolmentBilling(ResultSet rs, Boolean removedDevices) throws SQLException { + EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); + enrolmentInfo.setDateOfEnrolment(rs.getTimestamp("DATE_OF_ENROLMENT").getTime()); + enrolmentInfo.setStatus(EnrolmentInfo.Status.valueOf(rs.getString("STATUS"))); + if (removedDevices) { + enrolmentInfo.setDateOfLastUpdate(rs.getTimestamp("DATE_OF_LAST_UPDATE").getTime()); + } + return enrolmentInfo; + } + public static EnrolmentInfo loadMatchingEnrolment(ResultSet rs) throws SQLException { Map enrolmentInfos = new HashMap<>(); EnrolmentInfo enrolmentInfo = loadEnrolment(rs); @@ -197,6 +208,20 @@ public final class DeviceManagementDAOUtil { return device; } + public static DeviceBilling loadDeviceBilling(ResultSet rs, Boolean removedDevices) throws SQLException { + DeviceBilling device = new DeviceBilling(); + device.setName(rs.getString("DEVICE_NAME")); + device.setDescription(rs.getString("DESCRIPTION")); + device.setDeviceIdentifier(rs.getString("DEVICE_IDENTIFICATION")); + if (removedDevices) { + device.setDaysUsed((int) rs.getLong("DAYS_USED")); + } else { + device.setDaysSinceEnrolled((int) rs.getLong("DAYS_SINCE_ENROLLED")); + } + device.setEnrolmentInfo(loadEnrolmentBilling(rs, removedDevices)); + return device; + } + public static DeviceMonitoringData loadDevice(ResultSet rs, String deviceTypeName) throws SQLException { Device device = new Device(); device.setId(rs.getInt("DEVICE_ID")); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index 6265384aad..15d0fc2c4c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -36,23 +36,13 @@ package org.wso2.carbon.device.mgt.core.service; import org.apache.commons.collections.map.SingletonMap; -import org.wso2.carbon.device.mgt.common.ActivityPaginationRequest; -import org.wso2.carbon.device.mgt.common.Device; -import org.wso2.carbon.device.mgt.common.DeviceIdentifier; -import org.wso2.carbon.device.mgt.common.DeviceTransferRequest; -import org.wso2.carbon.device.mgt.common.DynamicTaskContext; -import org.wso2.carbon.device.mgt.common.EnrolmentInfo; -import org.wso2.carbon.device.mgt.common.FeatureManager; -import org.wso2.carbon.device.mgt.common.MonitoringOperation; -import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; -import org.wso2.carbon.device.mgt.common.PaginationRequest; -import org.wso2.carbon.device.mgt.common.PaginationResult; -import org.wso2.carbon.device.mgt.common.StartupOperationConfig; +import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfigurationException; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; +import org.wso2.carbon.device.mgt.common.cost.mgt.Costdata; import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot; @@ -79,6 +69,7 @@ import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster; import org.wso2.carbon.device.mgt.common.geo.service.GeoCoordinate; import java.sql.SQLException; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; @@ -207,6 +198,27 @@ public interface DeviceManagementProviderService { */ PaginationResult getAllDevices(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException; + /** + * Method to retrieve all the devices with pagination support. + * + * @param request PaginationRequest object holding the data for pagination + * @return List - Result includes the cost of removed device list. + * @throws DeviceManagementException If some unusual behaviour is observed while fetching the + * devices. + */ + List getRemovedDeviceListWithCost(PaginationResult paginationResult, PaginationRequest request, Collection costdata, String tenantDomain, Double totalCost) throws DeviceManagementException; + /** + * Method to retrieve all the devices with pagination support. + * + * @param request PaginationRequest object holding the data for pagination + * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required + * along with the device data. + * @return PaginationResult - Result including the required parameters necessary to do pagination. + * @throws DeviceManagementException If some unusual behaviour is observed while fetching the + * devices. + */ + PaginationResult getAllDevicesBillings(PaginationRequest request, boolean requireDeviceInfo, String tenantDomain) throws DeviceManagementException; + /** * Returns the device of specified id. * diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index 77b7ac0e08..30d39b0ea1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -34,6 +34,7 @@ */ package org.wso2.carbon.device.mgt.core.service; +import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import org.apache.commons.collections.map.SingletonMap; import org.apache.commons.lang.StringUtils; @@ -49,23 +50,7 @@ import org.apache.http.protocol.HTTP; import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.common.ActivityPaginationRequest; -import org.wso2.carbon.device.mgt.common.Device; -import org.wso2.carbon.device.mgt.common.DeviceEnrollmentInfoNotification; -import org.wso2.carbon.device.mgt.common.DeviceIdentifier; -import org.wso2.carbon.device.mgt.common.DeviceManager; -import org.wso2.carbon.device.mgt.common.DeviceNotification; -import org.wso2.carbon.device.mgt.common.DevicePropertyNotification; -import org.wso2.carbon.device.mgt.common.DeviceTransferRequest; -import org.wso2.carbon.device.mgt.common.DynamicTaskContext; -import org.wso2.carbon.device.mgt.common.EnrolmentInfo; -import org.wso2.carbon.device.mgt.common.FeatureManager; -import org.wso2.carbon.device.mgt.common.InitialOperationConfig; -import org.wso2.carbon.device.mgt.common.MonitoringOperation; -import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; -import org.wso2.carbon.device.mgt.common.PaginationRequest; -import org.wso2.carbon.device.mgt.common.PaginationResult; -import org.wso2.carbon.device.mgt.common.StartupOperationConfig; +import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfigurationException; @@ -76,6 +61,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.DevicePropertyInfo; import org.wso2.carbon.device.mgt.common.configuration.mgt.EnrollmentConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; +import org.wso2.carbon.device.mgt.common.cost.mgt.Costdata; import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation; @@ -99,6 +85,7 @@ import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException; import org.wso2.carbon.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; +import org.wso2.carbon.device.mgt.common.metadata.mgt.Metadata; import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; @@ -133,6 +120,8 @@ import org.wso2.carbon.device.mgt.common.geo.service.GeoCoordinate; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.internal.PluginInitializationListener; +import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataDAO; +import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory; import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.email.sender.core.ContentProviderInfo; @@ -150,17 +139,9 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import java.io.IOException; import java.io.StringWriter; +import java.lang.reflect.Type; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; import java.util.stream.Collectors; //import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException; @@ -176,6 +157,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv private final DeviceTypeDAO deviceTypeDAO; private final EnrollmentDAO enrollmentDAO; private final ApplicationDAO applicationDAO; + private MetadataDAO metadataDAO; public DeviceManagementProviderServiceImpl() { this.pluginRepository = new DeviceManagementPluginRepository(); @@ -183,6 +165,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv this.applicationDAO = DeviceManagementDAOFactory.getApplicationDAO(); this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO(); this.enrollmentDAO = DeviceManagementDAOFactory.getEnrollmentDAO(); + this.metadataDAO = MetadataManagementDAOFactory.getMetadataDAO(); /* Registering a listener to retrieve events when some device management service plugin is installed after * the component is done getting initialized */ @@ -954,6 +937,106 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv return this.getAllDevices(request, true); } + @Override + public List getRemovedDeviceListWithCost(PaginationResult paginationResult, PaginationRequest request, Collection costdata, String tenantDomain, Double totalCost) throws DeviceManagementException { + List allRemovedDevices; + int tenantId = this.getTenantId(); + try { + allRemovedDevices = deviceDAO.getRemovedDeviceBillList(request,tenantId); + for (Costdata test: costdata) { + if (test.getTenantDomain().equals(tenantDomain)) { + for (DeviceBilling device: allRemovedDevices) { + long dateDiff = device.getEnrolmentInfo().getDateOfLastUpdate()-device.getEnrolmentInfo().getDateOfEnrolment(); + long dateInDays = dateDiff / (1000*60*60*24); + double cost = (test.getCost()/365)*dateInDays; + totalCost = cost + totalCost; + device.setCost(cost); + } + } + } + paginationResult.setTotalCost(totalCost); + } catch (DeviceManagementDAOException e) { + String msg = "Error occurred while retrieving device list pertaining to the current tenant"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } + catch (Exception e) { + String msg = "Error occurred get devices"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } + + return allRemovedDevices; + } + + @Override + public PaginationResult getAllDevicesBillings(PaginationRequest request, boolean requireDeviceInfo, String tenantDomain) throws DeviceManagementException { + if (request == null) { + String msg = "Received incomplete pagination request for method getAllDeviceBillings"; + log.error(msg); + throw new DeviceManagementException(msg); + } + if (log.isDebugEnabled()) { + log.debug("Get devices with pagination " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo); + } + + PaginationResult paginationResult = new PaginationResult(); + Double totalCost = 0.0; + List allDevices; + List allRemovedDevices; + int count = 0; + int tenantId = this.getTenantId(); + DeviceManagerUtil.validateDeviceListPageSize(request); + try { + DeviceManagementDAOFactory.openConnection(); + allDevices = deviceDAO.getDeviceBillList(request, tenantId); + count = deviceDAO.getDeviceCount(request, tenantId); + + String metaKey = "PER_DEVICE_COST"; + MetadataManagementDAOFactory.openConnection(); + Metadata metadata = metadataDAO.getMetadata(tenantId, metaKey); + + Gson g = new Gson(); + + Type collectionType = new TypeToken>(){}.getType(); + Collection costdata = g.fromJson(metadata.getMetaValue(), collectionType); + + for (Costdata test: costdata) { + if (test.getTenantDomain().equals(tenantDomain)) { + for (DeviceBilling device: allDevices) { + long dateDiff = test.getSubscriptionEnd().getTime()-device.getEnrolmentInfo().getDateOfEnrolment(); + long dateInDays = dateDiff / (1000*60*60*24); + double cost = (test.getCost()/365)*dateInDays; + totalCost = cost + totalCost; + device.setCost(cost); + } + } + } + + allRemovedDevices = this.getRemovedDeviceListWithCost(paginationResult, request, costdata, tenantDomain, totalCost); + allDevices.addAll(allRemovedDevices); + + } catch (DeviceManagementDAOException e) { + String msg = "Error occurred while retrieving device list pertaining to the current tenant"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } catch (SQLException e) { + String msg = "Error occurred while opening a connection to the data source"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } catch (Exception e) { + String msg = "Error occurred in getAllDevices"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } finally { + DeviceManagementDAOFactory.closeConnection(); + } + paginationResult.setData(allDevices); + paginationResult.setRecordsFiltered(count); + paginationResult.setRecordsTotal(count); + return paginationResult; + } + @Override public PaginationResult getAllDevices(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException { if (request == null) { @@ -4344,7 +4427,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv log.debug("Triggering Corrective action. Device Identifier: " + deviceIdentifier); } - if (StringUtils.isBlank(featureCode)){ + if (StringUtils.isBlank(featureCode)) { String msg = "Found a Blan feature code: " + featureCode; log.error(msg); throw new BadRequestException(msg); From 7b1b8ecffd1d21cd11d132f5bfa6f1f2cca0a9ef Mon Sep 17 00:00:00 2001 From: osh Date: Wed, 2 Mar 2022 15:44:41 +0530 Subject: [PATCH 2/6] Add last billed date --- .../device/mgt/common/EnrolmentInfo.java | 11 ++++++ .../device/mgt/common/cost/mgt/Costdata.java | 12 +++---- .../dao/impl/device/GenericDeviceDAOImpl.java | 9 +++-- .../dao/util/DeviceManagementDAOUtil.java | 3 ++ .../DeviceManagementProviderServiceImpl.java | 35 +++++++++++++++++-- 5 files changed, 58 insertions(+), 12 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java index 2e7376ec81..6b195dc616 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java @@ -22,6 +22,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.math.BigInteger; @ApiModel(value = "EnrolmentInfo", description = "This class carries all information related to a devices enrollment" + " status.") @@ -48,6 +49,8 @@ public class EnrolmentInfo implements Serializable { private Long dateOfEnrolment; @ApiModelProperty(name = "dateOfLastUpdate", value = "Date of the device's last update. This value is not necessary.", required = false ) private Long dateOfLastUpdate; + @ApiModelProperty(name = "lastBilledDate", value = "Date of the device's last update. This value is not necessary.", required = false ) + private Long lastBilledDate; @ApiModelProperty(name = "ownership", value = "Defines the ownership details. The ownership type can be any of the" + " following values.\n" + "BYOD - Bring your own device (BYOD).\n" + @@ -100,6 +103,14 @@ public class EnrolmentInfo implements Serializable { this.dateOfLastUpdate = dateOfLastUpdate; } + public Long getLastBilledDate() { + return lastBilledDate; + } + + public void setLastBilledDate(Long lastBilledDate) { + this.lastBilledDate = lastBilledDate; + } + public OwnerShip getOwnership() { return ownership; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java index 28d4fe0eed..7c96af8c44 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java @@ -30,8 +30,8 @@ public class Costdata { private String tenantDomain; private Double cost; - private Timestamp subscriptionBeginning; - private Timestamp subscriptionEnd; + private long subscriptionBeginning; + private long subscriptionEnd; @XmlElement(name = "tenantDomain", required = true) public String getTenantDomain() { @@ -52,20 +52,20 @@ public class Costdata { } @XmlElement(name = "subscriptionBeginning", required = true) - public Timestamp getSubscriptionBeginning() { + public long getSubscriptionBeginning() { return subscriptionBeginning; } - public void setSubscriptionBeginning(Timestamp subscriptionBeginning) { + public void setSubscriptionBeginning(long subscriptionBeginning) { this.subscriptionBeginning = subscriptionBeginning; } @XmlElement(name = "subscriptionEnd", required = true) - public Timestamp getSubscriptionEnd() { + public long getSubscriptionEnd() { return subscriptionEnd; } - public void setSubscriptionEnd(Timestamp subscriptionEnd) { + public void setSubscriptionEnd(long subscriptionEnd) { this.subscriptionEnd = subscriptionEnd; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java index c79e46ebc8..f651b88a30 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java @@ -191,8 +191,11 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { List devices = new ArrayList<>(); try { conn = this.getConnection(); - String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, STATUS,\n" + - "TIMESTAMPDIFF('DAY', CURDATE(), DATE_OF_ENROLMENT) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + +// String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE AS BILLED_DATE,STATUS,\n" + +// "TIMESTAMPDIFF('DAY', CURDATE(), DATE_OF_ENROLMENT) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + +// "where e.TENANT_ID= ? and d.ID=e.DEVICE_ID and STATUS !='REMOVED' LIMIT 10"; + String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE,STATUS,\n" + + "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + "where e.TENANT_ID= ? and d.ID=e.DEVICE_ID and STATUS !='REMOVED' LIMIT 10"; stmt = conn.prepareStatement(sql); stmt.setInt(1, tenantId); @@ -219,7 +222,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { List devices = new ArrayList<>(); try { conn = this.getConnection(); - String sql = "select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, DATE_OF_LAST_UPDATE, STATUS, " + + String sql = "select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE, DATE_OF_LAST_UPDATE, STATUS, " + "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, DATE_OF_LAST_UPDATE) AS DAYS_USED from DM_DEVICE d, DM_ENROLMENT e" + " where e.TENANT_ID=? and d.ID=e.DEVICE_ID and STATUS ='REMOVED'\n"; stmt = conn.prepareStatement(sql); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java index bd43651a80..045e4f8d48 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java @@ -154,8 +154,10 @@ public final class DeviceManagementDAOUtil { } public static EnrolmentInfo loadEnrolmentBilling(ResultSet rs, Boolean removedDevices) throws SQLException { + System.out.println("-----------------DAOO 222------------------------------"); EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); enrolmentInfo.setDateOfEnrolment(rs.getTimestamp("DATE_OF_ENROLMENT").getTime()); + enrolmentInfo.setLastBilledDate(rs.getLong("LAST_BILLED_DATE")); enrolmentInfo.setStatus(EnrolmentInfo.Status.valueOf(rs.getString("STATUS"))); if (removedDevices) { enrolmentInfo.setDateOfLastUpdate(rs.getTimestamp("DATE_OF_LAST_UPDATE").getTime()); @@ -209,6 +211,7 @@ public final class DeviceManagementDAOUtil { } public static DeviceBilling loadDeviceBilling(ResultSet rs, Boolean removedDevices) throws SQLException { + System.out.println("-----------------DAOO 111------------------------------"); DeviceBilling device = new DeviceBilling(); device.setName(rs.getString("DEVICE_NAME")); device.setDescription(rs.getString("DESCRIPTION")); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index c61871cae9..ce18d4c57d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -978,6 +978,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv log.debug("Get devices with pagination " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo); } + System.out.println("--------------------COREEEE LAYERR-------------------"); PaginationResult paginationResult = new PaginationResult(); Double totalCost = 0.0; List allDevices; @@ -988,8 +989,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv try { DeviceManagementDAOFactory.openConnection(); allDevices = deviceDAO.getDeviceBillList(request, tenantId); + allRemovedDevices = deviceDAO.getRemovedDeviceBillList(request,tenantId); count = deviceDAO.getDeviceCount(request, tenantId); + System.out.println("-----------------HERE------------------------------"); + String metaKey = "PER_DEVICE_COST"; MetadataManagementDAOFactory.openConnection(); Metadata metadata = metadataDAO.getMetadata(tenantId, metaKey); @@ -997,12 +1001,36 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv Gson g = new Gson(); Type collectionType = new TypeToken>(){}.getType(); - Collection costdata = g.fromJson(metadata.getMetaValue(), collectionType); + Collection costdata = g.fromJson(metadata.getMetaValue(), collectionType); // change name for (Costdata test: costdata) { if (test.getTenantDomain().equals(tenantDomain)) { for (DeviceBilling device: allDevices) { - long dateDiff = test.getSubscriptionEnd().getTime()-device.getEnrolmentInfo().getDateOfEnrolment(); + long dateDiff; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getDateOfEnrolment(); + } else { + dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getLastBilledDate(); + } +// dateDiff = test.getSubscriptionEnd().getTime()-device.getEnrolmentInfo().getDateOfEnrolment(); + long dateInDays = dateDiff / (1000*60*60*24); + double cost = (test.getCost()/365)*dateInDays; + totalCost = cost + totalCost; + device.setCost(cost); + } + } + } + + for (Costdata test: costdata) { + if (test.getTenantDomain().equals(tenantDomain)) { + for (DeviceBilling device: allRemovedDevices) { + long dateDiff; +// long dateDiff = device.getEnrolmentInfo().getDateOfLastUpdate()-device.getEnrolmentInfo().getDateOfEnrolment(); + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getDateOfEnrolment(); + } else { + dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getLastBilledDate(); + } long dateInDays = dateDiff / (1000*60*60*24); double cost = (test.getCost()/365)*dateInDays; totalCost = cost + totalCost; @@ -1011,7 +1039,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } } - allRemovedDevices = this.getRemovedDeviceListWithCost(paginationResult, request, costdata, tenantDomain, totalCost); +// allRemovedDevices = this.getRemovedDeviceListWithCost(paginationResult, request, costdata, tenantDomain, totalCost); allDevices.addAll(allRemovedDevices); } catch (DeviceManagementDAOException e) { @@ -1030,6 +1058,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv DeviceManagementDAOFactory.closeConnection(); } paginationResult.setData(allDevices); + paginationResult.setTotalCost(totalCost); paginationResult.setRecordsFiltered(count); paginationResult.setRecordsTotal(count); return paginationResult; From c135105889092f7aa74547f55af65f2495a8cd3f Mon Sep 17 00:00:00 2001 From: osh Date: Mon, 7 Mar 2022 01:21:02 +0530 Subject: [PATCH 3/6] fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits Add re-enrollment device cost calculation --- .../service/api/DeviceManagementService.java | 19 +- .../impl/DeviceManagementServiceImpl.java | 13 +- .../wso2/carbon/device/mgt/common/Device.java | 37 ++++ .../device/mgt/common/DeviceBilling.java | 77 +------ .../device/mgt/common/EnrolmentInfo.java | 18 +- .../cost/mgt/{Costdata.java => Cost.java} | 4 +- .../carbon/device/mgt/core/dao/DeviceDAO.java | 3 +- .../device/mgt/core/dao/DeviceStatusDAO.java | 2 +- .../device/mgt/core/dao/EnrollmentDAO.java | 3 + .../core/dao/impl/DeviceStatusDAOImpl.java | 19 +- .../mgt/core/dao/impl/EnrollmentDAOImpl.java | 21 ++ .../dao/impl/device/GenericDeviceDAOImpl.java | 20 +- .../dao/impl/device/OracleDeviceDAOImpl.java | 2 +- .../impl/device/PostgreSQLDeviceDAOImpl.java | 2 +- .../impl/device/SQLServerDeviceDAOImpl.java | 2 +- .../dao/util/DeviceManagementDAOUtil.java | 30 +-- .../DeviceManagementProviderService.java | 19 +- .../DeviceManagementProviderServiceImpl.java | 205 +++++++++++------- 18 files changed, 280 insertions(+), 216 deletions(-) rename components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/{Costdata.java => Cost.java} (96%) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index 4f38198cfe..2cf1352b34 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -81,6 +81,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.sql.Timestamp; import java.util.List; /** @@ -399,9 +400,23 @@ public interface DeviceManagementService { @ApiParam( name = "tenantDomain", value = "The tenant domain.", - required = false, - defaultValue = "nita") + required = false) String tenantDomain, + @ApiParam( + name = "startDate", + value = "The start date.", + required = false) + Timestamp startDate, + @ApiParam( + name = "endDate", + value = "The end date.", + required = false) + Timestamp endDate, + @ApiParam( + name = "generateBill", + value = "The generate bill boolean.", + required = false) + boolean generateBill, @ApiParam( name = "offset", value = "The starting pagination index for the complete list of qualified items.", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index f3f580dc5d..60588c451a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -133,6 +133,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; import javax.ws.rs.DefaultValue; import javax.ws.rs.core.Response; +import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -345,24 +346,24 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { @Override @Path("/billing") public Response getDevicesBilling( - @DefaultValue("nita") @QueryParam ("tenantDomain") String tenantDomain, + @QueryParam ("startDate") Timestamp startDate, + @QueryParam ("endDate") Timestamp endDate, + @QueryParam ("generateBill") boolean generateBill, @QueryParam("offset") int offset, @DefaultValue("10") @QueryParam("limit") int limit) { try { RequestValidationUtil.validatePaginationParameters(offset, limit); DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); -// DeviceAccessAuthorizationService deviceAccessAuthorizationService = -// DeviceMgtAPIUtils.getDeviceAccessAuthorizationService(); PaginationRequest request = new PaginationRequest(offset, limit); PaginationResult result; DeviceList devices = new DeviceList(); try { - result = dms.getAllDevicesBillings(request, true, tenantDomain); + result = dms.getAllDevicesBillings(request, tenantDomain, startDate, endDate, generateBill); } catch (Exception exception) { - String msg = "------------------TEST ERROR-----------------------"; + String msg = "Error occurred when trying to retrieve billing data"; log.error(msg, exception); return Response.serverError().entity( new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); @@ -379,7 +380,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { return Response.status(Response.Status.OK).entity(devices).build(); } catch (Exception e) { - String msg = "Error occurred while fetching all enrolled devices"; + String msg = "Error occurred while retrieving billing data"; log.error(msg, e); return Response.serverError().entity( new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java index df86fd3575..b18697a92e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java @@ -24,8 +24,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshotWrapper; +import org.wso2.carbon.device.mgt.common.type.mgt.DeviceStatus; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; @ApiModel(value = "Device", description = "This class carries all information related to a managed device.") @@ -72,6 +74,17 @@ public class Device implements Serializable { required = false) private List applications; + @ApiModelProperty(name = "cost", value = "Cost charged per device.", required = false) + private Double cost; + + @ApiModelProperty(name = "daysUsed", value = "Number of days gone since device enrollment.", + required = false) + private int daysUsed; + + @ApiModelProperty(name = "deviceStatusInfo", value = "This defines the device status details. " + + "It is mandatory to define this information.", required = false) + private List deviceStatusInfo = new ArrayList<>(); + @ApiModelProperty( name = "historySnapshot", value = "device history snapshots") @@ -92,6 +105,30 @@ public class Device implements Serializable { this.properties = properties; } + public Double getCost() { + return cost; + } + + public void setCost(Double cost) { + this.cost = cost; + } + + public int getDaysUsed() { + return daysUsed; + } + + public void setDaysUsed(int daysUsed) { + this.daysUsed = daysUsed; + } + + public List getDeviceStatusInfo() { + return deviceStatusInfo; + } + + public void setDeviceStatusInfo(List deviceStatusInfo) { + this.deviceStatusInfo = deviceStatusInfo; + } + public int getId() { return id; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java index 4eaa3fa7dd..18ac7743c3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceBilling.java @@ -17,18 +17,17 @@ */ package org.wso2.carbon.device.mgt.common; -import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.Gson; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; -import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshotWrapper; +import org.wso2.carbon.device.mgt.common.type.mgt.DeviceStatus; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; -@ApiModel(value = "DeviceBilling", description = "This class carries all information related to a managed device.") +@ApiModel(value = "DeviceBilling", description = "This class carries all information related to a device billing.") public class DeviceBilling implements Serializable { private static final long serialVersionUID = 1998101711L; @@ -40,9 +39,6 @@ public class DeviceBilling implements Serializable { @ApiModelProperty(name = "name", value = "The device name that can be set on the device by the device user.", required = true) private String name; -// -// @ApiModelProperty(name = "type", value = "The OS type of the device.", required = true) -// private String type; @ApiModelProperty(name = "description", value = "Additional information on the device.", required = false) private String description; @@ -58,7 +54,7 @@ public class DeviceBilling implements Serializable { required = false) private String deviceIdentifier; - @ApiModelProperty(name = "daysSinceEnrolled", value = "Number of days gone since device enrollment date to current date.", + @ApiModelProperty(name = "daysSinceEnrolled", value = "Number of days gone since device enrollment.", required = false) private int daysSinceEnrolled; @@ -70,39 +66,23 @@ public class DeviceBilling implements Serializable { "It is mandatory to define this information.", required = false) private EnrolmentInfo enrolmentInfo; -// @ApiModelProperty(name = "features", value = "List of features.", required = false) -// private List features; - -// private List properties; + @ApiModelProperty(name = "deviceStatusInfo", value = "This defines the device status details. " + + "It is mandatory to define this information.", required = false) + private List deviceStatusInfo = new ArrayList<>(); @ApiModelProperty(name = "advanceInfo", value = "This defines the device registration related information. " + "It is mandatory to define this information.", required = false) private DeviceInfo deviceInfo; -// @ApiModelProperty(name = "applications", value = "This represents the application list installed into the device", -// required = false) -// private List applications; - -// @ApiModelProperty( -// name = "historySnapshot", -// value = "device history snapshots") -// @JsonProperty(value = "historySnapshot") -// private DeviceLocationHistorySnapshotWrapper historySnapshot; - public DeviceBilling() { } - public DeviceBilling(String name, String description, EnrolmentInfo enrolmentInfo) { - this.name = name; - this.description = description; - this.enrolmentInfo = enrolmentInfo; + public List getDeviceStatusInfo() { + return deviceStatusInfo; } - public DeviceBilling(String name, String description, String deviceId, EnrolmentInfo enrolmentInfo) { - this.name = name; - this.description = description; - this.deviceIdentifier = deviceId; - this.enrolmentInfo = enrolmentInfo; + public void setDeviceStatusInfo(List deviceStatusInfo) { + this.deviceStatusInfo = deviceStatusInfo; } public int getDaysUsed() { @@ -177,46 +157,11 @@ public class DeviceBilling implements Serializable { this.deviceInfo = deviceInfo; } - public static class Property { - - private String name; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - } - @Override public String toString() { return new Gson().toJson(this); } - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (!(o instanceof DeviceBilling)) - return false; - - DeviceBilling device = (DeviceBilling) o; - - return getDeviceIdentifier().equals(device.getDeviceIdentifier()); - - } - @Override public int hashCode() { return getDeviceIdentifier().hashCode(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java index 6b195dc616..52d4efe039 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/EnrolmentInfo.java @@ -49,7 +49,7 @@ public class EnrolmentInfo implements Serializable { private Long dateOfEnrolment; @ApiModelProperty(name = "dateOfLastUpdate", value = "Date of the device's last update. This value is not necessary.", required = false ) private Long dateOfLastUpdate; - @ApiModelProperty(name = "lastBilledDate", value = "Date of the device's last update. This value is not necessary.", required = false ) + @ApiModelProperty(name = "lastBilledDate", value = "Date of the device's last billed date", required = false ) private Long lastBilledDate; @ApiModelProperty(name = "ownership", value = "Defines the ownership details. The ownership type can be any of the" + " following values.\n" + @@ -95,14 +95,6 @@ public class EnrolmentInfo implements Serializable { this.dateOfEnrolment = dateOfEnrolment; } - public Long getDateOfLastUpdate() { - return dateOfLastUpdate; - } - - public void setDateOfLastUpdate(Long dateOfLastUpdate) { - this.dateOfLastUpdate = dateOfLastUpdate; - } - public Long getLastBilledDate() { return lastBilledDate; } @@ -111,6 +103,14 @@ public class EnrolmentInfo implements Serializable { this.lastBilledDate = lastBilledDate; } + public Long getDateOfLastUpdate() { + return dateOfLastUpdate; + } + + public void setDateOfLastUpdate(Long dateOfLastUpdate) { + this.dateOfLastUpdate = dateOfLastUpdate; + } + public OwnerShip getOwnership() { return ownership; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java similarity index 96% rename from components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java rename to components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java index 7c96af8c44..57399b102f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Costdata.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java @@ -22,11 +22,9 @@ import com.google.gson.Gson; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import java.sql.Timestamp; -import java.util.Date; @XmlRootElement(name = "Cost") -public class Costdata { +public class Cost { private String tenantDomain; private Double cost; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java index e34c208077..df2204125d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java @@ -47,6 +47,7 @@ import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Date; import java.util.List; import java.util.Map; @@ -300,7 +301,7 @@ public interface DeviceDAO { * @return returns paginated list of not removed devices of tenant. * @throws DeviceManagementDAOException */ - List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; + List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException; /** * This method is used to retrieve the removed devices of a given tenant as a paginated result. diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceStatusDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceStatusDAO.java index 6d9cb18e58..56ccc9d95f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceStatusDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceStatusDAO.java @@ -34,7 +34,7 @@ public interface DeviceStatusDAO { List getStatus(int deviceId, int tenantId) throws DeviceManagementDAOException; - List getStatus(int deviceId, int tenantId, Date fromDate, Date toDate) throws DeviceManagementDAOException; + List getStatus(int deviceId, int tenantId, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementDAOException; List getStatus(int enrolmentId) throws DeviceManagementDAOException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/EnrollmentDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/EnrollmentDAO.java index be621eab34..825fa64797 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/EnrollmentDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/EnrollmentDAO.java @@ -22,6 +22,7 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status; +import java.sql.Timestamp; import java.util.List; public interface EnrollmentDAO { @@ -32,6 +33,8 @@ public interface EnrollmentDAO { boolean updateEnrollmentStatus(List enrolmentInfos) throws DeviceManagementDAOException; + boolean updateEnrollmentLastBilledDate(EnrolmentInfo enrolmentInfos, Timestamp lastBilledDate, int tenantId) throws DeviceManagementDAOException; + int removeEnrollment(int deviceId, String currentOwner, int tenantId) throws DeviceManagementDAOException; @Deprecated diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceStatusDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceStatusDAOImpl.java index 0305f83114..c237d4ce22 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceStatusDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceStatusDAOImpl.java @@ -15,7 +15,7 @@ import java.util.List; public class DeviceStatusDAOImpl implements DeviceStatusDAO { - private List getStatus(int id, Date fromDate, Date toDate, boolean isDeviceId) throws DeviceManagementDAOException { + private List getStatus(int id, Date fromDate, Date toDate, boolean isDeviceId, boolean billingStatus) throws DeviceManagementDAOException { List result = new ArrayList<>(); Connection conn; PreparedStatement stmt = null; @@ -25,7 +25,14 @@ public class DeviceStatusDAOImpl implements DeviceStatusDAO { conn = this.getConnection(); // either we list all status values for the device using the device id or only get status values for the given enrolment id String idType = isDeviceId ? "DEVICE_ID" : "ENROLMENT_ID"; - String sql = "SELECT ENROLMENT_ID, DEVICE_ID, UPDATE_TIME, STATUS, CHANGED_BY FROM DM_DEVICE_STATUS WHERE " + idType + " = ?"; + String sql; + + if (billingStatus) { + sql = "SELECT ENROLMENT_ID, DEVICE_ID, UPDATE_TIME, STATUS, CHANGED_BY FROM DM_DEVICE_STATUS WHERE STATUS IN ('ACTIVE','REMOVED') AND " + idType + " = ?"; + } else { + sql = "SELECT ENROLMENT_ID, DEVICE_ID, UPDATE_TIME, STATUS, CHANGED_BY FROM DM_DEVICE_STATUS WHERE " + idType + " = ?"; + } + // filter the data based on a date range if specified if (fromDate != null){ sql += " AND UPDATE_TIME >= ?"; @@ -64,17 +71,17 @@ public class DeviceStatusDAOImpl implements DeviceStatusDAO { @Override public List getStatus(int enrolmentId, Date fromDate, Date toDate) throws DeviceManagementDAOException { - return getStatus(enrolmentId, fromDate, toDate, false); + return getStatus(enrolmentId, fromDate, toDate, false, false); } @Override public List getStatus(int deviceId, int tenantId) throws DeviceManagementDAOException { - return getStatus(deviceId, tenantId, null, null); + return getStatus(deviceId, tenantId, null, null, false); } @Override - public List getStatus(int deviceId, int tenantId, Date fromDate, Date toDate) throws DeviceManagementDAOException { - return getStatus(deviceId, fromDate, toDate, true); + public List getStatus(int deviceId, int tenantId, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementDAOException { + return getStatus(deviceId, fromDate, toDate, true, billingStatus); } @Override diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/EnrollmentDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/EnrollmentDAOImpl.java index 1472518b1c..a8fbad8ff9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/EnrollmentDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/EnrollmentDAOImpl.java @@ -144,6 +144,27 @@ public class EnrollmentDAOImpl implements EnrollmentDAO { return status; } + @Override + public boolean updateEnrollmentLastBilledDate(EnrolmentInfo enrolmentInfo, Timestamp lastBilledDate, int tenantId) throws DeviceManagementDAOException { + Connection conn; + PreparedStatement stmt = null; + ResultSet rs = null; + try { + conn = this.getConnection(); + String sql = "UPDATE DM_ENROLMENT SET LAST_BILLED_DATE = ? WHERE ID = ? AND TENANT_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setLong(1, lastBilledDate.getTime()); + stmt.setInt(2, enrolmentInfo.getId()); + stmt.setInt(3, tenantId); + stmt.executeUpdate(); + return true; + } catch (SQLException e) { + throw new DeviceManagementDAOException("Error occurred while updating enrolment last billed date.", e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, rs); + } + } + @Override public int removeEnrollment(int deviceId, String currentOwner, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java index f651b88a30..bc96c183af 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java @@ -80,6 +80,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { "e.IS_TRANSFERRED, " + "e.DATE_OF_LAST_UPDATE, " + "e.DATE_OF_ENROLMENT, " + + "e.LAST_BILLED_DATE, " + "e.ID AS ENROLMENT_ID " + "FROM DM_ENROLMENT e, " + "(SELECT d.ID, " + @@ -184,29 +185,27 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getDeviceBillList(PaginationRequest request, int tenantId) + public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { Connection conn; PreparedStatement stmt = null; List devices = new ArrayList<>(); try { conn = this.getConnection(); -// String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE AS BILLED_DATE,STATUS,\n" + -// "TIMESTAMPDIFF('DAY', CURDATE(), DATE_OF_ENROLMENT) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + -// "where e.TENANT_ID= ? and d.ID=e.DEVICE_ID and STATUS !='REMOVED' LIMIT 10"; - String sql ="select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE,STATUS,\n" + - "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED from DM_DEVICE d, DM_ENROLMENT e\n" + - "where e.TENANT_ID= ? and d.ID=e.DEVICE_ID and STATUS !='REMOVED' LIMIT 10"; + String sql = "SELECT DM_DEVICE.ID, DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DM_ENROLMENT.ID AS ENROLMENT_ID,\n" + + " DATE_OF_ENROLMENT,STATUS, LAST_BILLED_DATE, TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED\n" + + " FROM DM_DEVICE JOIN DM_ENROLMENT ON (DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID)\n" + + " WHERE DM_ENROLMENT.TENANT_ID=?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, tenantId); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, false); + DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs); devices.add(device); } } catch (SQLException e) { - throw new DeviceManagementDAOException("Error occurred while fetching the list of devices belongs to '" + + throw new DeviceManagementDAOException("Error occurred while fetching the list of devices '" + request.getOwner() + "'", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, null); @@ -230,7 +229,8 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { ResultSet rs = stmt.executeQuery(); while (rs.next()) { - DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, true); +// DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, true); + DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs); devices.add(device); } } catch (SQLException e) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java index 76f0ed7c5a..aaadef26d1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java @@ -194,7 +194,7 @@ public class OracleDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + public List getDeviceBillList(PaginationRequest request, int tenantId , Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java index f25319a9b0..4db568cf8d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java @@ -185,7 +185,7 @@ public class PostgreSQLDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java index 3c87242653..45fcd83cb7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java @@ -195,7 +195,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { + public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java index 045e4f8d48..187796b109 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java @@ -21,7 +21,9 @@ import java.sql.*; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; +import java.util.*; import java.util.Date; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.CarbonContext; @@ -32,6 +34,7 @@ import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot; import org.wso2.carbon.device.mgt.common.device.details.DeviceMonitoringData; +import org.wso2.carbon.device.mgt.common.type.mgt.DeviceStatus; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; @@ -41,9 +44,6 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import javax.naming.InitialContext; import javax.sql.DataSource; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; public final class DeviceManagementDAOUtil { @@ -150,16 +150,17 @@ public final class DeviceManagementDAOUtil { enrolmentInfo.setDateOfEnrolment(rs.getTimestamp("DATE_OF_ENROLMENT").getTime()); enrolmentInfo.setDateOfLastUpdate(rs.getTimestamp("DATE_OF_LAST_UPDATE").getTime()); enrolmentInfo.setStatus(EnrolmentInfo.Status.valueOf(rs.getString("STATUS"))); + enrolmentInfo.setLastBilledDate(rs.getLong("LAST_BILLED_DATE")); return enrolmentInfo; } - public static EnrolmentInfo loadEnrolmentBilling(ResultSet rs, Boolean removedDevices) throws SQLException { - System.out.println("-----------------DAOO 222------------------------------"); + public static EnrolmentInfo loadEnrolmentBilling(ResultSet rs) throws SQLException { EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); + enrolmentInfo.setId(rs.getInt("ENROLMENT_ID")); enrolmentInfo.setDateOfEnrolment(rs.getTimestamp("DATE_OF_ENROLMENT").getTime()); enrolmentInfo.setLastBilledDate(rs.getLong("LAST_BILLED_DATE")); enrolmentInfo.setStatus(EnrolmentInfo.Status.valueOf(rs.getString("STATUS"))); - if (removedDevices) { + if (EnrolmentInfo.Status.valueOf(rs.getString("STATUS")).equals("REMOVED")) { enrolmentInfo.setDateOfLastUpdate(rs.getTimestamp("DATE_OF_LAST_UPDATE").getTime()); } return enrolmentInfo; @@ -210,18 +211,19 @@ public final class DeviceManagementDAOUtil { return device; } - public static DeviceBilling loadDeviceBilling(ResultSet rs, Boolean removedDevices) throws SQLException { - System.out.println("-----------------DAOO 111------------------------------"); + public static DeviceBilling loadDeviceBilling(ResultSet rs) throws SQLException { DeviceBilling device = new DeviceBilling(); + device.setId(rs.getInt("ID")); device.setName(rs.getString("DEVICE_NAME")); device.setDescription(rs.getString("DESCRIPTION")); device.setDeviceIdentifier(rs.getString("DEVICE_IDENTIFICATION")); - if (removedDevices) { - device.setDaysUsed((int) rs.getLong("DAYS_USED")); - } else { - device.setDaysSinceEnrolled((int) rs.getLong("DAYS_SINCE_ENROLLED")); - } - device.setEnrolmentInfo(loadEnrolmentBilling(rs, removedDevices)); + device.setDaysUsed((int) rs.getLong("DAYS_SINCE_ENROLLED")); +// if (removedDevices) { +// device.setDaysUsed((int) rs.getLong("DAYS_USED")); +// } else { +// device.setDaysSinceEnrolled((int) rs.getLong("DAYS_SINCE_ENROLLED")); +// } + device.setEnrolmentInfo(loadEnrolmentBilling(rs)); return device; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index d7df2b286d..0facd40ae0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -42,7 +42,6 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfiguratio import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; -import org.wso2.carbon.device.mgt.common.cost.mgt.Costdata; import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocationHistorySnapshot; @@ -70,6 +69,7 @@ import org.wso2.carbon.device.mgt.common.geo.service.GeoCluster; import org.wso2.carbon.device.mgt.common.geo.service.GeoCoordinate; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Collection; import java.util.Date; import java.util.List; @@ -203,22 +203,11 @@ public interface DeviceManagementProviderService { * Method to retrieve all the devices with pagination support. * * @param request PaginationRequest object holding the data for pagination - * @return List - Result includes the cost of removed device list. - * @throws DeviceManagementException If some unusual behaviour is observed while fetching the - * devices. - */ - List getRemovedDeviceListWithCost(PaginationResult paginationResult, PaginationRequest request, Collection costdata, String tenantDomain, Double totalCost) throws DeviceManagementException; - /** - * Method to retrieve all the devices with pagination support. - * - * @param request PaginationRequest object holding the data for pagination - * @param requireDeviceInfo - A boolean indicating whether the device-info (location, app-info etc) is also required - * along with the device data. * @return PaginationResult - Result including the required parameters necessary to do pagination. - * @throws DeviceManagementException If some unusual behaviour is observed while fetching the + * @throws DeviceManagementException If some unusual behaviour is observed while fetching billing of * devices. */ - PaginationResult getAllDevicesBillings(PaginationRequest request, boolean requireDeviceInfo, String tenantDomain) throws DeviceManagementException; + PaginationResult getAllDevicesBillings(PaginationRequest request, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException; /** * Returns the device of specified id. @@ -705,7 +694,7 @@ public interface DeviceManagementProviderService { List getDeviceStatusHistory(Device device) throws DeviceManagementException; - List getDeviceStatusHistory(Device device, Date fromDate, Date toDate) throws DeviceManagementException; + List getDeviceStatusHistory(Device device, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementException; List getDeviceCurrentEnrolmentStatusHistory(Device device) throws DeviceManagementException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index ce18d4c57d..f3302ec7bf 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -61,7 +61,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.DevicePropertyInfo; import org.wso2.carbon.device.mgt.common.configuration.mgt.EnrollmentConfiguration; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; -import org.wso2.carbon.device.mgt.common.cost.mgt.Costdata; +import org.wso2.carbon.device.mgt.common.cost.mgt.Cost; import org.wso2.carbon.device.mgt.common.device.details.DeviceData; import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo; import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation; @@ -137,6 +137,7 @@ import java.io.IOException; import java.io.StringWriter; import java.lang.reflect.Type; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.*; import java.util.stream.Collectors; @@ -936,112 +937,156 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public List getRemovedDeviceListWithCost(PaginationResult paginationResult, PaginationRequest request, Collection costdata, String tenantDomain, Double totalCost) throws DeviceManagementException { - List allRemovedDevices; - int tenantId = this.getTenantId(); - try { - allRemovedDevices = deviceDAO.getRemovedDeviceBillList(request,tenantId); - for (Costdata test: costdata) { - if (test.getTenantDomain().equals(tenantDomain)) { - for (DeviceBilling device: allRemovedDevices) { - long dateDiff = device.getEnrolmentInfo().getDateOfLastUpdate()-device.getEnrolmentInfo().getDateOfEnrolment(); - long dateInDays = dateDiff / (1000*60*60*24); - double cost = (test.getCost()/365)*dateInDays; - totalCost = cost + totalCost; - device.setCost(cost); - } - } - } - paginationResult.setTotalCost(totalCost); - } catch (DeviceManagementDAOException e) { - String msg = "Error occurred while retrieving device list pertaining to the current tenant"; - log.error(msg, e); - throw new DeviceManagementException(msg, e); - } - catch (Exception e) { - String msg = "Error occurred get devices"; - log.error(msg, e); - throw new DeviceManagementException(msg, e); - } - - return allRemovedDevices; - } - - @Override - public PaginationResult getAllDevicesBillings(PaginationRequest request, boolean requireDeviceInfo, String tenantDomain) throws DeviceManagementException { + public PaginationResult getAllDevicesBillings(PaginationRequest request, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { if (request == null) { String msg = "Received incomplete pagination request for method getAllDeviceBillings"; log.error(msg); throw new DeviceManagementException(msg); } - if (log.isDebugEnabled()) { - log.debug("Get devices with pagination " + request.toString() + " and requiredDeviceInfo: " + requireDeviceInfo); - } - System.out.println("--------------------COREEEE LAYERR-------------------"); PaginationResult paginationResult = new PaginationResult(); Double totalCost = 0.0; - List allDevices; - List allRemovedDevices; +// List allDevices; + List allDevices; int count = 0; int tenantId = this.getTenantId(); - DeviceManagerUtil.validateDeviceListPageSize(request); + try { DeviceManagementDAOFactory.openConnection(); - allDevices = deviceDAO.getDeviceBillList(request, tenantId); - allRemovedDevices = deviceDAO.getRemovedDeviceBillList(request,tenantId); +// allDevices = deviceDAO.getDeviceBillList(request, tenantId, startDate, endDate); + allDevices = deviceDAO.getDevices(request, tenantId); count = deviceDAO.getDeviceCount(request, tenantId); - System.out.println("-----------------HERE------------------------------"); - String metaKey = "PER_DEVICE_COST"; MetadataManagementDAOFactory.openConnection(); Metadata metadata = metadataDAO.getMetadata(tenantId, metaKey); Gson g = new Gson(); - Type collectionType = new TypeToken>(){}.getType(); - Collection costdata = g.fromJson(metadata.getMetaValue(), collectionType); // change name - - for (Costdata test: costdata) { - if (test.getTenantDomain().equals(tenantDomain)) { - for (DeviceBilling device: allDevices) { - long dateDiff; - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getDateOfEnrolment(); - } else { - dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getLastBilledDate(); + Type collectionType = new TypeToken>(){}.getType(); + Collection costData = g.fromJson(metadata.getMetaValue(), collectionType); + + for (Cost tenantCost: costData) { + if (tenantCost.getTenantDomain().equals(tenantDomain)) { + for (Device device: allDevices) { + device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); + long dateDiff = 0; + + List deviceStatus = device.getDeviceStatusInfo(); + boolean lastBilledDate = false; + + for (int i=0; i i+1) { + if (lastBilledDate == false) { + lastBilledDate = true; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { + if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } + } + } else { + if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } + } + } else { + if (lastBilledDate == false) { + lastBilledDate = true; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { + if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } + } + } else { + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } + } + } } -// dateDiff = test.getSubscriptionEnd().getTime()-device.getEnrolmentInfo().getDateOfEnrolment(); + long dateInDays = dateDiff / (1000*60*60*24); - double cost = (test.getCost()/365)*dateInDays; + double cost = (tenantCost.getCost()/365)*dateInDays; totalCost = cost + totalCost; device.setCost(cost); - } - } - } + device.setDaysUsed((int) dateInDays); - for (Costdata test: costdata) { - if (test.getTenantDomain().equals(tenantDomain)) { - for (DeviceBilling device: allRemovedDevices) { - long dateDiff; -// long dateDiff = device.getEnrolmentInfo().getDateOfLastUpdate()-device.getEnrolmentInfo().getDateOfEnrolment(); - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getDateOfEnrolment(); - } else { - dateDiff = test.getSubscriptionEnd()-device.getEnrolmentInfo().getLastBilledDate(); + if (generateBill) { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); } - long dateInDays = dateDiff / (1000*60*60*24); - double cost = (test.getCost()/365)*dateInDays; - totalCost = cost + totalCost; - device.setCost(cost); + } +// for (DeviceBilling device: allDevices) { +// device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); +// long dateDiff = 0; +// +// List deviceStatus = device.getDeviceStatusInfo(); +// boolean lastBilledDate = false; +//// int startIndex = deviceStatus.indexOf("ACTIVE"); + +// for (int i=0; i i+1) { +// if (lastBilledDate == false) { +// lastBilledDate = true; +// if (device.getEnrolmentInfo().getLastBilledDate() == 0) { +// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); +// } else { +// if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { +// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); +// } +//// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); +// } +// } else { +// if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { +// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); +// } +//// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); +// } +//// dateDiff = deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime(); +// } else { +// if (lastBilledDate == false) { +// lastBilledDate = true; +// if (device.getEnrolmentInfo().getLastBilledDate() == 0) { +// dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); +// } else { +// if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { +// dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); +// } +//// dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); +// } +// } else { +// dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); +// } +//// dateDiff = endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime(); +// } +// } +// } +// +// long dateInDays = dateDiff / (1000*60*60*24); +// double cost = (test.getCost()/365)*dateInDays; +// totalCost = cost + totalCost; +// device.setCost(cost); +// device.setDaysUsed((int) dateInDays); +// +// if (generateBill) { +// Timestamp timestamp = new Timestamp(System.currentTimeMillis()); +// enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); +// } +// +//// if (cost == 0) { +//// allDevices.remove(device); +//// } +// +// } } } -// allRemovedDevices = this.getRemovedDeviceListWithCost(paginationResult, request, costdata, tenantDomain, totalCost); - allDevices.addAll(allRemovedDevices); - } catch (DeviceManagementDAOException e) { String msg = "Error occurred while retrieving device list pertaining to the current tenant"; log.error(msg, e); @@ -1881,13 +1926,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } } @Override - public List getDeviceStatusHistory(Device device, Date fromDate, Date toDate) throws DeviceManagementException{ + public List getDeviceStatusHistory(Device device, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementException{ if (log.isDebugEnabled()) { log.debug("get status history of device: " + device.getDeviceIdentifier()); } try { int tenantId = this.getTenantId(); - return deviceStatusDAO.getStatus(device.getId(), tenantId, fromDate, toDate); + return deviceStatusDAO.getStatus(device.getId(), tenantId, fromDate, toDate, billingStatus); } catch (DeviceManagementDAOException e) { DeviceManagementDAOFactory.rollbackTransaction(); String msg = "Error occurred while retrieving status history"; @@ -1931,7 +1976,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv @Override public List getDeviceStatusHistory(Device device) throws DeviceManagementException{ - return getDeviceStatusHistory(device, null, null); + return getDeviceStatusHistory(device, null, null, false); } @Override From 053a57c4f596770f3ff3da5722e7bbccd348aada Mon Sep 17 00:00:00 2001 From: osh Date: Fri, 11 Mar 2022 01:38:48 +0530 Subject: [PATCH 4/6] Add getting billing cost by domain change fixes https://gitlab.com/entgra/product-iots/-/issues/1226 --- .../device/mgt/jaxrs/beans/DeviceList.java | 6 +- .../impl/DeviceManagementServiceImpl.java | 12 +- .../wso2/carbon/device/mgt/common/Device.java | 6 +- .../device/mgt/common/cost/mgt/Cost.java | 20 -- .../device/mgt/core/config/ui/Billing.java | 46 +++++ .../mgt/core/config/ui/UIConfiguration.java | 10 + .../dao/impl/device/GenericDeviceDAOImpl.java | 3 +- .../dao/util/DeviceManagementDAOUtil.java | 14 +- .../DeviceManagementProviderService.java | 2 +- .../DeviceManagementProviderServiceImpl.java | 175 ++++++------------ .../src/main/resources/conf/mdm-ui-config.xml | 6 + 11 files changed, 148 insertions(+), 152 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java index 770ab690c4..82a7131c40 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java @@ -29,15 +29,15 @@ public class DeviceList extends BasePaginatedResult { private List devices = new ArrayList<>(); + @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) + private double totalCost; + @ApiModelProperty(value = "List of devices returned") @JsonProperty("devices") public List getList() { return devices; } - @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) - private double totalCost; - public void setList(List devices) { this.devices = devices; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index 60588c451a..a54bdae734 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -119,6 +119,7 @@ import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerSer import org.wso2.carbon.policy.mgt.common.PolicyManagementException; import org.wso2.carbon.policy.mgt.core.PolicyManagerService; import org.wso2.carbon.user.api.UserStoreException; +import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.utils.multitenancy.MultitenantUtils; import javax.validation.Valid; @@ -134,6 +135,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.DefaultValue; import javax.ws.rs.core.Response; import java.sql.Timestamp; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -359,9 +361,17 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { PaginationRequest request = new PaginationRequest(offset, limit); PaginationResult result; DeviceList devices = new DeviceList(); + int tenantId = 0; + RealmService realmService = DeviceMgtAPIUtils.getRealmService(); + + if (!tenantDomain.isEmpty()) { + tenantId = realmService.getTenantManager().getTenantId(tenantDomain); + } else { + tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + } try { - result = dms.getAllDevicesBillings(request, tenantDomain, startDate, endDate, generateBill); + result = dms.getAllDevicesBillings(request, tenantId, tenantDomain, startDate, endDate, generateBill); } catch (Exception exception) { String msg = "Error occurred when trying to retrieve billing data"; log.error(msg, exception); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java index b18697a92e..840d155d44 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java @@ -75,7 +75,7 @@ public class Device implements Serializable { private List applications; @ApiModelProperty(name = "cost", value = "Cost charged per device.", required = false) - private Double cost; + private double cost; @ApiModelProperty(name = "daysUsed", value = "Number of days gone since device enrollment.", required = false) @@ -105,11 +105,11 @@ public class Device implements Serializable { this.properties = properties; } - public Double getCost() { + public double getCost() { return cost; } - public void setCost(Double cost) { + public void setCost(double cost) { this.cost = cost; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java index 57399b102f..bb91b2eb03 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/cost/mgt/Cost.java @@ -28,8 +28,6 @@ public class Cost { private String tenantDomain; private Double cost; - private long subscriptionBeginning; - private long subscriptionEnd; @XmlElement(name = "tenantDomain", required = true) public String getTenantDomain() { @@ -49,24 +47,6 @@ public class Cost { this.cost = cost; } - @XmlElement(name = "subscriptionBeginning", required = true) - public long getSubscriptionBeginning() { - return subscriptionBeginning; - } - - public void setSubscriptionBeginning(long subscriptionBeginning) { - this.subscriptionBeginning = subscriptionBeginning; - } - - @XmlElement(name = "subscriptionEnd", required = true) - public long getSubscriptionEnd() { - return subscriptionEnd; - } - - public void setSubscriptionEnd(long subscriptionEnd) { - this.subscriptionEnd = subscriptionEnd; - } - @Override public String toString() { return new Gson().toJson(this); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java new file mode 100644 index 0000000000..41283c899d --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java @@ -0,0 +1,46 @@ +package org.wso2.carbon.device.mgt.core.config.ui; + +import javax.xml.bind.annotation.XmlElement; + +public class Billing { + private boolean isHideBillGenerationInSuperTenant; + private boolean isHideBillGenerationInSubTenant; + private boolean isHideTotalCalculationInSuperTenant; + private boolean isHideTotalCalculationInSubTenant; + + @XmlElement(name = "HideBillGenerationInSuperTenant") + public boolean isHideBillGenerationInSuperTenant() { + return isHideBillGenerationInSuperTenant; + } + + public void setHideBillGenerationInSuperTenant(boolean hideBillGenerationInSuperTenant) { + isHideBillGenerationInSuperTenant = hideBillGenerationInSuperTenant; + } + + @XmlElement(name = "HideBillGenerationInSubTenant") + public boolean isHideBillGenerationInSubTenant() { + return isHideBillGenerationInSubTenant; + } + + public void setHideBillGenerationInSubTenant(boolean hideBillGenerationInSubTenant) { + isHideBillGenerationInSubTenant = hideBillGenerationInSubTenant; + } + + @XmlElement(name = "HideTotalCalculationInSuperTenant") + public boolean isHideTotalCalculationInSuperTenant() { + return isHideTotalCalculationInSuperTenant; + } + + public void setHideTotalCalculationInSuperTenant(boolean hideTotalCalculationInSuperTenant) { + isHideTotalCalculationInSuperTenant = hideTotalCalculationInSuperTenant; + } + + @XmlElement(name = "HideTotalCalculationInSubTenant") + public boolean isHideTotalCalculationInSubTenant() { + return isHideTotalCalculationInSubTenant; + } + + public void setHideTotalCalculationInSubTenant(boolean hideTotalCalculationInSubTenant) { + isHideTotalCalculationInSubTenant = hideTotalCalculationInSubTenant; + } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/UIConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/UIConfiguration.java index f494007330..551c1558ea 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/UIConfiguration.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/UIConfiguration.java @@ -33,6 +33,7 @@ public class UIConfiguration { private boolean isSsoEnable; private int sessionTimeOut; private int loginCacheCapacity; + private Billing billing; @XmlElement(name = "AppRegistration", required=true) public AppRegistration getAppRegistration() { @@ -62,6 +63,15 @@ public class UIConfiguration { isSsoEnable = ssoEnable; } + @XmlElement(name = "Billing", required=true) + public Billing getBilling() { + return billing; + } + + public void setBilling(Billing billing) { + this.billing = billing; + } + @XmlElement(name = "SessionTimeOut") public int getSessionTimeOut() { return sessionTimeOut; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java index bc96c183af..1bda6cad1d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java @@ -205,8 +205,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { devices.add(device); } } catch (SQLException e) { - throw new DeviceManagementDAOException("Error occurred while fetching the list of devices '" + - request.getOwner() + "'", e); + throw new DeviceManagementDAOException("Error occurred while fetching the list of device billing ", e); } finally { DeviceManagementDAOUtil.cleanupResources(stmt, null); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java index 187796b109..1f031e7c4e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java @@ -143,6 +143,14 @@ public final class DeviceManagementDAOUtil { public static EnrolmentInfo loadEnrolment(ResultSet rs) throws SQLException { EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); + String columnName = "LAST_BILLED_DATE"; + ResultSetMetaData rsmd = rs.getMetaData(); + int columns = rsmd.getColumnCount(); + for (int x = 1; x <= columns; x++) { + if (columnName.equals(rsmd.getColumnName(x))) { + enrolmentInfo.setLastBilledDate(rs.getLong("LAST_BILLED_DATE")); + } + } enrolmentInfo.setId(rs.getInt("ENROLMENT_ID")); enrolmentInfo.setOwner(rs.getString("OWNER")); enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.valueOf(rs.getString("OWNERSHIP"))); @@ -150,7 +158,6 @@ public final class DeviceManagementDAOUtil { enrolmentInfo.setDateOfEnrolment(rs.getTimestamp("DATE_OF_ENROLMENT").getTime()); enrolmentInfo.setDateOfLastUpdate(rs.getTimestamp("DATE_OF_LAST_UPDATE").getTime()); enrolmentInfo.setStatus(EnrolmentInfo.Status.valueOf(rs.getString("STATUS"))); - enrolmentInfo.setLastBilledDate(rs.getLong("LAST_BILLED_DATE")); return enrolmentInfo; } @@ -218,13 +225,14 @@ public final class DeviceManagementDAOUtil { device.setDescription(rs.getString("DESCRIPTION")); device.setDeviceIdentifier(rs.getString("DEVICE_IDENTIFICATION")); device.setDaysUsed((int) rs.getLong("DAYS_SINCE_ENROLLED")); + device.setEnrolmentInfo(loadEnrolmentBilling(rs)); + return device; // if (removedDevices) { // device.setDaysUsed((int) rs.getLong("DAYS_USED")); // } else { // device.setDaysSinceEnrolled((int) rs.getLong("DAYS_SINCE_ENROLLED")); // } - device.setEnrolmentInfo(loadEnrolmentBilling(rs)); - return device; + } public static DeviceMonitoringData loadDevice(ResultSet rs, String deviceTypeName) throws SQLException { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index 0facd40ae0..4abe44a1a1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -207,7 +207,7 @@ public interface DeviceManagementProviderService { * @throws DeviceManagementException If some unusual behaviour is observed while fetching billing of * devices. */ - PaginationResult getAllDevicesBillings(PaginationRequest request, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException; + PaginationResult getAllDevicesBillings(PaginationRequest request, int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException; /** * Returns the device of specified id. diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index f3302ec7bf..a006bd1650 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -139,6 +139,7 @@ import java.lang.reflect.Type; import java.sql.SQLException; import java.sql.Timestamp; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; //import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException; @@ -937,153 +938,91 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public PaginationResult getAllDevicesBillings(PaginationRequest request, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { + public PaginationResult getAllDevicesBillings(PaginationRequest request, int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { if (request == null) { String msg = "Received incomplete pagination request for method getAllDeviceBillings"; log.error(msg); throw new DeviceManagementException(msg); } + DeviceManagerUtil.validateDeviceListPageSize(request); PaginationResult paginationResult = new PaginationResult(); - Double totalCost = 0.0; -// List allDevices; + double totalCost = 0.0; List allDevices; int count = 0; - int tenantId = this.getTenantId(); try { - DeviceManagementDAOFactory.openConnection(); + DeviceManagementDAOFactory.beginTransaction(); // allDevices = deviceDAO.getDeviceBillList(request, tenantId, startDate, endDate); allDevices = deviceDAO.getDevices(request, tenantId); count = deviceDAO.getDeviceCount(request, tenantId); String metaKey = "PER_DEVICE_COST"; - MetadataManagementDAOFactory.openConnection(); + MetadataManagementDAOFactory.beginTransaction(); Metadata metadata = metadataDAO.getMetadata(tenantId, metaKey); Gson g = new Gson(); + Collection costData = null; Type collectionType = new TypeToken>(){}.getType(); - Collection costData = g.fromJson(metadata.getMetaValue(), collectionType); - - for (Cost tenantCost: costData) { - if (tenantCost.getTenantDomain().equals(tenantDomain)) { - for (Device device: allDevices) { - device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); - long dateDiff = 0; - - List deviceStatus = device.getDeviceStatusInfo(); - boolean lastBilledDate = false; - - for (int i=0; i i+1) { - if (lastBilledDate == false) { - lastBilledDate = true; - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + if (metadata != null) { + costData = g.fromJson(metadata.getMetaValue(), collectionType); + for (Cost tenantCost: costData) { + if (tenantCost.getTenantDomain().equals(tenantDomain)) { + for (Device device: allDevices) { + device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); + long dateDiff = 0; + + List deviceStatus = device.getDeviceStatusInfo(); + boolean lastBilledDate = false; + + for (int i=0; i i+1) { + if (!lastBilledDate) { + lastBilledDate = true; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { + if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } + } } else { - if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); + if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } } } else { - if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); - } - } - } else { - if (lastBilledDate == false) { - lastBilledDate = true; - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); - } else { - if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); + if (!lastBilledDate) { + lastBilledDate = true; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { + if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } } + } else { + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } - } else { - dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } } } - } - long dateInDays = dateDiff / (1000*60*60*24); - double cost = (tenantCost.getCost()/365)*dateInDays; - totalCost = cost + totalCost; - device.setCost(cost); - device.setDaysUsed((int) dateInDays); + long dateInDays = TimeUnit.DAYS.convert(dateDiff, TimeUnit.MILLISECONDS);; + double cost = (tenantCost.getCost()/365)*dateInDays; + totalCost = cost + totalCost; + device.setCost(Math.round(cost * 100.0) / 100.0); + device.setDaysUsed((int) dateInDays); - if (generateBill) { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); - } + if (generateBill) { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); + } + } } -// for (DeviceBilling device: allDevices) { -// device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); -// long dateDiff = 0; -// -// List deviceStatus = device.getDeviceStatusInfo(); -// boolean lastBilledDate = false; -//// int startIndex = deviceStatus.indexOf("ACTIVE"); - -// for (int i=0; i i+1) { -// if (lastBilledDate == false) { -// lastBilledDate = true; -// if (device.getEnrolmentInfo().getLastBilledDate() == 0) { -// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); -// } else { -// if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { -// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); -// } -//// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); -// } -// } else { -// if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { -// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); -// } -//// dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); -// } -//// dateDiff = deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime(); -// } else { -// if (lastBilledDate == false) { -// lastBilledDate = true; -// if (device.getEnrolmentInfo().getLastBilledDate() == 0) { -// dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); -// } else { -// if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { -// dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); -// } -//// dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); -// } -// } else { -// dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); -// } -//// dateDiff = endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime(); -// } -// } -// } -// -// long dateInDays = dateDiff / (1000*60*60*24); -// double cost = (test.getCost()/365)*dateInDays; -// totalCost = cost + totalCost; -// device.setCost(cost); -// device.setDaysUsed((int) dateInDays); -// -// if (generateBill) { -// Timestamp timestamp = new Timestamp(System.currentTimeMillis()); -// enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); -// } -// -//// if (cost == 0) { -//// allDevices.remove(device); -//// } -// -// } } } @@ -1091,19 +1030,17 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv String msg = "Error occurred while retrieving device list pertaining to the current tenant"; log.error(msg, e); throw new DeviceManagementException(msg, e); - } catch (SQLException e) { - String msg = "Error occurred while opening a connection to the data source"; - log.error(msg, e); - throw new DeviceManagementException(msg, e); - } catch (Exception e) { + } + catch (Exception e) { String msg = "Error occurred in getAllDevices"; log.error(msg, e); throw new DeviceManagementException(msg, e); } finally { DeviceManagementDAOFactory.closeConnection(); + MetadataManagementDAOFactory.closeConnection(); } paginationResult.setData(allDevices); - paginationResult.setTotalCost(totalCost); + paginationResult.setTotalCost(Math.round(totalCost * 100.0) / 100.0); paginationResult.setRecordsFiltered(count); paginationResult.setRecordsTotal(count); return paginationResult; diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml index e20d7cfbf0..319980a59b 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml @@ -24,6 +24,12 @@ 3600 10000 + + true + true + true + true + analytics_management From 5ad9e3e6b452ae767056cf5ebca4ea726c48d3ba Mon Sep 17 00:00:00 2001 From: osh Date: Tue, 5 Apr 2022 22:59:23 +0530 Subject: [PATCH 5/6] Add billing data export api fixes https://gitlab.com/entgra/product-iots/-/issues/1226 --- .../device/mgt/jaxrs/beans/DeviceList.java | 22 ++ .../service/api/DeviceManagementService.java | 77 ++++++ .../impl/DeviceManagementServiceImpl.java | 157 +++++++---- .../carbon/device/mgt/common/Billing.java | 118 ++++++++ .../device/mgt/common/PaginationResult.java | 22 ++ .../mgt/core/DeviceManagementConstants.java | 1 + .../device/mgt/core/config/ui/Billing.java | 20 ++ .../device/mgt/core/dao/BillingDAO.java | 13 + .../carbon/device/mgt/core/dao/DeviceDAO.java | 18 +- .../core/dao/DeviceManagementDAOFactory.java | 6 + .../mgt/core/dao/impl/BillingDAOImpl.java | 71 +++++ .../dao/impl/device/GenericDeviceDAOImpl.java | 43 +-- .../dao/impl/device/OracleDeviceDAOImpl.java | 7 +- .../impl/device/PostgreSQLDeviceDAOImpl.java | 7 +- .../impl/device/SQLServerDeviceDAOImpl.java | 7 +- .../DeviceManagementProviderService.java | 11 + .../DeviceManagementProviderServiceImpl.java | 261 +++++++++++++----- 17 files changed, 664 insertions(+), 197 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Billing.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/BillingDAO.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/BillingDAOImpl.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java index 82a7131c40..8c6c4945c4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceList.java @@ -32,6 +32,12 @@ public class DeviceList extends BasePaginatedResult { @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) private double totalCost; + @ApiModelProperty(name = "message", value = "Send information text to the billing UI", required = false) + private String message; + + @ApiModelProperty(name = "billedDateIsValid", value = "Check if user entered date is valid", required = false) + private boolean billedDateIsValid; + @ApiModelProperty(value = "List of devices returned") @JsonProperty("devices") public List getList() { @@ -42,6 +48,22 @@ public class DeviceList extends BasePaginatedResult { this.devices = devices; } + public boolean isBilledDateIsValid() { + return billedDateIsValid; + } + + public void setBilledDateIsValid(boolean billedDateIsValid) { + this.billedDateIsValid = billedDateIsValid; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + public double getTotalCost() { return totalCost; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java index 2cf1352b34..e2d88ea046 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java @@ -432,6 +432,83 @@ public interface DeviceManagementService { @QueryParam("limit") int limit); + + @GET + @Path("/billing/file") + @Produces(MediaType.APPLICATION_JSON) + @ApiOperation( + produces = MediaType.APPLICATION_JSON, + httpMethod = "GET", + value = "Getting Cost details of devices in a tenant", + notes = "Provides individual cost and total cost of all devices per tenant.", + tags = "Device Management", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view") + }) + } + ) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "OK. \n Successfully fetched the list of devices.", + response = DeviceList.class, + responseHeaders = { + @ResponseHeader( + name = "Content-Type", + description = "The content type of the body"), + @ResponseHeader( + name = "Content-Disposition", + description = "The content disposition of the body"), + @ResponseHeader( + name = "ETag", + description = "Entity Tag of the response resource.\n" + + "Used by caches, or in conditional requests."), + @ResponseHeader( + name = "Last-Modified", + description = "Date and time the resource was last modified.\n" + + "Used by caches, or in conditional requests."), + }), + @ApiResponse( + code = 304, + message = "Not Modified. \n Empty body because the client already has the latest version of " + + "the requested resource.\n"), + @ApiResponse( + code = 400, + message = "The incoming request has more than one selection criteria defined via the query parameters.", + response = ErrorResponse.class), + @ApiResponse( + code = 404, + message = "The search criteria did not match any device registered with the server.", + response = ErrorResponse.class), + @ApiResponse( + code = 406, + message = "Not Acceptable.\n The requested media type is not supported."), + @ApiResponse( + code = 500, + message = "Internal Server Error. \n Server error occurred while fetching the device list.", + response = ErrorResponse.class) + }) + Response exportBilling( + @ApiParam( + name = "tenantDomain", + value = "The tenant domain.", + required = false) + String tenantDomain, + @ApiParam( + name = "startDate", + value = "The start date.", + required = false) + Timestamp startDate, + @ApiParam( + name = "endDate", + value = "The end date.", + required = false) + Timestamp endDate, + @ApiParam( + name = "generateBill", + value = "The generate bill boolean.", + required = false) + boolean generateBill); + @GET @Produces(MediaType.APPLICATION_JSON) @ApiOperation( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index a54bdae734..6e6882cfb8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -124,24 +124,12 @@ import org.wso2.carbon.utils.multitenancy.MultitenantUtils; import javax.validation.Valid; import javax.validation.constraints.Size; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.DefaultValue; +import javax.ws.rs.*; import javax.ws.rs.core.Response; import java.sql.Timestamp; -import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.ArrayList; -import java.util.Properties; +import java.util.*; @Path("/devices") public class DeviceManagementServiceImpl implements DeviceManagementService { @@ -217,8 +205,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } if (status != null && !status.isEmpty()) { boolean isStatusEmpty = true; - for (String statusString : status){ - if (StringUtils.isNotBlank(statusString)){ + for (String statusString : status) { + if (StringUtils.isNotBlank(statusString)) { isStatusEmpty = false; break; } @@ -348,10 +336,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { @Override @Path("/billing") public Response getDevicesBilling( - @QueryParam ("tenantDomain") String tenantDomain, - @QueryParam ("startDate") Timestamp startDate, - @QueryParam ("endDate") Timestamp endDate, - @QueryParam ("generateBill") boolean generateBill, + @QueryParam("tenantDomain") String tenantDomain, + @QueryParam("startDate") Timestamp startDate, + @QueryParam("endDate") Timestamp endDate, + @QueryParam("generateBill") boolean generateBill, @QueryParam("offset") int offset, @DefaultValue("10") @QueryParam("limit") int limit) { @@ -385,11 +373,12 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } devices.setList((List) result.getData()); + devices.setBilledDateIsValid(result.isBilledDateIsValid()); + devices.setMessage(result.getMessage()); devices.setCount(result.getRecordsTotal()); devices.setTotalCost(result.getTotalCost()); return Response.status(Response.Status.OK).entity(devices).build(); - } - catch (Exception e) { + } catch (Exception e) { String msg = "Error occurred while retrieving billing data"; log.error(msg, e); return Response.serverError().entity( @@ -397,6 +386,51 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } } + @GET + @Override + @Path("/billing/file") + public Response exportBilling( + @QueryParam("tenantDomain") String tenantDomain, + @QueryParam("startDate") Timestamp startDate, + @QueryParam("endDate") Timestamp endDate, + @QueryParam("generateBill") boolean generateBill) { + + try { + DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); + PaginationResult result; + int tenantId = 0; + RealmService realmService = DeviceMgtAPIUtils.getRealmService(); + DeviceList devices = new DeviceList(); + + if (!tenantDomain.isEmpty()) { + tenantId = realmService.getTenantManager().getTenantId(tenantDomain); + } else { + tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + } + + try { + result = dms.createBillingFile(tenantId, tenantDomain, startDate, endDate, generateBill); + + } catch (Exception exception) { + String msg = "Error occurred when trying to retrieve billing data without pagination"; + log.error(msg, exception); + return null; + } + + devices.setList((List) result.getData()); + devices.setBilledDateIsValid(result.isBilledDateIsValid()); + devices.setMessage(result.getMessage()); + devices.setCount(result.getRecordsTotal()); + devices.setTotalCost(result.getTotalCost()); + return Response.status(Response.Status.OK).entity(devices).build(); + } catch (Exception e) { + String msg = "Error occurred while retrieving billing data without pagination"; + log.error(msg, e); + return null; + } + + } + @GET @Override @Path("/user-devices") @@ -433,8 +467,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { * Validate group Id and group Id greater than 0 and exist. * * @param groupId Group ID of the group - * @param from time to start getting DeviceLocationHistorySnapshotWrapper in milliseconds - * @param to time to end getting DeviceLocationHistorySnapshotWrapper in milliseconds + * @param from time to start getting DeviceLocationHistorySnapshotWrapper in milliseconds + * @param to time to end getting DeviceLocationHistorySnapshotWrapper in milliseconds */ private static void validateGroupId(int groupId, long from, long to) throws GroupManagementException, BadRequestException { if (from == 0 || to == 0) { @@ -463,7 +497,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { @QueryParam("to") long to, @QueryParam("type") String type, @DefaultValue("0") @QueryParam("offset") int offset, - @DefaultValue("100") @QueryParam("limit") int limit){ + @DefaultValue("100") @QueryParam("limit") int limit) { try { RequestValidationUtil.validatePaginationParameters(offset, limit); DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); @@ -472,31 +506,31 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { // this is the user who initiates the request String authorizedUser = CarbonContext.getThreadLocalCarbonContext().getUsername(); - try { - validateGroupId(groupId, from, to); - boolean isPermitted = DeviceMgtAPIUtils.checkPermission(groupId, authorizedUser); - if (isPermitted) { - request.setGroupId(groupId); - } else { - String msg = "Current user '" + authorizedUser - + "' doesn't have enough privileges to list devices of group '" - + groupId + "'"; - log.error(msg); - return Response.status(Response.Status.FORBIDDEN).entity(msg).build(); - } - } catch (GroupManagementException e) { - String msg = "Error occurred while getting the data using '" + groupId + "'"; - log.error(msg); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); - } catch (UserStoreException e){ - String msg = "Error occurred while retrieving role list of user '" + authorizedUser + "'"; + try { + validateGroupId(groupId, from, to); + boolean isPermitted = DeviceMgtAPIUtils.checkPermission(groupId, authorizedUser); + if (isPermitted) { + request.setGroupId(groupId); + } else { + String msg = "Current user '" + authorizedUser + + "' doesn't have enough privileges to list devices of group '" + + groupId + "'"; log.error(msg); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + return Response.status(Response.Status.FORBIDDEN).entity(msg).build(); } + } catch (GroupManagementException e) { + String msg = "Error occurred while getting the data using '" + groupId + "'"; + log.error(msg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + } catch (UserStoreException e) { + String msg = "Error occurred while retrieving role list of user '" + authorizedUser + "'"; + log.error(msg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + } PaginationResult result = dms.getAllDevices(request, false); - if(!result.getData().isEmpty()){ + if (!result.getData().isEmpty()) { devices.setList((List) result.getData()); for (Device device : devices.getList()) { @@ -604,7 +638,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { DeviceData deviceData = new DeviceData(); deviceData.setDeviceIdentifier(deviceIdentifier); - if (!StringUtils.isBlank(ifModifiedSince)){ + if (!StringUtils.isBlank(ifModifiedSince)) { SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); try { sinceDate = format.parse(ifModifiedSince); @@ -617,10 +651,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } } - if (!StringUtils.isBlank(owner)){ + if (!StringUtils.isBlank(owner)) { deviceData.setDeviceOwner(owner); } - if (!StringUtils.isBlank(ownership)){ + if (!StringUtils.isBlank(ownership)) { deviceData.setDeviceOwnership(ownership); } device = dms.getDevice(deviceData, true); @@ -710,7 +744,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { sinceDate = format.parse(ifModifiedSince); } catch (ParseException e) { String message = "Error occurred while parse the since date.Invalid date string is provided in " + - "'If-Modified-Since' header"; + "'If-Modified-Since' header"; log.error(message, e); return Response.status(Response.Status.BAD_REQUEST).entity( new ErrorResponse.ErrorResponseBuilder().setMessage("Invalid date " + @@ -723,7 +757,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { String message = "No device is modified after the timestamp provided in 'If-Modified-Since' header"; log.error(message); return Response.status(Response.Status.NOT_MODIFIED).entity("No device is modified " + - "after the timestamp provided in 'If-Modified-Since' header").build(); + "after the timestamp provided in 'If-Modified-Since' header").build(); } } else { device = dms.getDevice(id, requireDeviceInfo); @@ -738,7 +772,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { // check whether the user is authorized if (!deviceAccessAuthorizationService.isUserAuthorized(deviceIdentifier, authorizedUser)) { String message = "User '" + authorizedUser + "' is not authorized to retrieve the given " + - "device id '" + id + "'"; + "device id '" + id + "'"; log.error(message); return Response.status(Response.Status.UNAUTHORIZED).entity( new ErrorResponse.ErrorResponseBuilder().setCode(401l).setMessage(message).build()).build(); @@ -893,7 +927,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { List devices; DeviceList deviceList = new DeviceList(); try { - if(map.getProperties().isEmpty()){ + if (map.getProperties().isEmpty()) { if (log.isDebugEnabled()) { log.debug("No search criteria defined when querying devices."); } @@ -901,7 +935,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { } DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); devices = dms.getDevicesBasedOnProperties(map.getProperties()); - if(devices == null || devices.isEmpty()){ + if (devices == null || devices.isEmpty()) { if (log.isDebugEnabled()) { log.debug("No Devices Found for criteria : " + map); } @@ -1201,14 +1235,14 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { /** * List device status history * - * @param type Device type - * @param id Device id + * @param type Device type + * @param id Device id * @return {@link Response} object */ @GET @Path("/{type}/{id}/getstatushistory") public Response getDeviceStatusHistory(@PathParam("type") @Size(max = 45) String type, - @PathParam("id") @Size(max = 45) String id) { + @PathParam("id") @Size(max = 45) String id) { //TODO check authorization for this RequestValidationUtil.validateDeviceIdentifier(type, id); DeviceManagementProviderService deviceManagementProviderService = @@ -1233,14 +1267,14 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { /** * List device status history for the current enrolment * - * @param type Device type - * @param id Device id + * @param type Device type + * @param id Device id * @return {@link Response} object */ @GET @Path("/{type}/{id}/getenrolmentstatushistory") public Response getCurrentEnrolmentDeviceStatusHistory(@PathParam("type") @Size(max = 45) String type, - @PathParam("id") @Size(max = 45) String id) { + @PathParam("id") @Size(max = 45) String id) { //TODO check authorization for this or current enrolment should be based on for the enrolment associated with the user RequestValidationUtil.validateDeviceIdentifier(type, id); DeviceManagementProviderService deviceManagementProviderService = @@ -1544,7 +1578,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { if (MDMAppConstants.AndroidConstants.OPCODE_INSTALL_APPLICATION.equals(operation.getCode()) || MDMAppConstants.AndroidConstants.OPCODE_UNINSTALL_APPLICATION.equals(operation.getCode())) { ApplicationManager applicationManager = DeviceMgtAPIUtils.getApplicationManager(); - applicationManager.updateSubsStatus(device.getId(), operation.getId(),operation.getStatus().toString()); + applicationManager.updateSubsStatus(device.getId(), operation.getId(), operation.getStatus().toString()); } return Response.status(Response.Status.OK).entity("OperationStatus updated successfully.").build(); } catch (BadRequestException e) { @@ -1563,7 +1597,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService { String msg = "Error occurred when updating the application subscription status of the operation. " + "The device identifier is: " + deviceIdentifier; log.error(msg, e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); } + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build(); + } } @GET diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Billing.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Billing.java new file mode 100644 index 0000000000..79f398a5f8 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Billing.java @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * you may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "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. + */ +package org.wso2.carbon.device.mgt.common; + +import com.google.gson.Gson; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + +@ApiModel(value = "Billing", description = "This class carries all information related to a device billing.") +public class Billing implements Serializable { + + private static final long serialVersionUID = 1998101711L; + + @ApiModelProperty(name = "invoiceId", value = "ID of the billing.", + required = false) + private int invoiceId; + + @ApiModelProperty(name = "deviceId", value = "Device id of the billing.", + required = false) + private int deviceId; + + @ApiModelProperty(name = "tenantId", value = "Tenant of the device.", + required = false) + private int tenantId; + + @ApiModelProperty(name = "billingStart", value = "Start date of the billing period.", required = false) + private Long billingStart; + + @ApiModelProperty(name = "billingEnd", value = "End date of the billing period.", required = false) + private Long billingEnd; + + @ApiModelProperty(name = "deviceCount", value = "Device count for a billing period", + required = false) + private int deviceCount; + + + public Billing() { + } + + public Billing(int invoiceId, int deviceId, int tenantId, Long billingStart, Long billingEnd) { + this.invoiceId = invoiceId; + this.deviceId = deviceId; + this.tenantId = tenantId; + this.billingStart = billingStart; + this.billingEnd = billingEnd; + } + + public int getInvoiceId() { + return invoiceId; + } + + public void setInvoiceId(int invoiceId) { + this.invoiceId = invoiceId; + } + + public int getDeviceId() { + return deviceId; + } + + public void setDeviceId(int deviceId) { + this.deviceId = deviceId; + } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } + + public Long getBillingStart() { + return billingStart; + } + + public void setBillingStart(Long billingStart) { + this.billingStart = billingStart; + } + + public Long getBillingEnd() { + return billingEnd; + } + + public void setBillingEnd(Long billingEnd) { + this.billingEnd = billingEnd; + } + + public int getDeviceCount() { + return deviceCount; + } + + public void setDeviceCount(int deviceCount) { + this.deviceCount = deviceCount; + } + + @Override + public String toString() { + return new Gson().toJson(this); + } + + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java index 9bb9fc5920..553618d80c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationResult.java @@ -47,6 +47,28 @@ public class PaginationResult implements Serializable { @ApiModelProperty(name = "totalCost", value = "Total cost of all devices per tenant", required = false) private double totalCost; + @ApiModelProperty(name = "billedDateIsValid", value = "Check if user entered date is valid", required = false) + private boolean billedDateIsValid; + + @ApiModelProperty(name = "message", value = "Send information text to the billing UI", required = false) + private String message; + + public boolean isBilledDateIsValid() { + return billedDateIsValid; + } + + public void setBilledDateIsValid(boolean billedDateIsValid) { + this.billedDateIsValid = billedDateIsValid; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + public double getTotalCost() { return totalCost; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java index e9cfa13398..884fdfa1ca 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java @@ -44,6 +44,7 @@ public final class DeviceManagementConstants { public static final String DEVICE_CACHE = "DEVICE_CACHE"; public static final String API_RESOURCE_PERMISSION_CACHE = "API_RESOURCE_CACHE_CACHE"; public static final String GEOFENCE_CACHE = "GEOFENCE_CACHE"; + public static final String META_KEY = "PER_DEVICE_COST"; public static final String ENROLLMENT_NOTIFICATION_API_ENDPOINT = "/api/device-mgt/enrollment-notification"; public static final String URL_SEPERATOR = "/"; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java index 41283c899d..11953bd3d2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/ui/Billing.java @@ -7,6 +7,26 @@ public class Billing { private boolean isHideBillGenerationInSubTenant; private boolean isHideTotalCalculationInSuperTenant; private boolean isHideTotalCalculationInSubTenant; + private boolean isHideDomainSelectionInSuperTenant; + private boolean isHideDomainSelectionInSubTenant; + + @XmlElement(name = "HideDomainSelectionInSuperTenant") + public boolean isHideDomainSelectionInSuperTenant() { + return isHideDomainSelectionInSuperTenant; + } + + public void setHideDomainSelectionInSuperTenant(boolean hideDomainSelectionInSuperTenant) { + isHideDomainSelectionInSuperTenant = hideDomainSelectionInSuperTenant; + } + + @XmlElement(name = "HideDomainSelectionInSubTenant") + public boolean isHideDomainSelectionInSubTenant() { + return isHideDomainSelectionInSubTenant; + } + + public void setHideDomainSelectionInSubTenant(boolean hideDomainSelectionInSubTenant) { + isHideDomainSelectionInSubTenant = hideDomainSelectionInSubTenant; + } @XmlElement(name = "HideBillGenerationInSuperTenant") public boolean isHideBillGenerationInSuperTenant() { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/BillingDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/BillingDAO.java new file mode 100644 index 0000000000..dd0ddf4e28 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/BillingDAO.java @@ -0,0 +1,13 @@ +package org.wso2.carbon.device.mgt.core.dao; + +import org.wso2.carbon.device.mgt.common.Billing; + +import java.sql.Timestamp; +import java.util.List; + +public interface BillingDAO { + + void addBilling(int deviceId, int tenantId, Timestamp billingStart, Timestamp billingEnd) throws DeviceManagementDAOException; + + List getBilling(int deviceId, Timestamp billingStart, Timestamp billingEnd) throws DeviceManagementDAOException; +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java index df2204125d..8f23228bef 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java @@ -294,24 +294,12 @@ public interface DeviceDAO { List getDevices(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; /** - * This method is used to retrieve the not removed devices of a given tenant as a paginated result. - * - * @param request PaginationRequest object holding the data for pagination - * @param tenantId tenant id. - * @return returns paginated list of not removed devices of tenant. - * @throws DeviceManagementDAOException - */ - List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException; - - /** - * This method is used to retrieve the removed devices of a given tenant as a paginated result. - * - * @param request PaginationRequest object holding the data for pagination + * This method is used to retrieve the devices of a given tenant without pagination. * @param tenantId tenant id. - * @return rreturns paginated list of removed devices of tenant. + * @return returns a list of devices of the tenant. * @throws DeviceManagementDAOException */ - List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException; + List getDeviceListWithoutPagination(int tenantId) throws DeviceManagementDAOException; /** * This method is used to retrieve the devices of a given tenant as a paginated result, along the lines of diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java index a07989e338..6b594664f4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java @@ -42,6 +42,7 @@ import org.wso2.carbon.device.mgt.core.privacy.dao.impl.PrivacyComplianceDAOImpl import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; +import java.sql.Timestamp; import java.util.Hashtable; import java.util.List; @@ -124,6 +125,11 @@ public class DeviceManagementDAOFactory { public static EnrollmentDAO getEnrollmentDAO() { return new EnrollmentDAOImpl(); } + + public static BillingDAO getBillingDAO() { + return new BillingDAOImpl(); + } + public static DeviceStatusDAO getDeviceStatusDAO() { return new DeviceStatusDAOImpl(); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/BillingDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/BillingDAOImpl.java new file mode 100644 index 0000000000..4af343012b --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/BillingDAOImpl.java @@ -0,0 +1,71 @@ +package org.wso2.carbon.device.mgt.core.dao.impl; + +import org.wso2.carbon.device.mgt.common.Billing; +import org.wso2.carbon.device.mgt.common.EnrolmentInfo; +import org.wso2.carbon.device.mgt.core.dao.BillingDAO; +import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; +import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory; +import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + +public class BillingDAOImpl implements BillingDAO { + + @Override + public void addBilling(int deviceId, int tenantId, Timestamp billingStart, Timestamp billingEnd) throws DeviceManagementDAOException { + + Connection conn; + PreparedStatement stmt = null; + ResultSet rs = null; + try { + conn = this.getConnection(); + String sql = "INSERT INTO DM_BILLING(DEVICE_ID, TENANT_ID, BILLING_START, BILLING_END) VALUES(?, ?, ?, ?)"; + stmt = conn.prepareStatement(sql, new String[] {"invoice_id"}); + stmt.setInt(1, deviceId); + stmt.setInt(2,tenantId); + stmt.setTimestamp(3, billingStart); + stmt.setTimestamp(4, billingEnd); + stmt.execute(); + } catch (SQLException e) { + e.printStackTrace(); + throw new DeviceManagementDAOException("Error occurred while adding billing period", e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, rs); + } + } + + @Override + public List getBilling(int deviceId, Timestamp billingStart, Timestamp billingEnd) throws DeviceManagementDAOException { + List billings = new ArrayList<>(); + Connection conn; + PreparedStatement stmt = null; + ResultSet rs = null; + EnrolmentInfo.Status status = null; + try { + conn = this.getConnection(); + String sql; + + sql = "SELECT * FROM DM_BILLING WHERE DEVICE_ID = ?"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, deviceId); + rs = stmt.executeQuery(); + + while (rs.next()) { + Billing bill = new Billing(rs.getInt("INVOICE_ID"), rs.getInt("DEVICE_ID"),rs.getInt("TENANT_ID"), + (rs.getTimestamp("BILLING_START").getTime()), (rs.getTimestamp("BILLING_END").getTime())); + billings.add(bill); + } + } catch (SQLException e) { + throw new DeviceManagementDAOException("Error occurred getting billing periods", e); + } finally { + DeviceManagementDAOUtil.cleanupResources(stmt, null); + } + return billings; + } + + private Connection getConnection() throws SQLException { + return DeviceManagementDAOFactory.getConnection(); + } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java index 1bda6cad1d..7e280d09c1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java @@ -185,23 +185,23 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) + public List getDeviceListWithoutPagination(int tenantId) throws DeviceManagementDAOException { Connection conn; PreparedStatement stmt = null; - List devices = new ArrayList<>(); + List devices = new ArrayList<>(); try { conn = this.getConnection(); - String sql = "SELECT DM_DEVICE.ID, DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DM_ENROLMENT.ID AS ENROLMENT_ID,\n" + - " DATE_OF_ENROLMENT,STATUS, LAST_BILLED_DATE, TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED\n" + - " FROM DM_DEVICE JOIN DM_ENROLMENT ON (DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID)\n" + - " WHERE DM_ENROLMENT.TENANT_ID=?"; + String sql = "SELECT DM_DEVICE.ID AS DEVICE_ID, DEVICE_IDENTIFICATION, DESCRIPTION, DM_DEVICE.NAME AS DEVICE_NAME, DM_DEVICE_TYPE.NAME AS DEVICE_TYPE,\n" + + "DM_ENROLMENT.ID AS ENROLMENT_ID, DATE_OF_ENROLMENT,OWNER, OWNERSHIP,IS_TRANSFERRED, STATUS, DATE_OF_LAST_UPDATE, LAST_BILLED_DATE,\n" + + "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, CURDATE()) as DAYS_SINCE_ENROLLED FROM DM_DEVICE JOIN DM_ENROLMENT\n" + + "ON (DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID) JOIN DM_DEVICE_TYPE ON (DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID) WHERE DM_ENROLMENT.TENANT_ID=?"; stmt = conn.prepareStatement(sql); stmt.setInt(1, tenantId); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs); + Device device = DeviceManagementDAOUtil.loadDevice(rs); devices.add(device); } } catch (SQLException e) { @@ -212,35 +212,6 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl { return devices; } - @Override - public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) - throws DeviceManagementDAOException { - Connection conn; - PreparedStatement stmt = null; - List devices = new ArrayList<>(); - try { - conn = this.getConnection(); - String sql = "select DEVICE_IDENTIFICATION, DESCRIPTION, NAME AS DEVICE_NAME, DATE_OF_ENROLMENT, LAST_BILLED_DATE, DATE_OF_LAST_UPDATE, STATUS, " + - "TIMESTAMPDIFF('DAY', DATE_OF_ENROLMENT, DATE_OF_LAST_UPDATE) AS DAYS_USED from DM_DEVICE d, DM_ENROLMENT e" + - " where e.TENANT_ID=? and d.ID=e.DEVICE_ID and STATUS ='REMOVED'\n"; - stmt = conn.prepareStatement(sql); - stmt.setInt(1, tenantId); - ResultSet rs = stmt.executeQuery(); - - while (rs.next()) { -// DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs, true); - DeviceBilling device = DeviceManagementDAOUtil.loadDeviceBilling(rs); - devices.add(device); - } - } catch (SQLException e) { - throw new DeviceManagementDAOException("Error occurred while fetching the list of devices belongs to '" + - request.getOwner() + "'", e); - } finally { - DeviceManagementDAOUtil.cleanupResources(stmt, null); - } - return devices; - } - @Override public List getAllocatedDevices(PaginationRequest request, int tenantId, int activeServerCount, int serverIndex) throws DeviceManagementDAOException { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java index aaadef26d1..beef6f1542 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java @@ -189,12 +189,7 @@ public class OracleDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { - return null; - } - - @Override - public List getDeviceBillList(PaginationRequest request, int tenantId , Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { + public List getDeviceListWithoutPagination(int tenantId) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java index 4db568cf8d..eb358004ab 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java @@ -180,12 +180,7 @@ public class PostgreSQLDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { - return null; - } - - @Override - public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { + public List getDeviceListWithoutPagination(int tenantId) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java index 45fcd83cb7..f9e087e64e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java @@ -190,12 +190,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl { } @Override - public List getRemovedDeviceBillList(PaginationRequest request, int tenantId) throws DeviceManagementDAOException { - return null; - } - - @Override - public List getDeviceBillList(PaginationRequest request, int tenantId, Timestamp startDate, Timestamp endDate) throws DeviceManagementDAOException { + public List getDeviceListWithoutPagination(int tenantId) throws DeviceManagementDAOException { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index 4abe44a1a1..4b1a424d27 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -209,6 +209,17 @@ public interface DeviceManagementProviderService { */ PaginationResult getAllDevicesBillings(PaginationRequest request, int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException; + /** + * Method to retrieve all the devices with pagination support. + * + * @return PaginationResult - Result including the device bill list without pagination. + * @throws DeviceManagementException If some unusual behaviour is observed while fetching billing of + * devices. + */ + PaginationResult createBillingFile(int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException; + + + /** * Returns the device of specified id. * diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index a006bd1650..b92ab55400 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -138,6 +138,8 @@ import java.io.StringWriter; import java.lang.reflect.Type; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.Format; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -156,6 +158,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv private final EnrollmentDAO enrollmentDAO; private final ApplicationDAO applicationDAO; private MetadataDAO metadataDAO; + private final BillingDAO billingDAO; private final DeviceStatusDAO deviceStatusDAO; public DeviceManagementProviderServiceImpl() { @@ -165,6 +168,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO(); this.enrollmentDAO = DeviceManagementDAOFactory.getEnrollmentDAO(); this.metadataDAO = MetadataManagementDAOFactory.getMetadataDAO(); + this.billingDAO = DeviceManagementDAOFactory.getBillingDAO(); this.deviceStatusDAO = DeviceManagementDAOFactory.getDeviceStatusDAO(); /* Registering a listener to retrieve events when some device management service plugin is installed after @@ -768,8 +772,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv throw new DeviceManagementException(msg); } if (log.isDebugEnabled()) { - log.debug("Getting allocated Devices for Server with index "+ serverIndex + " and" + - " type '" + deviceType); + log.debug("Getting allocated Devices for Server with index " + serverIndex + " and" + + " type '" + deviceType); } List allocatedDevices; try { @@ -783,7 +787,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } } catch (DeviceManagementDAOException e) { String msg = "Error occurred while retrieving all devices of type '" + - deviceType + "' that are being managed within the scope of current tenant"; + deviceType + "' that are being managed within the scope of current tenant"; log.error(msg, e); throw new DeviceManagementException(msg, e); } catch (SQLException e) { @@ -937,101 +941,153 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv return this.getAllDevices(request, true); } - @Override - public PaginationResult getAllDevicesBillings(PaginationRequest request, int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { - if (request == null) { - String msg = "Received incomplete pagination request for method getAllDeviceBillings"; - log.error(msg); - throw new DeviceManagementException(msg); - } + public PaginationResult calculateCost(int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill, List allDevices) throws DeviceManagementException { - DeviceManagerUtil.validateDeviceListPageSize(request); PaginationResult paginationResult = new PaginationResult(); double totalCost = 0.0; - List allDevices; - int count = 0; + boolean allDevicesBilledDateIsValid = true; + String lastBilledDates = ""; + ArrayList lastBilledDatesList = new ArrayList<>(); + List invalidDevices = new ArrayList<>(); + List removeBillingPeriodInvalidDevices = new ArrayList<>() ; + List removeStatusUpdateInvalidDevices = new ArrayList<>() ; try { - DeviceManagementDAOFactory.beginTransaction(); -// allDevices = deviceDAO.getDeviceBillList(request, tenantId, startDate, endDate); - allDevices = deviceDAO.getDevices(request, tenantId); - count = deviceDAO.getDeviceCount(request, tenantId); - - String metaKey = "PER_DEVICE_COST"; MetadataManagementDAOFactory.beginTransaction(); - Metadata metadata = metadataDAO.getMetadata(tenantId, metaKey); + Metadata metadata = metadataDAO.getMetadata(-1234, DeviceManagementConstants.META_KEY); Gson g = new Gson(); Collection costData = null; - Type collectionType = new TypeToken>(){}.getType(); + + Type collectionType = new TypeToken>() {}.getType(); if (metadata != null) { costData = g.fromJson(metadata.getMetaValue(), collectionType); - for (Cost tenantCost: costData) { + for (Cost tenantCost : costData) { if (tenantCost.getTenantDomain().equals(tenantDomain)) { - for (Device device: allDevices) { - device.setDeviceStatusInfo(getDeviceStatusHistory(device, startDate, endDate, true)); + for (Device device : allDevices) { + device.setDeviceStatusInfo(getDeviceStatusHistory(device, null, null, true)); long dateDiff = 0; List deviceStatus = device.getDeviceStatusInfo(); boolean lastBilledDate = false; + boolean deviceStatusIsValid = false; + + List deviceBilling = billingDAO.getBilling(device.getId(), startDate, endDate); + boolean billDateIsInvalid = false; + + if (deviceBilling.isEmpty()) { + billDateIsInvalid = false; + } + + if (generateBill) { + for (Billing bill : deviceBilling) { + if ((bill.getBillingStart() <= startDate.getTime() && startDate.getTime() <= bill.getBillingEnd()) || + (bill.getBillingStart() <= endDate.getTime() && endDate.getTime() <= bill.getBillingEnd())) { + billDateIsInvalid = true; + invalidDevices.add(bill); + } + } + } - for (int i=0; i i+1) { - if (!lastBilledDate) { - lastBilledDate = true; - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + if (!billDateIsInvalid) { + for (int i = 0; i < deviceStatus.size(); i++) { + if (deviceStatus.get(i).getStatus().toString().equals("ACTIVE")) { + if (deviceStatus.size() > i + 1) { + if (!lastBilledDate) { + lastBilledDate = true; + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (deviceStatus.get(i + 1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { + if (deviceStatus.get(i + 1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (deviceStatus.get(i + 1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } + } } else { - if (deviceStatus.get(i+1).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - device.getEnrolmentInfo().getLastBilledDate()); + if (deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (deviceStatus.get(i + 1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } } - } else { - if ( deviceStatus.get(i).getUpdateTime().getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff + (deviceStatus.get(i+1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); - } - } - } else { - if (!lastBilledDate) { - lastBilledDate = true; - if (device.getEnrolmentInfo().getLastBilledDate() == 0) { - dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } else { // The last status update calculation is done in this block + // If only one status row is retrieved this block is executed + if (!lastBilledDate) { + lastBilledDate = true; + // Is executed if there is no lastBilled date and if the updates time is before the enddate + if (device.getEnrolmentInfo().getLastBilledDate() == 0) { + if (endDate.getTime() >= deviceStatus.get(i).getUpdateTime().getTime()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } + } else { + if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); + } + } } else { - if (endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { - dateDiff = dateDiff +(endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); + if (device.getEnrolmentInfo().getLastBilledDate() <= deviceStatus.get(i).getUpdateTime().getTime() + && endDate.getTime() >= deviceStatus.get(i).getUpdateTime().getTime()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); + } + if (device.getEnrolmentInfo().getLastBilledDate() >= deviceStatus.get(i).getUpdateTime().getTime() + && endDate.getTime() >= device.getEnrolmentInfo().getLastBilledDate()) { + deviceStatusIsValid = true; + dateDiff = dateDiff + (endDate.getTime() - device.getEnrolmentInfo().getLastBilledDate()); } } - } else { - dateDiff = dateDiff + (endDate.getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } } } - } - long dateInDays = TimeUnit.DAYS.convert(dateDiff, TimeUnit.MILLISECONDS);; - double cost = (tenantCost.getCost()/365)*dateInDays; - totalCost = cost + totalCost; - device.setCost(Math.round(cost * 100.0) / 100.0); - device.setDaysUsed((int) dateInDays); + long dateInDays = TimeUnit.DAYS.convert(dateDiff, TimeUnit.MILLISECONDS); + double cost = (tenantCost.getCost() / 365) * dateInDays; + totalCost = cost + totalCost; + device.setCost(Math.round(cost * 100.0) / 100.0); + device.setDaysUsed((int) dateInDays); - if (generateBill) { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), timestamp, tenantId); + if (generateBill) { + enrollmentDAO.updateEnrollmentLastBilledDate(device.getEnrolmentInfo(), endDate, tenantId); + billingDAO.addBilling(device.getId(), tenantId, startDate, endDate); + DeviceManagementDAOFactory.commitTransaction(); + } + + } else { + + for (int i = 0; i < deviceStatus.size(); i++) { + if (endDate.getTime() >= deviceStatus.get(i).getUpdateTime().getTime() + && startDate.getTime() <= deviceStatus.get(i).getUpdateTime().getTime()) { + deviceStatusIsValid = true; + } + } + if (device.getEnrolmentInfo().getLastBilledDate() != 0) { + Date date = new Date(device.getEnrolmentInfo().getLastBilledDate()); + Format format = new SimpleDateFormat("yyyy MM dd"); + if (!lastBilledDatesList.contains(lastBilledDatesList.add(format.format(date)))) { + lastBilledDatesList.add(format.format(date)); + } + + lastBilledDates = lastBilledDates + ' ' + lastBilledDatesList; + } + removeBillingPeriodInvalidDevices.add(device); } + if (!deviceStatusIsValid) { + removeStatusUpdateInvalidDevices.add(device); + } } + } } } - } catch (DeviceManagementDAOException e) { String msg = "Error occurred while retrieving device list pertaining to the current tenant"; log.error(msg, e); throw new DeviceManagementException(msg, e); - } - catch (Exception e) { + } catch (Exception e) { String msg = "Error occurred in getAllDevices"; log.error(msg, e); throw new DeviceManagementException(msg, e); @@ -1039,13 +1095,83 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv DeviceManagementDAOFactory.closeConnection(); MetadataManagementDAOFactory.closeConnection(); } + + if(!removeBillingPeriodInvalidDevices.isEmpty() && removeBillingPeriodInvalidDevices.size() == allDevices.size()) { + allDevicesBilledDateIsValid = false; + paginationResult.setMessage("Invalid bill period last billed dates of devices are " +lastBilledDates); + } + if(!removeStatusUpdateInvalidDevices.isEmpty() && removeStatusUpdateInvalidDevices.size() == allDevices.size()) { + allDevicesBilledDateIsValid = false; + if (paginationResult.getMessage() != null){ + paginationResult.setMessage(paginationResult.getMessage() + " and no device updates within entered bill period."); + } else { + paginationResult.setMessage("Devices have not been updated within the given period or entered end date comes before the last billed date"); + } + + } + allDevices.removeAll(removeBillingPeriodInvalidDevices); + allDevices.removeAll(removeStatusUpdateInvalidDevices); + + paginationResult.setBilledDateIsValid(allDevicesBilledDateIsValid); paginationResult.setData(allDevices); paginationResult.setTotalCost(Math.round(totalCost * 100.0) / 100.0); + return paginationResult; + } + + @Override + public PaginationResult getAllDevicesBillings(PaginationRequest request, int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { + if (request == null) { + String msg = "Received incomplete pagination request for method getAllDeviceBillings"; + log.error(msg); + throw new DeviceManagementException(msg); + } + + DeviceManagerUtil.validateDeviceListPageSize(request); + PaginationResult paginationResult = new PaginationResult(); + List allDevices; + int count = 0; + + try { + DeviceManagementDAOFactory.beginTransaction(); + allDevices = deviceDAO.getDevices(request, tenantId); + count = deviceDAO.getDeviceCount(request, tenantId); + paginationResult = calculateCost(tenantId, tenantDomain, startDate, endDate, generateBill, allDevices); + + } catch (DeviceManagementDAOException e) { + String msg = "Error occurred while retrieving device bill list pertaining to the current tenant"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } catch (Exception e) { + String msg = "Error occurred in getAllDevicesBillings"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } paginationResult.setRecordsFiltered(count); paginationResult.setRecordsTotal(count); return paginationResult; } + @Override + public PaginationResult createBillingFile(int tenantId, String tenantDomain, Timestamp startDate, Timestamp endDate, boolean generateBill) throws DeviceManagementException { + PaginationResult paginationResult = new PaginationResult(); + List allDevices; + try { + DeviceManagementDAOFactory.beginTransaction(); + allDevices = deviceDAO.getDeviceListWithoutPagination(tenantId); + paginationResult = calculateCost(tenantId, tenantDomain, startDate, endDate, generateBill, allDevices); + + } catch (DeviceManagementDAOException e) { + String msg = "Error occurred while retrieving device bill list without pagination pertaining to the current tenant"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } catch (Exception e) { + String msg = "Error occurred in createBillingFile"; + log.error(msg, e); + throw new DeviceManagementException(msg, e); + } + return paginationResult; + } + @Override public PaginationResult getAllDevices(PaginationRequest request, boolean requireDeviceInfo) throws DeviceManagementException { if (request == null) { @@ -1862,8 +1988,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv DeviceManagementDAOFactory.closeConnection(); } } + @Override - public List getDeviceStatusHistory(Device device, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementException{ + public List getDeviceStatusHistory(Device device, Date fromDate, Date toDate, boolean billingStatus) throws DeviceManagementException { if (log.isDebugEnabled()) { log.debug("get status history of device: " + device.getDeviceIdentifier()); } @@ -1883,7 +2010,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public List getDeviceCurrentEnrolmentStatusHistory(Device device, Date fromDate, Date toDate) throws DeviceManagementException{ + public List getDeviceCurrentEnrolmentStatusHistory(Device device, Date fromDate, Date toDate) throws DeviceManagementException { if (log.isDebugEnabled()) { log.debug("get status history of device: " + device.getDeviceIdentifier()); } @@ -1912,12 +2039,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public List getDeviceStatusHistory(Device device) throws DeviceManagementException{ + public List getDeviceStatusHistory(Device device) throws DeviceManagementException { return getDeviceStatusHistory(device, null, null, false); } @Override - public List getDeviceCurrentEnrolmentStatusHistory(Device device) throws DeviceManagementException{ + public List getDeviceCurrentEnrolmentStatusHistory(Device device) throws DeviceManagementException { return getDeviceCurrentEnrolmentStatusHistory(device, null, null); } @@ -3334,7 +3461,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv @Override public List getDeviceLocationInfo(DeviceIdentifier deviceIdentifier, long from, - long to) throws DeviceManagementException { + long to) throws DeviceManagementException { if (log.isDebugEnabled()) { log.debug("Get device location information"); } @@ -4489,7 +4616,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv @Override public void triggerCorrectiveActions(String deviceIdentifier, String featureCode, List actions, - List configList) throws DeviceManagementException, DeviceNotFoundException { + List configList) throws DeviceManagementException, DeviceNotFoundException { if (log.isDebugEnabled()) { log.debug("Triggering Corrective action. Device Identifier: " + deviceIdentifier); } @@ -4570,10 +4697,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public License getLicenseConfig (String deviceTypeName) throws DeviceManagementException { + public License getLicenseConfig(String deviceTypeName) throws DeviceManagementException { DeviceManagementService deviceManagementService = pluginRepository.getDeviceManagementService(deviceTypeName, - this.getTenantId()); + this.getTenantId()); if (deviceManagementService == null) { String msg = "Device management service loading is failed for the device type: " + deviceTypeName; log.error(msg); From f86617a264862d713d96fb68ddd605d1a87d0413 Mon Sep 17 00:00:00 2001 From: osh Date: Thu, 7 Apr 2022 09:42:35 +0530 Subject: [PATCH 6/6] Add the sql files fixes https://gitlab.com/entgra/product-iots/-/issues/1226 --- .../mgt/core/DeviceManagementConstants.java | 1 + .../DeviceManagementProviderServiceImpl.java | 36 ++++++++++--------- .../src/main/resources/conf/mdm-ui-config.xml | 10 +++--- .../src/main/resources/dbscripts/cdm/h2.sql | 12 +++++++ .../main/resources/dbscripts/cdm/mssql.sql | 13 +++++++ .../main/resources/dbscripts/cdm/mysql.sql | 12 +++++++ .../main/resources/dbscripts/cdm/oracle.sql | 14 ++++++++ .../resources/dbscripts/cdm/postgresql.sql | 12 +++++++ 8 files changed, 90 insertions(+), 20 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java index 884fdfa1ca..8e03917f55 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java @@ -45,6 +45,7 @@ public final class DeviceManagementConstants { public static final String API_RESOURCE_PERMISSION_CACHE = "API_RESOURCE_CACHE_CACHE"; public static final String GEOFENCE_CACHE = "GEOFENCE_CACHE"; public static final String META_KEY = "PER_DEVICE_COST"; + public static final String ACTIVE_STATUS = "ACTIVE"; public static final String ENROLLMENT_NOTIFICATION_API_ENDPOINT = "/api/device-mgt/enrollment-notification"; public static final String URL_SEPERATOR = "/"; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index b92ab55400..d9bb601fae 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -129,6 +129,7 @@ import org.wso2.carbon.email.sender.core.service.EmailSenderService; import org.wso2.carbon.stratos.common.beans.TenantInfoBean; import org.wso2.carbon.tenant.mgt.services.TenantMgtAdminService; import org.wso2.carbon.user.api.UserStoreException; +import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -946,7 +947,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv PaginationResult paginationResult = new PaginationResult(); double totalCost = 0.0; boolean allDevicesBilledDateIsValid = true; - String lastBilledDates = ""; ArrayList lastBilledDatesList = new ArrayList<>(); List invalidDevices = new ArrayList<>(); List removeBillingPeriodInvalidDevices = new ArrayList<>() ; @@ -954,7 +954,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv try { MetadataManagementDAOFactory.beginTransaction(); - Metadata metadata = metadataDAO.getMetadata(-1234, DeviceManagementConstants.META_KEY); + Metadata metadata = metadataDAO.getMetadata(MultitenantConstants.SUPER_TENANT_ID, DeviceManagementConstants.META_KEY); Gson g = new Gson(); Collection costData = null; @@ -970,7 +970,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv long dateDiff = 0; List deviceStatus = device.getDeviceStatusInfo(); - boolean lastBilledDate = false; + boolean firstDateBilled = false; boolean deviceStatusIsValid = false; List deviceBilling = billingDAO.getBilling(device.getId(), startDate, endDate); @@ -992,10 +992,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv if (!billDateIsInvalid) { for (int i = 0; i < deviceStatus.size(); i++) { - if (deviceStatus.get(i).getStatus().toString().equals("ACTIVE")) { + if (DeviceManagementConstants.ACTIVE_STATUS.equals(deviceStatus.get(i).getStatus().toString())) { if (deviceStatus.size() > i + 1) { - if (!lastBilledDate) { - lastBilledDate = true; + if (!firstDateBilled) { + firstDateBilled = true; if (device.getEnrolmentInfo().getLastBilledDate() == 0) { deviceStatusIsValid = true; dateDiff = dateDiff + (deviceStatus.get(i + 1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); @@ -1011,11 +1011,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv dateDiff = dateDiff + (deviceStatus.get(i + 1).getUpdateTime().getTime() - deviceStatus.get(i).getUpdateTime().getTime()); } } - } else { // The last status update calculation is done in this block + } else { + // If only one status row is retrieved this block is executed - if (!lastBilledDate) { - lastBilledDate = true; - // Is executed if there is no lastBilled date and if the updates time is before the enddate + if (!firstDateBilled) { + firstDateBilled = true; + + // Is executed if there is no lastBilled date and if the updates time is before the end date if (device.getEnrolmentInfo().getLastBilledDate() == 0) { if (endDate.getTime() >= deviceStatus.get(i).getUpdateTime().getTime()) { deviceStatusIsValid = true; @@ -1066,11 +1068,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv if (device.getEnrolmentInfo().getLastBilledDate() != 0) { Date date = new Date(device.getEnrolmentInfo().getLastBilledDate()); Format format = new SimpleDateFormat("yyyy MM dd"); - if (!lastBilledDatesList.contains(lastBilledDatesList.add(format.format(date)))) { - lastBilledDatesList.add(format.format(date)); - } - lastBilledDates = lastBilledDates + ' ' + lastBilledDatesList; + for (String lastBillDate : lastBilledDatesList) { + if (!lastBillDate.equals(format.format(date))) { + lastBilledDatesList.add(format.format(date)); + } + } } removeBillingPeriodInvalidDevices.add(device); } @@ -1098,14 +1101,15 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv if(!removeBillingPeriodInvalidDevices.isEmpty() && removeBillingPeriodInvalidDevices.size() == allDevices.size()) { allDevicesBilledDateIsValid = false; - paginationResult.setMessage("Invalid bill period last billed dates of devices are " +lastBilledDates); + paginationResult.setMessage("Invalid bill period."); } if(!removeStatusUpdateInvalidDevices.isEmpty() && removeStatusUpdateInvalidDevices.size() == allDevices.size()) { allDevicesBilledDateIsValid = false; if (paginationResult.getMessage() != null){ paginationResult.setMessage(paginationResult.getMessage() + " and no device updates within entered bill period."); } else { - paginationResult.setMessage("Devices have not been updated within the given period or entered end date comes before the last billed date"); + paginationResult.setMessage("Devices have not been updated within the given period or entered end date comes before the " + + "last billed date."); } } diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml index 3143511d1a..1d13cea4d7 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml @@ -25,10 +25,12 @@ 10000 - true - true - true - true + false + false + false + false + false + true diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql index 6372b87e16..c03341d478 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql @@ -52,6 +52,17 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE ( CONSTRAINT uk_DM_DEVICE UNIQUE (NAME, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, TENANT_ID) ); +CREATE TABLE IF NOT EXISTS DM_BILLING ( + INVOICE_ID INTEGER auto_increment NOT NULL, + TENANT_ID INTEGER default 0, + DEVICE_ID INT default NULL, + BILLING_START TIMESTAMP not null, + BILLING_END TIMESTAMP not null, + PRIMARY KEY (INVOICE_ID), + CONSTRAINT FK_DM_BILLING_DM_DEVICE + FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) +); + CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES ( DEVICE_TYPE_NAME VARCHAR(300) NOT NULL, DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL, @@ -103,6 +114,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT ( DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL, DATE_OF_LAST_UPDATE TIMESTAMP DEFAULT NULL, TENANT_ID INT NOT NULL, + LAST_BILLED_DATE BIGINT DEFAULT 0, PRIMARY KEY (ID), CONSTRAINT fk_dm_device_enrolment FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION, diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql index bd301d6641..4dc0bba047 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql @@ -66,6 +66,18 @@ CREATE TABLE DM_DEVICE ( REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION ); +IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_BILLING]') AND TYPE IN (N'U')) +CREATE TABLE DM_BILLING ( + INVOICE_ID INTEGER IDENTITY(1,1) NOT NULL, + TENANT_ID INTEGER DEFAULT 0, + DEVICE_ID INTEGER DEFAULT NULL, + BILLING_START DATETIME2 NOT NULL, + BILLING_END DATETIME2 NOT NULL, + PRIMARY KEY (INVOICE_ID), + CONSTRAINT FK_DM_BILLING_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +); + IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_PROPERTIES]') AND TYPE IN (N'U')) CREATE TABLE DM_DEVICE_PROPERTIES ( DEVICE_TYPE_NAME VARCHAR(300) NOT NULL, @@ -146,6 +158,7 @@ CREATE TABLE DM_ENROLMENT ( DATE_OF_ENROLMENT DATETIME2 DEFAULT NULL, DATE_OF_LAST_UPDATE DATETIME2 DEFAULT NULL, TENANT_ID INTEGER NOT NULL, + LAST_BILLED_DATE BIGINT DEFAULT 0, PRIMARY KEY (ID), CONSTRAINT FK_DM_DEVICE_ENROLMENT FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql index b191a177b7..d967f50e63 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql @@ -59,6 +59,17 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE ( REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION )ENGINE = InnoDB; +CREATE TABLE IF NOT EXISTS DM_BILLING ( + INVOICE_ID INTEGER AUTO_INCREMENT NOT NULL, + TENANT_ID INTEGER DEFAULT 0, + DEVICE_ID INTEGER DEFAULT NULL, + BILLING_START TIMESTAMP NOT NULL, + BILLING_END TIMESTAMP NOT NULL, + PRIMARY KEY (INVOICE_ID), + CONSTRAINT fk_DM_BILLING_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION +)ENGINE = InnoDB; + CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); CREATE INDEX IDX_DM_DEVICE_TYPE_ID_DEVICE_IDENTIFICATION ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID,DEVICE_IDENTIFICATION); @@ -118,6 +129,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT ( DATE_OF_ENROLMENT TIMESTAMP NULL DEFAULT NULL, DATE_OF_LAST_UPDATE TIMESTAMP NULL DEFAULT NULL, TENANT_ID INT NOT NULL, + LAST_BILLED_DATE BIGINT DEFAULT 0, PRIMARY KEY (ID), CONSTRAINT FK_DM_DEVICE_ENROLMENT FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql index 878d609543..7059538ce5 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql @@ -124,6 +124,19 @@ WHEN (NEW.ID IS NULL) END; / +CREATE TABLE DM_BILLING ( + INVOICE_ID NUMBER(10) NOT NULL, + TENANT_ID NUMBER(10) DEFAULT 0, + DEVICE_ID NUMBER(10) DEFAULT NULL, + BILLING_START TIMESTAMP NOT NULL, + BILLING_END TIMESTAMP NOT NULL, + CONSTRAINT PK_DM_BILLING PRIMARY KEY (INVOICE_ID), + CONSTRAINT fk_DM_BILLING_DM_DEVICE2 + FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) +) +/ + CREATE TABLE DM_DEVICE_PROPERTIES ( DEVICE_TYPE_NAME VARCHAR2(300) NOT NULL, DEVICE_IDENTIFICATION VARCHAR2(300) NOT NULL, @@ -208,6 +221,7 @@ CREATE TABLE DM_ENROLMENT ( DATE_OF_ENROLMENT TIMESTAMP(0) DEFAULT NULL, DATE_OF_LAST_UPDATE TIMESTAMP(0) DEFAULT NULL, TENANT_ID NUMBER(10) NOT NULL, + LAST_BILLED_DATE BIGINT DEFAULT 0, CONSTRAINT PK_DM_ENROLMENT PRIMARY KEY (ID), CONSTRAINT FK_DM_DEVICE_ENROLMENT FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql index a9f08b45f8..978cc7344d 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql +++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql @@ -57,6 +57,17 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE ( REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION ); +CREATE TABLE IF NOT EXISTS DM_BILLING ( + INVOICE_ID INTEGER DEFAULT NEXTVAL ('DM_BILLING_seq') NOT NULL, + TENANT_ID INTEGER DEFAULT 0, + DEVICE_ID INTEGER DEFAULT NULL, + BILLING_START TIMESTAMP(0) NOT NULL, + BILLING_END TIMESTAMP(0) NOT NULL, + PRIMARY KEY (INVOICE_ID), + CONSTRAINT fk_DM_BILLING_DM_DEVICE2 FOREIGN KEY (DEVICE_ID) + REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION + ); + CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); CREATE INDEX IDX_DM_DEVICE_TYPE_ID_DEVICE_IDENTIFICATION ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID,DEVICE_IDENTIFICATION); @@ -116,6 +127,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT ( DATE_OF_ENROLMENT TIMESTAMP(0) NULL DEFAULT NULL, DATE_OF_LAST_UPDATE TIMESTAMP(0) NULL DEFAULT NULL, TENANT_ID INTEGER NOT NULL, + LAST_BILLED_DATE BIGINT DEFAULT 0, PRIMARY KEY (ID), CONSTRAINT FK_DM_DEVICE_ENROLMENT FOREIGN KEY (DEVICE_ID) REFERENCES DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION