Skip to content

Commit

Permalink
Merge pull request #2223 from dangkhanhtrung/release-candidate-2.3-or…
Browse files Browse the repository at this point in the history 
…iginal

Release candidate 2.3 original
  • Loading branch information
@tranvietlam92
tranvietlam92 authored Mar 6, 2020
2 parents 07279bc + bb5a5f5 commit 3004d2c
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 24 deletions.
10 changes: 10 additions & 0 deletions ...nd-admin-config-service/src/main/java/backend/admin/config/whiteboard/RestAuthFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
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.model.User;
import com.liferay.portal.kernel.security.auth.AuthTokenUtil;
import com.liferay.portal.kernel.security.auth.CompanyThreadLocal;
import com.liferay.portal.kernel.security.auth.session.AuthenticatedSessionManagerUtil;
import com.liferay.portal.kernel.service.UserLocalServiceUtil;
import com.liferay.portal.kernel.servlet.HttpHeaders;
import com.liferay.portal.kernel.util.Base64;
import com.liferay.portal.kernel.util.PropsUtil;
Expand Down Expand Up @@ -217,6 +220,13 @@ else if (lstIps.contains(ipAddress) || lstIps.contains(domain)) {

String email = account[0];
String password = account[1];

if (!email.contains(StringPool.AT)) {
User u = UserLocalServiceUtil.fetchUserByScreenName(CompanyThreadLocal.getCompanyId(), email);
if (u != null) {
email = u.getEmailAddress();
}
}

long userId = AuthenticatedSessionManagerUtil.getAuthenticatedUserId(httpRequest, email, password,
CompanyConstants.AUTH_TYPE_EA);
Expand Down
1 change: 1 addition & 0 deletions ...pi-rest/src/main/java/org/opencps/api/controller/impl/DefaultSignatureManagementImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.opencps.dossiermgt.action.DossierActions;
import org.opencps.dossiermgt.action.impl.DossierActionsImpl;
import org.opencps.dossiermgt.constants.DeliverableTerm;
import org.opencps.dossiermgt.constants.DossierTerm;
import org.opencps.dossiermgt.model.ActionConfig;
import org.opencps.dossiermgt.model.Deliverable;
import org.opencps.dossiermgt.model.Dossier;
Expand Down
26 changes: 13 additions & 13 deletions modules/backend-auth/src/main/java/org/opencps/auth/filter/RestAuthFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@
/**
* @author Binhth
*/
@Component(
immediate = true,
property = {
"servlet-context-name=",
"servlet-filter-name=Rest Auth Filter",
"url-pattern=/o/v1/socket/*",
"url-pattern=/o/v1/opencps/users/*"
,
"url-pattern=/o/v1/opencps/login",
"url-pattern=/o/rest/v2/*",
"url-pattern=/o/rest/v2_1/*"
}, service = Filter.class
)
//@Component(
// immediate = true,
// property = {
// "servlet-context-name=",
// "servlet-filter-name=Rest Auth Filter",
// "url-pattern=/o/v1/socket/*",
// "url-pattern=/o/v1/opencps/users/*"
// ,
// "url-pattern=/o/v1/opencps/login",
// "url-pattern=/o/rest/v2/*",
// "url-pattern=/o/rest/v2_1/*"
// }, service = Filter.class
//)
public class RestAuthFilter implements Filter {

public final static String P_AUTH = "Token";
Expand Down
1 change: 1 addition & 0 deletions ...gt/backend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/constants/DossierTerm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,4 +362,5 @@ public class DossierTerm {
public static final String STEP_DONE_CODE = "400";

public static final String CROSS_DOSSIER = "crossDossier";
public static final String PREFIX_UUID = "xxx-cps-";
}
3 changes: 3 additions & 0 deletions ...kend-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ public List<Dossier> findByNOT_ST_GT_MD(String[] statuses, Date d,
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public ActionableDynamicQuery getActionableDynamicQuery();

@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public Dossier getByCpsRef(long groupId, String refId);

@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public Dossier getByDossierNo(long groupId, String dossierNo);

Expand Down
5 changes: 5 additions & 0 deletions ...-dossiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,11 @@ public static com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getAction
return getService().getActionableDynamicQuery();
}

public static org.opencps.dossiermgt.model.Dossier getByCpsRef(
long groupId, String refId) {
return getService().getByCpsRef(groupId, refId);
}

public static org.opencps.dossiermgt.model.Dossier getByDossierNo(
long groupId, String dossierNo) {
return getService().getByDossierNo(groupId, dossierNo);
Expand Down
6 changes: 6 additions & 0 deletions ...ssiermgt-api/src/main/java/org/opencps/dossiermgt/service/DossierLocalServiceWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,12 @@ public com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery getActionableDyn
return _dossierLocalService.getActionableDynamicQuery();
}

@Override
public org.opencps.dossiermgt.model.Dossier getByCpsRef(long groupId,
String refId) {
return _dossierLocalService.getByCpsRef(groupId, refId);
}

@Override
public org.opencps.dossiermgt.model.Dossier getByDossierNo(long groupId,
String dossierNo) {
Expand Down
61 changes: 54 additions & 7 deletions ...ossiermgt-service/src/main/java/org/opencps/dossiermgt/processor/APIMessageProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@ private boolean syncInform() {
true);
DossierFileModel dfModel = new DossierFileModel();
dfModel.setReferenceUid(df.getReferenceUid());
if (Validator.isNotNull(dossier.getOriginDossierNo())) {
if (df.getReferenceUid().contains(DossierTerm.PREFIX_UUID)) {
String newRef = df.getReferenceUid().substring(DossierTerm.PREFIX_UUID.length());
dfModel.setReferenceUid(newRef);
}
}
dfModel.setModifiedDate(String.valueOf(df.getModifiedDate().getTime()));
dfModel.setDossierPartNo(df.getDossierPartNo());
dfModel.setDisplayName(df.getDisplayName());
Expand Down Expand Up @@ -276,8 +282,16 @@ private boolean syncInform() {
}

}
DossierDocumentModel model = OpenCPSConverter.convertDossierDocument(dossierDocument);
DossierDocumentModel ddResult = client.postDossierDocument(file, dossier.getReferenceUid(), model);
DossierDocumentModel model = OpenCPSConverter.convertDossierDocument(dossierDocument, dossier);
DossierDocumentModel ddResult = null;
if (Validator.isNotNull(dossier.getOriginDossierNo())) {
if (dossier.getReferenceUid().contains(DossierTerm.PREFIX_UUID)) {
ddResult = client.postDossierDocument(file, dossier.getReferenceUid().substring(DossierTerm.PREFIX_UUID.length()), model);
}
}
else {
ddResult = client.postDossierDocument(file, dossier.getReferenceUid(), model);
}
if (ddResult == null) {
return false;
}
Expand Down Expand Up @@ -351,7 +365,14 @@ private boolean syncInform() {
pfiModel.setPaymentAmount(paymentFile.getPaymentAmount());
pfiModel.setPaymentFee(paymentFee != null ? paymentFee : StringPool.BLANK);
pfiModel.setPaymentNote(paymentNote != null ? paymentNote : StringPool.BLANK);
pfiModel.setReferenceUid(dossier.getReferenceUid());
pfiModel.setReferenceUid(paymentFile.getReferenceUid());
if (Validator.isNotNull(dossier.getOriginDossierNo())) {
if (pfiModel.getReferenceUid().contains(DossierTerm.PREFIX_UUID)) {
String newRef = pfiModel.getReferenceUid().substring(DossierTerm.PREFIX_UUID.length());
pfiModel.setReferenceUid(newRef);
}
}

pfiModel.setFeeAmount(paymentFile.getFeeAmount());
pfiModel.setInvoiceTemplateNo(paymentFile.getInvoiceTemplateNo());
pfiModel.setPaymentStatus(paymentFile.getPaymentStatus());
Expand Down Expand Up @@ -396,7 +417,14 @@ private boolean syncInform() {
pfiModel.setPaymentAmount(paymentFile.getPaymentAmount());
pfiModel.setPaymentFee(processAction.getPaymentFee());
pfiModel.setPaymentNote(paymentFile.getPaymentNote());
pfiModel.setReferenceUid(dossier.getReferenceUid());
pfiModel.setReferenceUid(paymentFile.getReferenceUid());
if (Validator.isNotNull(dossier.getOriginDossierNo())) {
if (pfiModel.getReferenceUid().contains(DossierTerm.PREFIX_UUID)) {
String newRef = pfiModel.getReferenceUid().substring(DossierTerm.PREFIX_UUID.length());
pfiModel.setReferenceUid(newRef);
}
}

pfiModel.setFeeAmount(paymentFile.getFeeAmount());
pfiModel.setInvoiceTemplateNo(paymentFile.getInvoiceTemplateNo());
pfiModel.setPaymentStatus(paymentFile.getPaymentStatus());
Expand Down Expand Up @@ -481,6 +509,7 @@ private boolean syncRequest() {
if (dossier.getOriginDossierId() != 0 || Validator.isNotNull(dossier.getOriginDossierNo())) {
// model.setOriginality(DossierTerm.ORIGINALITY_HSLT);
model.setOriginality(DossierTerm.ORIGINALITY_LIENTHONG);
model.setReferenceUid(DossierTerm.PREFIX_UUID + model.getReferenceUid());
}
else {
model.setOriginality(DossierTerm.ORIGINALITY_LIENTHONG);
Expand Down Expand Up @@ -742,6 +771,9 @@ else if (df != null && df.getEForm()) {
true);
DossierFileModel dfModel = new DossierFileModel();
dfModel.setReferenceUid(df.getReferenceUid());
if (dossier.getOriginDossierId() != 0) {
dfModel.setReferenceUid(DossierTerm.PREFIX_UUID + df.getReferenceUid());
}
dfModel.setModifiedDate(String.valueOf(df.getModifiedDate().getTime()));
dfModel.setDossierPartNo(dossierPartNo);
dfModel.setDisplayName(df.getDisplayName());
Expand Down Expand Up @@ -781,6 +813,9 @@ else if (df != null && df.getEForm()) {
else if (df != null && df.getEForm()) {
DossierFileModel dfModel = new DossierFileModel();
dfModel.setReferenceUid(df.getReferenceUid());
if (dossier.getOriginDossierId() != 0) {
dfModel.setReferenceUid(DossierTerm.PREFIX_UUID + df.getReferenceUid());
}
dfModel.setModifiedDate(String.valueOf(df.getModifiedDate().getTime()));
dfModel.setDossierPartNo(dossierPartNo);
dfModel.setDisplayName(df.getDisplayName());
Expand Down Expand Up @@ -916,7 +951,11 @@ else if (df != null && df.getEForm()) {
pfiModel.setPaymentAmount(paymentFile.getPaymentAmount());
pfiModel.setPaymentFee(paymentFile.getPaymentFee());
pfiModel.setPaymentNote(paymentFile.getPaymentNote());
pfiModel.setReferenceUid(dossier.getReferenceUid());
pfiModel.setReferenceUid(paymentFile.getReferenceUid());
if (dossier.getOriginDossierId() != 0) {
pfiModel.setReferenceUid(DossierTerm.PREFIX_UUID + paymentFile.getReferenceUid());
}

pfiModel.setFeeAmount(paymentFile.getFeeAmount());
pfiModel.setPaymentStatus(paymentFile.getPaymentStatus());
pfiModel.setInvoiceTemplateNo(paymentFile.getInvoiceTemplateNo());
Expand Down Expand Up @@ -947,7 +986,11 @@ else if(processAction != null && (processAction.getRequestPayment() == ProcessAc
pfiModel.setPaymentAmount(paymentFile.getPaymentAmount());
pfiModel.setPaymentFee(paymentFile.getPaymentFee());
pfiModel.setPaymentNote(paymentFile.getPaymentNote());
pfiModel.setReferenceUid(dossier.getReferenceUid());
pfiModel.setReferenceUid(paymentFile.getReferenceUid());
if (dossier.getOriginDossierId() != 0) {
pfiModel.setReferenceUid(DossierTerm.PREFIX_UUID + paymentFile.getReferenceUid());
}

pfiModel.setFeeAmount(paymentFile.getFeeAmount());
pfiModel.setPaymentStatus(paymentFile.getPaymentStatus());
pfiModel.setInvoiceTemplateNo(paymentFile.getInvoiceTemplateNo());
Expand All @@ -974,7 +1017,11 @@ else if(processAction != null && (processAction.getRequestPayment() == ProcessAc
pfiModel.setPaymentAmount(paymentFile.getPaymentAmount());
pfiModel.setPaymentFee(processAction.getPaymentFee());
pfiModel.setPaymentNote(paymentFile.getPaymentNote());
pfiModel.setReferenceUid(dossier.getReferenceUid());
pfiModel.setReferenceUid(paymentFile.getReferenceUid());
if (dossier.getOriginDossierId() != 0) {
pfiModel.setReferenceUid(DossierTerm.PREFIX_UUID + paymentFile.getReferenceUid());
}

pfiModel.setFeeAmount(paymentFile.getFeeAmount());
pfiModel.setInvoiceTemplateNo(paymentFile.getInvoiceTemplateNo());
pfiModel.setPaymentStatus(paymentFile.getPaymentStatus());
Expand Down
9 changes: 8 additions & 1 deletion ...-dossiermgt-service/src/main/java/org/opencps/dossiermgt/rest/utils/OpenCPSConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1444,12 +1444,19 @@ public static DossierDocumentModel convertDossierDocument(JSONObject jsonObj) {
return result;
}

public static DossierDocumentModel convertDossierDocument(DossierDocument dossierDocument) {
public static DossierDocumentModel convertDossierDocument(DossierDocument dossierDocument, Dossier dossier) {
DossierDocumentModel result = new DossierDocumentModel();
result.setDocumentCode(dossierDocument.getDocumentCode());
result.setDocumentName(dossierDocument.getDocumentName());
result.setDocumentType(dossierDocument.getDocumentType());
result.setReferenceUid(dossierDocument.getReferenceUid());
if (Validator.isNotNull(dossier.getOriginDossierNo())) {
if (result.getReferenceUid().contains(DossierTerm.PREFIX_UUID)) {
String newRef = result.getReferenceUid().substring(DossierTerm.PREFIX_UUID.length());
result.setReferenceUid(newRef);
}
}

return result;
}

Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/opencps/dossiermgt/service/impl/CPSDossierBusinessLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,12 @@ private void createDossierDocument(long groupId, long userId, ActionConfig actio
String documentCode = DocumentTypeNumberGenerator.generateDossierDocumentNumber(groupId,
dossier.getCompanyId(), dossier.getServiceCode(), dossier.getGovAgencyCode(),
dt.getCodePattern());
String refUid = UUID.randomUUID().toString();
if (Validator.isNotNull(dossier.getOriginDossierNo()) && dossier.getOriginDossierId() == 0) {
refUid = DossierTerm.PREFIX_UUID + refUid;
}
DossierDocument dossierDocument = DossierDocumentLocalServiceUtil.addDossierDoc(groupId,
dossier.getDossierId(), UUID.randomUUID().toString(), dossierAction.getDossierActionId(),
dossier.getDossierId(), refUid, dossierAction.getDossierActionId(),
dt.getTypeCode(), dt.getDocumentName(), documentCode, 0L, dt.getDocSync(), context);

//Generate PDF
Expand Down
13 changes: 13 additions & 0 deletions ...gt-service/src/main/java/org/opencps/dossiermgt/service/impl/DossierLocalServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6932,4 +6932,17 @@ public List<Dossier> findByG_UID_DS(long groupId, long userId, String dossierSta
public int countByG_UID_DS(long groupId, long userId, String dossierStatus) {
return dossierPersistence.countByG_UID_DS(groupId, userId, dossierStatus);
}

public Dossier getByCpsRef(long groupId, String refId) {
Dossier dossier = dossierPersistence.fetchByG_REF(groupId, refId);
if (dossier == null) {
if (refId.contains(DossierTerm.PREFIX_UUID)) {
dossier = dossierPersistence.fetchByG_REF(groupId, refId.substring(DossierTerm.PREFIX_UUID.length()));
}
else {
dossier = dossierPersistence.fetchByG_REF(groupId, DossierTerm.PREFIX_UUID + refId);
}
}
return dossier;
}
}
4 changes: 2 additions & 2 deletions modules/backend-dossiermgt/backend-dossiermgt-service/src/main/resources/service.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
##

build.namespace=dossiermgt
build.number=1399
build.date=1583141556889
build.number=1400
build.date=1583380374001

0 comments on commit 3004d2c

Please sign in to comment.