Remove unused class / added locked validation

GabonTelMobicashMobileAppHelper/.checkstyle

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false"/>

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/GetMobileAppExternalData.java

@@ -1,64 +0,0 @@
-package com.psi.gabontel.mobileapp.helper;
-
-import java.util.Map;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-
-import com.psi.applicationmanager.AppManagerFunction;
-import com.psi.applicationmanager.AppMessage;
-import com.psi.common.transactions.Message;
-import com.psi.common.transactions.MessageId;
-import com.psi.common.transactions.Messanger;
-
-@Stateless
-@Remote(AppManagerFunction.class)
-public class GetMobileAppExternalData implements AppManagerFunction {
-	
-	private static final Logger log = Logger.getLogger(GetMobileAppExternalData.class);
-	
-	@EJB(mappedName="java:module/GetMobileAppMsisdnDetails")
-	AppManagerFunction msisdndetails;
-	
-	@EJB(mappedName="java:module/GetOcsPackages")
-	AppManagerFunction ocspackage;
-	
-	@EJB(mappedName="java:module/GetSatconPackages")
-	AppManagerFunction satconpackage;
-	
-	@Override
-	public String processTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		return manageTransaction(refid, msisdn, message, syntax).getMessage();
-	}
-	
-
-	@Override
-	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		// TODO Auto-generated method stub
-		
-		String method  =  syntax.get("method");
-		Message msg = Messanger.getMessage(MessageId.SYSTEM_BUSY, msisdn, "<refid>", refid);
-		
-		try {
-			switch(method) {
-			case "GETMSISDNDETAILS":
-			    msg=  (Message) msisdndetails.manageTransaction(refid, msisdn, message, syntax);
-			    break;
-			case "GETOCSPACKAGE":
-				msg=  (Message) ocspackage.manageTransaction(refid, msisdn, message, syntax);
-				break;
-			case "GETSATCONPACKAGE":
-				msg=  (Message) satconpackage.manageTransaction(refid, msisdn, message, syntax);
-				break;
-			}
-		}catch(Exception e){
-				log.error("Awts Error tanong mo kay sherwin",e);
-		}
-		
-		return msg;
-		
-	}
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/GetMobileAppMsisdnDetails.java

@@ -1,32 +0,0 @@
-package com.psi.gabontel.mobileapp.helper;
-
-import java.util.Map;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import com.psi.applicationmanager.AppManagerFunction;
-import com.psi.applicationmanager.AppMessage;
-import com.psi.common.transactions.Message;
-import com.psi.gabontel.mobileapp.helper.objects.MsisdnDetails;
-
-
-
-@Stateless
-@Remote(AppManagerFunction.class)
-public class GetMobileAppMsisdnDetails implements AppManagerFunction  {
-	@Override
-	public String processTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		return manageTransaction(refid, msisdn, message, syntax).getMessage();
-	}
-	
-
-	@Override
-	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {	
-		
-		String  detailkey = syntax.get("externaldata");	
-		return new Message(0, 0,  MsisdnDetails.get(msisdn, detailkey));
-		
-	}
-
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/GetOcsPackages.java

@@ -1,59 +0,0 @@
-package com.psi.gabontel.mobileapp.helper;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-import org.json.simple.JSONValue;
-
-import com.psi.applicationmanager.AppManagerFunction;
-import com.psi.applicationmanager.AppMessage;
-import com.psi.common.transactions.Message;
-
-import com.psi.gabontel.mobileapp.helper.objects.MsisdnDetails;
-import com.psi.gabontel.mobileapp.helper.objects.OcsPackages;
-import com.psi.gabontel.mobileapp.helper.objects.OcsPackages.Package;
-
-@Stateless
-@Remote(AppManagerFunction.class)
-public class GetOcsPackages implements AppManagerFunction {
-
-	private static final Logger log = Logger.getLogger(GetOcsPackages.class);
-
-	@Override
-	public String processTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		return manageTransaction(refid, msisdn, message, syntax).getMessage();
-	}
-
-	@Override
-	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-
-		try {
-
-			LinkedHashMap<String, ArrayList<Package>> jsondata = null;
-			if (msisdn.startsWith("24105")) {
-				jsondata = OcsPackages.getPackages().get("MOOV");
-			} else if (msisdn.startsWith("24106")) {
-				jsondata = OcsPackages.getPackages().get("LIBERTIES");
-			}
-
-			StringWriter out = new StringWriter();
-			JSONValue.writeJSONString(jsondata, out);
-			out.toString();
-
-			return new Message(0, 0, out.toString());
-		} catch (Exception e) {
-			log.error("Awts Error", e);
-			// TODO: handle exception
-		}
-
-		return new Message(0, 0, "{}");
-
-	}
-
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/GetSatconPackages.java

