Fixing of #216 - CDR Enhancements - detailed CDRs - adding of

ruleIdDropReject
RestComm · Jul 4, 2017 · af21529 · af21529
1 parent de173d2
commit af21529
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/core/domain/src/main/java/org/mobicents/smsc/domain/MProcManagement.java b/core/domain/src/main/java/org/mobicents/smsc/domain/MProcManagement.java
@@ -256,6 +256,7 @@ public MProcResult applyMProcArrival(final MProcRuleRaProvider anMProcRuleRa, Sm
                     if (logger.isDebugEnabled()) {
                         logger.debug("MRule matches at Arrival phase to a message:\nrule: " + rule + "\nmessage: " + sms);
                     }
+                    pap.setRuleIdInProcessing(rule.getId());
                     rule.onPostArrival(anMProcRuleRa, pap, message);
                 }
             }
@@ -267,18 +268,20 @@ public MProcResult applyMProcArrival(final MProcRuleRaProvider anMProcRuleRa, Sm
             return res;
         }
 
-        MProcResult res = new MProcResult();;
+        MProcResult res = new MProcResult();
         FastList<Sms> res0 = new FastList<Sms>();
         res.setMessageList(res0);
         FastList<MProcNewMessage> newMsgs = pap.getPostedMessages();
         if (pap.isNeedDropMessage()) {
             res.setMessageDropped(true);
+            res.setRuleIdDropReject(res.getRuleIdDropReject());
         } else if (pap.isNeedRejectMessage()) {
             res.setMessageRejected(true);
 //            res.setMprocRejectingRuleId(pap.);
             res.setMapErrorCode(pap.getMapErrorCode());
             res.setHttpErrorCode(pap.getHttpErrorCode());
             res.setSmppErrorCode(pap.getSmppErrorCode());
+            res.setRuleIdDropReject(res.getRuleIdDropReject());
         } else {
             res0.add(sms);
         }

diff --git a/core/smsc-common-library/src/main/java/org/mobicents/smsc/mproc/impl/MProcResult.java b/core/smsc-common-library/src/main/java/org/mobicents/smsc/mproc/impl/MProcResult.java
@@ -41,6 +41,7 @@ public class MProcResult {
     private boolean messageIsRerouted;
     private boolean hrIsByPassed;
     private int newNetworkId;
+    private int ruleIdDropReject;
 
     private int itsMapErrorCode;
     private int itsHttpErrorCode;
@@ -70,6 +71,14 @@ public void setMessageList(FastList<Sms> val) {
         messageList = val;
     }
 
+    public int getRuleIdDropReject() {
+        return ruleIdDropReject;
+    }
+
+    public void setRuleIdDropReject(int val) {
+        ruleIdDropReject = val;
+    }
+
     public boolean isMessageRejected() {
         return messageIsRejected;
     }

diff --git a/...-common-library/src/main/java/org/mobicents/smsc/mproc/impl/PostArrivalProcessorImpl.java b/...-common-library/src/main/java/org/mobicents/smsc/mproc/impl/PostArrivalProcessorImpl.java
@@ -51,6 +51,8 @@ public class PostArrivalProcessorImpl implements PostArrivalProcessor {
     private boolean needDropMessage = false;
     private boolean needRejectMessage = false;
     private FastList<MProcNewMessage> postedMessages = new FastList<MProcNewMessage>();
+    private int ruleIdInProcessing;
+    private int ruleIdDropReject;
 
     private int itsMapErrorCode;
     private int itsHttpErrorCode;
@@ -62,6 +64,22 @@ public PostArrivalProcessorImpl(int defaultValidityPeriodHours, int maxValidityP
         this.logger = logger;
     }
 
+    public int getRuleIdInProcessing() {
+        return ruleIdInProcessing;
+    }
+
+    public void setRuleIdInProcessing(int val) {
+        ruleIdInProcessing = val;
+    }
+
+    public int getRuleIdDropReject() {
+        return ruleIdDropReject;
+    }
+
+    public void setRuleIdDropReject(int val) {
+        ruleIdDropReject = val;
+    }
+
     // results of message processing
     public boolean isNeedDropMessage() {
         return needDropMessage;
@@ -115,6 +133,7 @@ public void dropMessage() throws MProcRuleException {
 
         actionAdded = true;
         needDropMessage = true;
+        ruleIdDropReject = ruleIdInProcessing;
     }
 
     @Override
@@ -124,6 +143,7 @@ public void rejectMessage() throws MProcRuleException {
 
         actionAdded = true;
         needRejectMessage = true;
+        ruleIdDropReject = ruleIdInProcessing;
     }
 
     @Override
@@ -134,6 +154,7 @@ public void rejectMessage(final int anSmppErrorCode, final int aMapErrorCode, fi
         }
         actionAdded = true;
         needRejectMessage = true;
+        ruleIdDropReject = ruleIdInProcessing;
         itsSmppErrorCode = anSmppErrorCode;
         itsMapErrorCode = aMapErrorCode;
         itsHttpErrorCode = aHttpErrorCode;