Feature ussd sms

.gitignore

@@ -22,5 +22,5 @@ target
 *.ipr
 .idea
 log
-dep-sanbox/log
+dep-sanbox/log/
 

dep-sandbox/src/main/java/com/wso2telco/services/dep/sandbox/dao/LoggingDAO.java

@@ -12,5 +12,7 @@ public interface LoggingDAO {
 	public int saveMessageLog(MessageLog messageLog) throws Exception;
 
 	public List<MessageLog> getMessageLogs(int userid, List<Integer> serviceNameIds, String reference, String value, Date startTimeStamp, Date endTimeStamp) throws Exception;
-
+
+	public List<MessageLog> getResponseLists(int userid, List<Integer> serviceNameIds, String reference, String value, Date startTimeStamp, Date endTimeStamp, int offSet, int limit, int type) throws Exception;
+
 }

dep-sandbox/src/main/java/com/wso2telco/services/dep/sandbox/dao/hibernate/HibernateLoggingDao.java

@@ -109,4 +109,90 @@ public List<MessageLog> getMessageLogs(int userid, List<Integer> serviceNameIds,
 		}
 	}
 
+	@Override
+	public List<MessageLog> getResponseLists(int userid, List<Integer> serviceNameIds,
+											 String ref, String val, Date startTimeStamp, Date endTimeStamp, int offSet, int limit, int type) throws Exception {
+		Session session = getSession();
+		Map<String, Object> parameterMap = new HashMap<String, Object>();
+		List<MessageLog> messageLogs = new ArrayList<MessageLog>();
+		String reference = CommonUtil.getNullOrTrimmedValue(ref);
+		String value = CommonUtil.getNullOrTrimmedValue(val);
+		try {
+			StringBuilder hqlQueryBuilder = new StringBuilder();
+			hqlQueryBuilder.append("from MessageLog ml ");
+			hqlQueryBuilder.append("where  1=1 ");
+
+			if(userid != 0){
+				hqlQueryBuilder.append(" AND ml.userid = :id");
+				parameterMap.put("id", userid);
+
+			}
+
+			if(serviceNameIds != null){
+				hqlQueryBuilder.append(" AND ml.servicenameid in (:servicenameidList)");
+				parameterMap.put("servicenameidList", serviceNameIds);
+			}
+
+			if(reference != null && value != null){
+				hqlQueryBuilder.append(" AND ml.reference = :reference AND ml.value = :value");
+				parameterMap.put("reference", reference);
+				parameterMap.put("value", value);
+			}
+
+			if (type != 0) {
+				hqlQueryBuilder.append(" AND ml.type = :type");
+				parameterMap.put("type", type);
+			}
+
+			if(startTimeStamp != null && endTimeStamp != null){
+				hqlQueryBuilder.append(" AND ml.messageTimestamp between :startTimeStamp and :endTimeStamp");
+				parameterMap.put("startTimeStamp", startTimeStamp);
+				parameterMap.put("endTimeStamp", endTimeStamp);
+
+			}else if(startTimeStamp != null){
+				hqlQueryBuilder.append("  AND ml.messageTimestamp >= :startTimeStamp");
+				parameterMap.put("startTimeStamp", startTimeStamp);
+				if(endTimeStamp != null){
+					hqlQueryBuilder.append(" AND ml.messageTimestamp <= :endTimeStamp");
+					parameterMap.put("endTimeStamp", endTimeStamp);
+				}
+			}else if(endTimeStamp != null){
+				hqlQueryBuilder.append(" AND ml.messageTimestamp <= :endTimeStamp");
+				parameterMap.put("endTimeStamp", endTimeStamp);
+			}
+
+			Query query = session.createQuery(hqlQueryBuilder.toString());
+
+			if (offSet > 0) {
+				query.setFirstResult(offSet-1);
+			}
+
+			if (limit > 0) {
+				query.setMaxResults(limit);
+			}
+
+			Set<Entry<String, Object>> entrySet = parameterMap.entrySet();
+
+			for (Entry<String, Object> entry : entrySet) {
+				if(entry.getValue() instanceof  List ){
+					query.setParameterList(entry.getKey(), (List)entry.getValue());
+				}else{
+					query.setParameter(entry.getKey(), entry.getValue());
+				}
+
+			}
+
+			messageLogs = (List<MessageLog>) query.getResultList();
+
+		} catch (Exception ex) {
+			LOG.error("Error in getMessageLogs " , ex);
+			throw ex;
+		}
+		if (messageLogs==null){
+			return Collections.emptyList();
+		}else{
+			return messageLogs;
+		}
+	}
+
 }

dep-sandbox/src/main/java/com/wso2telco/services/dep/sandbox/service/PaymentService_v1_3.java