@@ -1,54 +0,0 @@
-package com.psi.gabontel.mobileapp.helper;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.logging.Logger;
-import org.json.simple.JSONValue;
-
-import com.psi.applicationmanager.AppManagerFunction;
-import com.psi.applicationmanager.AppMessage;
-import com.psi.common.transactions.Message;
-import com.psi.gabontel.mobileapp.helper.objects.SatconPackages.Package;
-
-import com.psi.gabontel.mobileapp.helper.objects.SatconPackages;
-
-@Stateless
-@Remote(AppManagerFunction.class)
-public class GetSatconPackages implements AppManagerFunction {
-
-	private static final Logger log = Logger.getLogger(GetSatconPackages.class);
-
-	@Override
-	public String processTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-		return manageTransaction(refid, msisdn, message, syntax).getMessage();
-	}
-
-	@Override
-	public AppMessage manageTransaction(String refid, String msisdn, String message, Map<String, String> syntax) {
-
-		try {
-			ArrayList<Package> jsondata = null;
-
-			jsondata = SatconPackages.getPackages();
-
-			StringWriter out = new StringWriter();
-			JSONValue.writeJSONString(jsondata, out);
-			out.toString();
-
-			return new Message(0, 0, out.toString());
-
-		} catch (Exception e) {
-			log.error("Awts Error", e);
-		}
-
-		return new Message(0, 0, "{}");
-
-	}
-
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/MobileTransactionHandler.java

@@ -44,15 +44,19 @@ public class MobileTransactionHandler implements AppManagerFunction {
                 ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.INACTIVE_ERROR, originator).getMessage();
                 return new Message(0,0,ret);
             }
