0035288: [SERQA 2460] Incorrect documentNo when using external order loader

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1488188035 -19800
#      Mon Feb 27 15:03:55 2017 +0530
# Node ID 955ca7d78bd93619ce7f3b2352a89259f166c40c
# Parent  c04938eafe0f8067af8fcad75f5ea21a7dfacac6
Fixed issue 35288 : ExternalOrderLoader will use the ticket sequence from the POS Terminal if available, and document number is not provided in the JSON

diff -r c04938eafe0f -r 955ca7d78bd9 src/org/openbravo/retail/posterminal/ExternalOrderLoader.java
--- a/src/org/openbravo/retail/posterminal/ExternalOrderLoader.java	Thu Feb 23 17:47:42 2017 +0530
+++ b/src/org/openbravo/retail/posterminal/ExternalOrderLoader.java	Mon Feb 27 15:03:55 2017 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2015-2016 Openbravo S.L.U.
+ * Copyright (C) 2015-2017 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -30,6 +30,7 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.LockOptions;
 import org.hibernate.Query;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
@@ -758,10 +759,29 @@
 
   protected void setDocumentNo(JSONObject orderJson) throws JSONException {
     if (!orderJson.has("documentNo")) {
-      final String documentNo = getDocumentNo(
-          ModelProvider.getInstance().getEntity(Order.ENTITY_NAME), null,
-          OBDal.getInstance().get(DocumentType.class, orderJson.getString("documentType")));
-      orderJson.put("documentNo", documentNo);
+      OBPOSApplications posTerminal = getPOSTerminal(orderJson);
+      if (posTerminal != null) {
+        Long currentNo = (long) 0;
+        // The record will be locked to this process until it ends.
+        Query terminalQuery = OBDal.getInstance().getSession()
+            .createQuery("from OBPOS_Applications where id=?");
+        terminalQuery.setString(0, posTerminal.getId());
+        terminalQuery.setLockOptions(LockOptions.UPGRADE);
+        OBPOSApplications lockedTerminal = (OBPOSApplications) terminalQuery.uniqueResult();
+        if (lockedTerminal.getLastassignednum() != null) {
+          currentNo = lockedTerminal.getLastassignednum() + 1;
+        } else {
+          currentNo++;
+        }
+        lockedTerminal.setLastassignednum(currentNo);
+        orderJson.put("documentNo",
+            lockedTerminal.getOrderdocnoPrefix() + "/" + String.format("%07d", currentNo));
+      } else {
+        final String documentNo = getDocumentNo(
+            ModelProvider.getInstance().getEntity(Order.ENTITY_NAME), null, OBDal.getInstance()
+                .get(DocumentType.class, orderJson.getString("documentType")));
+        orderJson.put("documentNo", documentNo);
+      }
     }
   }
 

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1488188011 -19800
#      Mon Feb 27 15:03:31 2017 +0530
# Node ID d5c757086934578efab42a5d1b6e854e19badfe9
# Parent  e346994c7452dcb03ce1b3667be01809f26a3633
Verifies issue 35288 : Added automated test 'I35288_VerifyRetailOrderDocumentNo'

diff -r e346994c7452 -r d5c757086934 src-test/org/openbravo/test/mobile/retail/pack/webservice/tests/orderloader/I35288_VerifyRetailOrderDocumentNo.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/webservice/tests/orderloader/I35288_VerifyRetailOrderDocumentNo.java	Mon Feb 27 15:03:31 2017 +0530
@@ -0,0 +1,59 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2017 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
+package org.openbravo.test.mobile.retail.pack.webservice.tests.orderloader;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperSelect;
+
+/**
+ * Tests loading orders into retail and checking document number using webservices.
+ *
+ * @author RAN
+ */
+
+public class I35288_VerifyRetailOrderDocumentNo extends BaseRetailOrderLoaderTest {
+
+  @Test
+  public void testOrderDocumentNo() throws Exception {
+    final String jsonStrOutput = sendOrderFromFile("message-order-minimal-1.json");
+    checkResult(jsonStrOutput, 1, 1, null);
+
+    final JSONArray orders = new JSONObject(jsonStrOutput).getJSONObject("response").getJSONArray(
+        "orders");
+    for (int i = 0; i < orders.length(); i++) {
+      final JSONObject order = orders.getJSONObject(i);
+      final String sql = String.format("select orderdocno_prefix, lastassignednum "
+          + "from obpos_applications where obpos_applications_id = '%s'",
+          order.getString("posTerminal"));
+      new DatabaseHelperSelect() {
+        @Override
+        protected void yieldResultSet(final ResultSet rs) throws SQLException {
+          try {
+            final int documentNo = Integer.parseInt(order.getString("documentNo").replace(
+                rs.getString("orderdocno_prefix"), ""));
+            assertThat("Order Document Number is not fetched from POS Terminal", documentNo,
+                equalTo(rs.getInt("lastassignednum")));
+          } catch (final Exception e) {
+
+          }
+        }
+      }.execute(sql, 1);
+
+    }
+  }
+}
\ No newline at end of file