Merge pull request #1996 from dangkhanhtrung/release-candidate-2.2

Update merge meta data

modules/backend-admin-config/backend-admin-config-service/src/main/java/backend/admin/config/whiteboard/RestAuthFilter.java

@@ -16,6 +16,8 @@
 
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.model.CompanyConstants;
 import com.liferay.portal.kernel.security.auth.AuthTokenUtil;
 import com.liferay.portal.kernel.security.auth.session.AuthenticatedSessionManagerUtil;
@@ -51,16 +53,17 @@
 		"url-pattern=/o/v1/opencps/users/*"
 		,
 		"url-pattern=/o/v1/opencps/login",
-		//"url-pattern=/o/rest/v2/*",
-		//"url-pattern=/o/rest/v2_1/*"
+		"url-pattern=/o/rest/v2/*",
+		"url-pattern=/o/rest/v2_1/*"
 	}, service = Filter.class
 )
 public class RestAuthFilter implements Filter {
-
+	Log _log = LogFactoryUtil.getLog(RestAuthFilter.class);
+
 	public final static String P_AUTH = "Token";
 	public final static String USER_ID = "USER_ID";
 	public final static String AUTHORIZATION = "Authorization";
-	public final static String[] IGNORE_PATTERN = new String[] { "/o/rest/v2/serviceinfos/\\w+/filetemplates/\\w+", "/o/rest/v2/barcode", "/o/rest/v2/qrcode", "/o/rest/v2/dossiers", "/o/rest/v2/dictcollections/GOVERNMENT_AGENCY/dictitems", "/o/rest/v2/dictcollections/SERVICE_DOMAIN/dictitems", "/o/rest/v2/serviceinfos", "/o/rest/v2/postal/votings/statistic", "/o/rest/v2/postal/invoice", "/o/rest/v2/sms/inet", "/o/rest/v2/sms/zaloid" };
+	public final static String[] IGNORE_PATTERN = new String[] { "/o/rest/v2/serviceinfos/\\w+/filetemplates/\\w+", "/o/rest/v2/barcode", "/o/rest/v2/qrcode", /*"/o/rest/v2/dossiers",*/ "/o/rest/v2/dictcollections/GOVERNMENT_AGENCY/dictitems", "/o/rest/v2/dictcollections/SERVICE_DOMAIN/dictitems", "/o/rest/v2/serviceinfos", "/o/rest/v2/postal/votings/statistic", "/o/rest/v2/postal/invoice", "/o/rest/v2/sms/inet", "/o/rest/v2/sms/zaloid" };
 	public final static String OPENCPS_GZIP_FILTER = "org.opencps.servlet.filters.GZipFilter";
 
 	public final static String[] DISALLOW_METHODS = new String[] { "OPTIONS" };
@@ -70,7 +73,7 @@ public void destroy() {
 	@Override
 	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
 			throws IOException, ServletException {
-//		System.out.println("RestAuthFilter.doFilter()");
+		_log.debug("RestAuthFilter.doFilter()");
 		HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
 
 		String pAuth = httpRequest.getHeader(P_AUTH);

modules/backend-api-rest/src/main/java/org/opencps/api/controller/impl/DossierFileManagementImpl.java

@@ -80,12 +80,19 @@ public Response getDossierFilesByDossierId(HttpServletRequest request, HttpHeade
 			Dossier dossier = DossierLocalServiceUtil.fetchDossier(id);
 			if (dossier != null && dossier.getOriginDossierId() == 0) {
 				List<DossierFile> dossierFiles = DossierFileLocalServiceUtil.getDossierFilesByDossierId(id);
-
+				if (dossier.getOriginality() == DossierTerm.ORIGINALITY_HOSONHOM) {
+					List<DossierFile> groupFiles = DossierFileLocalServiceUtil.getDossierFilesByDossierId(dossier.getGroupDossierId());
+					dossierFiles.addAll(groupFiles);
+				}
 				results.setTotal(dossierFiles.size());
 				results.getData().addAll(DossierFileUtils.mappingToDossierFileData(dossierFiles));
 			}
 			else if (dossier != null && dossier.getOriginDossierId() != 0) {
 				List<DossierFile> dossierFiles = DossierFileLocalServiceUtil.getDossierFilesByDossierId(dossier.getOriginDossierId());
+				if (dossier.getOriginality() == DossierTerm.ORIGINALITY_HOSONHOM) {
+					List<DossierFile> groupFiles = DossierFileLocalServiceUtil.getDossierFilesByDossierId(dossier.getGroupDossierId());
+					dossierFiles.addAll(groupFiles);
+				}
 
 				results.setTotal(dossierFiles.size());
 				results.getData().addAll(DossierFileUtils.mappingToDossierFileData(dossierFiles));

modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierDocumentUtils.java

@@ -29,6 +29,7 @@
 import org.opencps.dossiermgt.model.ServiceInfo;
 import org.opencps.dossiermgt.model.ServiceProcess;
 import org.opencps.dossiermgt.service.DossierFileLocalServiceUtil;
+import org.opencps.dossiermgt.service.DossierLocalServiceUtil;
 import org.opencps.dossiermgt.service.DossierMarkLocalServiceUtil;
 import org.opencps.dossiermgt.service.DossierPartLocalServiceUtil;
 import org.opencps.dossiermgt.service.PaymentFileLocalServiceUtil;
@@ -273,7 +274,38 @@ public static JSONObject processMergeDossierFormData(Dossier dossier, JSONObject
 			jsonData.put(PaymentFileTerm.SERVICE_AMOUNT, payment.getServiceAmount());
 			jsonData.put(PaymentFileTerm.SHIP_AMOUNT, payment.getShipAmount());
 		}
-
+
+		if (dossier.getOriginality() == DossierTerm.ORIGINALITY_HOSONHOM) {
+			JSONArray groupDossierArr = JSONFactoryUtil.createJSONArray();
+			List<Dossier> lstDossiers = DossierLocalServiceUtil.findByG_GDID(groupId, dossier.getDossierId());
+			for (Dossier d : lstDossiers) {
+				JSONObject dObject = JSONFactoryUtil.createJSONObject();
+				dObject.put(DossierTerm.DOSSIER_NO, d.getDossierNo());
+				dObject.put(DossierTerm.APPLICANT_NAME, d.getApplicantName());
+				dObject.put(DossierTerm.ADDRESS, d.getAddress());
+				dObject.put(DossierTerm.CONTACT_TEL_NO, d.getContactTelNo());
+				dObject.put(DossierTerm.CONTACT_EMAIL, d.getContactEmail());
+				dObject.put(DossierTerm.CONTACT_NAME, d.getContactName());
+				dObject.put(DossierTerm.DELEGATE_ADDRESS, d.getDelegateAddress());
+				dObject.put(DossierTerm.SERVICE_CODE, d.getServiceCode());
+				dObject.put(DossierTerm.SERVICE_NAME, d.getServiceName());
+				dObject.put(DossierTerm.SAMPLE_COUNT, d.getSampleCount());
+				dObject.put(DossierTerm.DURATION_UNIT, d.getDurationUnit());
+				dObject.put(DossierTerm.DURATION_COUNT, d.getDurationCount());
+				dObject.put(DossierTerm.SECRET_KEY, d.getPassword());
+				dObject.put(DossierTerm.RECEIVE_DATE,
+						APIDateTimeUtils.convertDateToString(d.getReceiveDate(), APIDateTimeUtils._NORMAL_PARTTERN));
+				dObject.put(DossierTerm.DELEGATE_NAME, d.getDelegateName());
+				dObject.put(DossierTerm.DELEGATE_EMAIL, d.getDelegateEmail());
+				dObject.put(DossierTerm.DELEGATE_TELNO, d.getDelegateTelNo());
+				dObject.put(DossierTerm.DOSSIER_NAME, d.getDossierName());
+				dObject.put(DossierTerm.VIA_POSTAL, d.getViaPostal());
+				dObject.put(DossierTerm.POSTAL_ADDRESS, d.getPostalAddress());
+
+				groupDossierArr.put(dObject);
+			}
+			jsonData.put(DossierTerm.GROUP_DOSSIERS, groupDossierArr);
+		}
 		return jsonData;
 	}
 	private static Log _log = LogFactoryUtil.getLog(DossierDocumentUtils.class);

modules/backend-api-rest/src/main/java/org/opencps/api/controller/util/DossierUtils.java

@@ -1268,6 +1268,7 @@ public static DossierInputModel convertFormModelToInputModel(org.opencps.api.dos
 		model.setPostalWardCode(input.getPostalWardCode());
 		model.setPostalWardName(input.getPostalWardName());
 		model.setOriginDossierNo(input.getOriginDossierNo());
+		model.setServerNo(input.getServerNo());
 		model.setMetaData(input.getMetaData());
 
 		return model;

modules/backend-api-rest/src/main/java/org/opencps/api/dossier/model/DossierInputModel.java

@@ -43,6 +43,7 @@
  *         <element name="contactEmail" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="password" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="online" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="serverNo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -112,6 +113,7 @@
 	"dossiers",
 	"payment",
 	"importing",
+	"serverNo",
 	"metaData"
 })
 @XmlRootElement(name = "DossierInputModel")
@@ -239,6 +241,9 @@ public class DossierInputModel {
 	private String dossiers;
 	@FormParam(value = "payment")
 	private String payment;
+	@FormParam(value = "serverNo")
+	private String serverNo;
+
 	@FormParam(value = "metaData")
 	private String metaData;
 
@@ -1082,6 +1087,13 @@ public void setPayment(String payment) {
 		this.payment = payment;
 	}
 
+	public String getServerNo() {
+		return serverNo;
+	}
+
+	public void setServerNo(String serverNo) {
+		this.serverNo = serverNo;
+	}
 	public String getMetaData() {
 		return metaData;
 	}

modules/backend-communication/backend-communication-service/service.xml

@@ -220,6 +220,10 @@
 			<finder-column name="groupId"/>
 			<finder-column name="protocol"/>
 		</finder>
+
+		<finder return-type="Collection" name="P">
+			<finder-column name="protocol"/>
+		</finder>
 	</entity>
 
 	<exceptions>

modules/backend-communication/backend-communication-service/src/main/java/org/opencps/communication/service/impl/ServerConfigLocalServiceImpl.java

@@ -317,4 +317,7 @@ public ServerConfig updateServerConfigDB(long groupId, String govAgencyCode, Str
 
 	}
 
+	public List<ServerConfig> getByProtocol(String protocol) {
+		return serverConfigPersistence.findByP(protocol);
+	}	
 }

modules/backend-communication/backend-communication-service/src/main/resources/service.properties

@@ -13,5 +13,5 @@
 ##
 
     build.namespace=Communication
-    build.number=1047
-    build.date=1561976208279
+    build.number=1050
+    build.date=1562064383246

modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java

@@ -129,6 +129,7 @@ public class DossierTerm {
 	public static final int ORIGINALITY_DVCTT = 1;
 	public static final int ORIGINALITY_LIENTHONG = 2;
 	public static final int ORIGINALITY_MOTCUA = 3;
+	public static final int ORIGINALITY_HOSONHOM = 9;
 
 	public static final String POSTAL_SERVICE_CODE = "postalServiceCode";
 	public static final String POSTAL_SERVICE_NAME = "postalServiceName";
@@ -251,5 +252,7 @@ public class DossierTerm {
 	public static final String GROUP_DOSSIER_ID = "groupDossierId";
 	public static final String APPLICANT_FOLLOW_ID_NO = "applicantFollowIdNo";
 	public static final String DOSSIER_SATUS_DC_CODE = "DOSSIER_STATUS";
+
+	public static final String GROUP_DOSSIERS = "groupDossiers";
 	public static final String META_DATA = "metaData";
 }

modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/input/model/DossierInputModel.java

@@ -69,6 +69,7 @@ public class DossierInputModel {
 	private String dossierFileArr;
 	private String dossiers;
 	private String payment;
+	private String serverNo;
 	private String metaData;
 
 	public Integer getViaPostal() {
@@ -903,6 +904,14 @@ public void setPayment(String payment) {
 		this.payment = payment;
 	}
 
+	public String getServerNo() {
+		return serverNo;
+	}
+
+	public void setServerNo(String serverNo) {
+		this.serverNo = serverNo;
+	}
+
 	public String getMetaData() {
 		return metaData;
 	}

modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java

@@ -256,6 +256,8 @@ public long dynamicQueryCount(DynamicQuery dynamicQuery,
 
 	public List<Dossier> findByDN_AN(String dossierNo, String applicantIdNo);
 
+	public List<Dossier> findByG_GDID(long groupId, long groupDossierId);
+
 	public List<Dossier> findByGID(long groupId, int start, int end);
 
 	public List<Dossier> findByNOT_ST_GT_MD(String[] statuses, Date d,

modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java

@@ -312,6 +312,11 @@ public static java.util.List<org.opencps.dossiermgt.model.Dossier> findByDN_AN(
 		return getService().findByDN_AN(dossierNo, applicantIdNo);
 	}
 
+	public static java.util.List<org.opencps.dossiermgt.model.Dossier> findByG_GDID(
+		long groupId, long groupDossierId) {
+		return getService().findByG_GDID(groupId, groupDossierId);
+	}
+
 	public static java.util.List<org.opencps.dossiermgt.model.Dossier> findByGID(
 		long groupId, int start, int end) {
 		return getService().findByGID(groupId, start, end);

modules/backend-dossiermgt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java

@@ -321,6 +321,12 @@ public java.util.List<org.opencps.dossiermgt.model.Dossier> findByDN_AN(
 		return _dossierLocalService.findByDN_AN(dossierNo, applicantIdNo);
 	}
 
+	@Override
+	public java.util.List<org.opencps.dossiermgt.model.Dossier> findByG_GDID(
+		long groupId, long groupDossierId) {
+		return _dossierLocalService.findByG_GDID(groupId, groupDossierId);
+	}
+
 	@Override
 	public java.util.List<org.opencps.dossiermgt.model.Dossier> findByGID(
 		long groupId, int start, int end) {