-            if(!validate.isValidVersion(version)) {
-                ret = key + ":98:" + refid + ":La version n'est pas mise a jour";
+            if("YES".equalsIgnoreCase(originator.getProperty("LOCKED"))) {
+                ret = key + ":99:" + refid + ":" + Messanger.getMessage(MessageId.LOCKED_ERROR, originator).getMessage();
                 return new Message(0,0,ret);
             }
             if(!validate.isValidTransaction(type, originator.getProperty(McomSubscriber.PROP_TYPE))) {
                 ret = key + ":97:" + refid + ":Vous n'etes pas autorise";
                 return new Message(0,0,ret);
             }
-            ret = key + ":0:" + refid + ":Procéder";
+            if(!validate.isValidVersion(type, originator.getProperty(McomSubscriber.PROP_TYPE),version)) {
+                ret = key + ":98:" + refid + ":La version de l'application n'est pas mise a jour. S'il vous plaît aller a playstore et mettre a jour";
+                return new Message(0,0,ret);
+            }
+            ret = key + ":0:" + refid + ":Proceder";
             return new Message(0,0,ret);
         }catch (Exception e) {
             log.error("MobileHandler : error" + msisdn, e);

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/ValidateMobileTransaction.java

@@ -13,8 +13,8 @@ public class ValidateMobileTransaction {
         return false;
     }
     
-    public boolean isValidVersion(String version) {
-        String row = db.QueryScalar("SELECT MVERSION FROM TBLSYSTEMINFO","0");
+    public boolean isValidVersion(String type, String accounttype, String version) {
+        String row = db.QueryScalar("SELECT VERSION FROM TBLMOBILEALLOWEDTYPE WHERE STATUS = 1 AND MEDIUM = ? AND ACCTTYPE = ? AND VERSION = ?","0",type, accounttype, version);
         if(row.equals(version)) {
             return true;
         }

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/objects/MsisdnDetails.java

@@ -1,17 +0,0 @@
-package com.psi.gabontel.mobileapp.helper.objects;
-
-import com.psi.common.db.DbWrapper;
-
-public class MsisdnDetails {
-		
-	private static DbWrapper ussddb = null;
-	
-	static {
-		ussddb = new DbWrapper("java:jboss/datasources/UssdDbClient");
-	}
-	
-	public static String get(String msisdn,String key) {
-			return ussddb.QueryScalar("SELECT VALUE FROM TBLMSISDNDETAILS WHERE MSISDN = ? AND KEY = ?", "{}", msisdn,key);
-	}
-	
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/objects/OcsPackages.java

@@ -1,138 +0,0 @@
-package com.psi.gabontel.mobileapp.helper.objects;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-
-import org.json.simple.JSONObject;
-
-import com.psi.common.db.DataRow;
-import com.psi.common.db.DataRowCollection;
-import com.psi.common.db.DbWrapper;
-
-
-public class OcsPackages {
-	
-	public static LinkedHashMap<String, LinkedHashMap<String, ArrayList<Package>>> getPackages() {
-		return packages;
-	}
-	
-
-
-	
-	private static DbWrapper db  = DbWrapper.getInstance();
-	private static LinkedHashMap<String,LinkedHashMap<String,ArrayList<Package>>> packages;
-
-	static {
-		packages = new LinkedHashMap<String,LinkedHashMap<String,ArrayList<Package>>>();
-		
-		DataRowCollection rows = db.QueryDataRows("SELECT BUNDLEID,BUNDLENAME,PRICEFR / 100 as PRICEFR ,DESCRIPTION FROM TBLAIRBUNDLE WHERE STATUS = 1 AND (BUNDLENAME LIKE 'L%' OR BUNDLENAME LIKE 'M%') ORDER BY BUNDLENAME ASC,PRICEFR ASC ");
-		
-		Iterator<DataRow> iterator = rows.iterator();
-		while(iterator.hasNext()) {
-			DataRow row = iterator.next();
-			
-			String bundlekey = row.getString("BUNDLENAME");
-			
-			Package pckge = new Package();
-			pckge.setBundleId(row.getString("BUNDLEID"));
-			pckge.setBundlename(row.getString("BUNDLENAME"));
-			pckge.setDescription(row.getString("DESCRIPTION"));
-			pckge.setPrice(row.getString("PRICEFR"));
-			
-			
-			if(bundlekey.startsWith("L")) {
-				
-				if(packages.containsKey("LIBERTIES")) {
-					LinkedHashMap<String, ArrayList<Package>> network =  packages.get("LIBERTIES");
-						if(!network.containsKey(bundlekey)) {
-							ArrayList<Package> pckges = new ArrayList<Package>();
-							pckges.add(pckge);
-							network.put(bundlekey, pckges);
-						}else {
-							network.get(bundlekey).add(pckge);
-						}
-				}else {
-					ArrayList<Package> pckges = new ArrayList<Package>();
-					pckges.add(pckge);
-					LinkedHashMap<String, ArrayList<Package>> network = new LinkedHashMap<String, ArrayList<Package>>();
-					network.put(bundlekey, pckges);
-					packages.put("LIBERTIES", network);
-				}
-				
-				
-			}else if(bundlekey.startsWith("M")) {
-				if(packages.containsKey("MOOV")) {
-					LinkedHashMap<String, ArrayList<Package>> network =  packages.get("MOOV");
-					if(!network.containsKey(bundlekey)) {
-						ArrayList<Package> pckges = new ArrayList<Package>();
-						pckges.add(pckge);
-						network.put(bundlekey, pckges);
-					}else {
-						network.get(bundlekey).add(pckge);
-					}
-				}else {
-					ArrayList<Package> pckges = new ArrayList<Package>();
-					pckges.add(pckge);
-					LinkedHashMap<String, ArrayList<Package>> network = new LinkedHashMap<String, ArrayList<Package>>();
-					network.put(bundlekey, pckges);
-					packages.put("MOOV", network);
-				}
-				
-			}
-			
-		}
-		
-		
-		
-		
-	}
-	
-	
-	
-	
-	
-	public static class Package{
-		private String bundleName;
-		private String bundleId;
-		private String price;
-		private  String description;
-	
-		public String getBundlename() {
-			return bundleName;
-		}
-		public void setBundlename(String bundlename) {
-			this.bundleName = bundlename;
-		}
-		public String getBundleId() {
-			return bundleId;
-		}
-		public void setBundleId(String bundleId) {
-			this.bundleId = bundleId;
-		}
-		public String getPrice() {
-			return price;
-		}
-		public void setPrice(String price) {
-			this.price = price;
-		}
-		public String getDescription() {
-			return description;
-		}
-		public void setDescription(String description) {
-			this.description = description;
-		}
-		
-		public String toString () {
-			JSONObject obj = new JSONObject();
-			obj.put("bundleName", this.bundleName);
-			obj.put("bundleId", this.bundleId);
-			obj.put("price", this.price);
-			obj.put("description", this.description);
-			return obj.toJSONString();			
-		}
-		
-		
-	}
-	
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/helper/objects/SatconPackages.java

@@ -1,86 +0,0 @@
-package com.psi.gabontel.mobileapp.helper.objects;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-
-import org.json.simple.JSONObject;
-
-import com.psi.common.db.DataRow;
-import com.psi.common.db.DataRowCollection;
-import com.psi.common.db.DbWrapper;
-import com.psi.gabontel.mobileapp.helper.objects.OcsPackages.Package;
-
-public class SatconPackages {
-	
-	private static DbWrapper db  = DbWrapper.getInstance();
-
-	
-	private static ArrayList<Package> packages;
-	
-	public static ArrayList<Package> getPackages() {
-		return packages;
-	}
-
-
-	static {
-		
-		packages = new ArrayList<Package>();
-		
-		DataRowCollection rows = db.QueryDataRows("SELECT PACKAGECODE,PACKAGENUMBER,PACKAGEPRICE/100 as PACKAGEPRICE,LABEL FROM TBLPACKAGESSATCON WHERE STATUS  = 1 ORDER BY ID ASC");
-		
-		Iterator<DataRow> iterator = rows.iterator();
-		while(iterator.hasNext()) {
-			DataRow row = iterator.next();
-			Package pckge = new Package();
-			pckge.setLabel(row.getString("LABEL"));
-			pckge.setPackagecode(row.getString("PACKAGECODE"));
-			pckge.setPackagenumber(row.getString("PACKAGENUMBER"));
-			pckge.setPackageprice(row.getString("PACKAGEPRICE"));
-			packages.add(pckge);
-		}
-	}
-	
-	public static class Package {
-		
-		private String packagecode;
-		private String packageprice;
-		private String packagenumber;
-		private String label;
-		public String getPackagecode() {
-			return packagecode;
-		}
-		public void setPackagecode(String packagecode) {
-			this.packagecode = packagecode;
-		}
-		public String getPackageprice() {
-			return packageprice;
-		}
-		public void setPackageprice(String packageprice) {
-			this.packageprice = packageprice;
-		}
-		public String getPackagenumber() {
-			return packagenumber;
-		}
-		public void setPackagenumber(String packagenumber) {
-			this.packagenumber = packagenumber;
-		}
-		public String getLabel() {
-			return label;
-		}
-		public void setLabel(String label) {
-			this.label = label;
-		}
-		
-		public String toString() {
-			JSONObject obj = new JSONObject();
-			obj.put("packagecode", this.packagecode);
-			obj.put("packageprice",this.packageprice);
-			obj.put("packagenumber", this.packagenumber);
-			obj.put("label",this.label);
-			
-			return obj.toJSONString();	
-		}
-		
-	}
-}

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/thirdparty/helper/InitializerBean.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
+import javax.ejb.ApplicationException;
+import javax.ejb.EJB;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
 import javax.naming.Context;

GabonTelMobicashMobileAppHelper/src/main/java/com/psi/gabontel/mobileapp/thirdparty/helper/MobileAppThirdPartyHelper.java

@@ -3,6 +3,7 @@ package com.psi.gabontel.mobileapp.thirdparty.helper;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
+import javax.ejb.ApplicationException;
 import javax.ejb.Remote;
 import javax.ejb.Stateless;
 
@@ -22,7 +23,7 @@ import com.psi.common.util.SystemUtil;
 
 @Stateless
 @Remote(AppManagerFunction.class)
-public class MobileAppThirdPartyHelper  implements AppManagerFunction {
+public class MobileAppThirdPartyHelper implements AppManagerFunction {
 	private static final Logger log = Logger.getLogger(MobileAppThirdPartyHelper.class);