@@ -124,11 +124,15 @@ public Response makePayment(
             @ApiImplicitParam(name = "sandbox", value = "Authorization token", required = true, dataType = "string", paramType = "header")})
     public Response getAttributeServices(
             @ApiParam(value = "endUserId", required = false) @PathParam("endUserId") String endUserId,
+            @ApiParam(value = "offset", required = false) @QueryParam("offset") String offSet,
+            @ApiParam(value = "limit", required = false) @QueryParam("limit") String limit,
             @Context HttpServletRequest request) {
-        LOG.debug("/{endUserId}/transactions invorked :" + endUserId);
+        LOG.debug("/{endUserId}/transactions invorked :" + endUserId + offSet + limit);
         PaymentListTransactionRequestWrapper requestDTO = new PaymentListTransactionRequestWrapper();
         requestDTO.setHttpRequest(request);
         requestDTO.setEndUserId(endUserId);
+        requestDTO.setOffSet(offSet);
+        requestDTO.setLimit(limit);
         requestDTO.setRequestType(RequestType.PAYMENT);
 
         RequestHandleable handler = RequestBuilderFactory.getInstance(requestDTO);

dep-sandbox/src/main/java/com/wso2telco/services/dep/sandbox/servicefactory/payment/PaymentListTransactionRequestHandler.java

@@ -74,10 +74,15 @@ protected List<String> getAddress() {
     protected boolean validate(PaymentListTransactionRequestWrapper wrapperDTO) throws Exception {
 
         String endUserId = CommonUtil.getNullOrTrimmedValue(wrapperDTO.getEndUserId());
-
+        String offset = CommonUtil.getNullOrTrimmedValue(wrapperDTO.getOffSet());
+        String limit = CommonUtil.getNullOrTrimmedValue(wrapperDTO.getLimit());
         try {
-            ValidationRule[] validationRules = {new ValidationRule(
-                    ValidationRule.VALIDATION_TYPE_MANDATORY_TEL_END_USER_ID, "endUserId", endUserId)};
+            ValidationRule[] validationRules = {
+                    new ValidationRule(ValidationRule.VALIDATION_TYPE_MANDATORY_TEL_END_USER_ID, "endUserId", endUserId),
+                    new ValidationRule(ValidationRule.VALIDATION_TYPE_OPTIONAL_INT_GE_ZERO, "offset", offset ),
+                    new ValidationRule(ValidationRule.VALIDATION_TYPE_OPTIONAL_INT_GE_ZERO, "limit", limit)
+            };
+
 
             Validation.checkRequestParams(validationRules);
         } catch (CustomException ex) {
@@ -103,6 +108,10 @@ protected Returnable process(PaymentListTransactionRequestWrapper extendedReques
             String msisdn = extendedRequestDTO.getEndUserId();
             String endUserId = getLastMobileNumber(msisdn);
             Integer userId = extendedRequestDTO.getUser().getId();
+            Integer offset = CommonUtil
+                    .convertStringToInteger(extendedRequestDTO.getOffSet());
+            Integer limit = CommonUtil
+                    .convertStringToInteger(extendedRequestDTO.getLimit());
 
             String serviceCallPayment = ServiceName.ChargeUser.toString();
             String serviceCallRefund = ServiceName.RefundUser.toString();
@@ -119,11 +128,11 @@ protected Returnable process(PaymentListTransactionRequestWrapper extendedReques
 
             JSONObject object = new JSONObject();
             object.put("endUserId", msisdn);
-
+            int type = MessageType.Response.getValue();
 
             PaymentListTransactionResponseBean paymentTransaction = new PaymentListTransactionResponseBean();
             List<JsonNode> listNodes = new ArrayList<JsonNode>();
-            List<MessageLog> responses = loggingDAO.getMessageLogs(userId, list, "msisdn", "tel:+" + endUserId, null, null);
+            List<MessageLog> responses = loggingDAO.getResponseLists(userId, list, "msisdn", "tel:+" + endUserId, null, null, offset, limit, type);
 
             String jsonString = null;
 

dep-sandbox/src/main/java/com/wso2telco/services/dep/sandbox/servicefactory/payment/PaymentListTransactionRequestWrapper.java

@@ -21,6 +21,10 @@ public class PaymentListTransactionRequestWrapper extends RequestDTO {
 
 	private String endUserId;
 
+	private String offSet;
+
+	private String limit;
+
 	public String getEndUserId() {
 		return endUserId;
 	}
@@ -29,4 +33,19 @@ public void setEndUserId(String endUserId) {
 		this.endUserId = endUserId;
 	}
 
+	public String getOffSet() {
+		return offSet;
+	}
+
+	public void setOffSet(String offSet) {
+		this.offSet = offSet;
+	}
+
+	public String getLimit() {
+		return limit;
+	}
+
+	public void setLimit(String limit) {
+		this.limit = limit;
+	}
 }