Merge pull request #26 from evotor/develop

From develop

Author: thenixan

app/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+apply plugin: 'maven-publish'
+
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
@@ -24,4 +26,30 @@ dependencies {
 }
 repositories {
     mavenCentral()
+}
+
+
+publishing {
+    publications {
+
+        maven(MavenPublication) {
+            groupId 'ru.evotor'
+            artifactId "integration-library"
+            version "1.0.28-dev"
+            artifact "${project.buildDir}/outputs/aar/${project.archivesBaseName}-release.aar"
+
+            //generate pom nodes for dependencies
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                configurations.compile.allDependencies.each { dependency ->
+                    if (dependency.group) {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', dependency.group)
+                        dependencyNode.appendNode('artifactId', dependency.name)
+                        dependencyNode.appendNode('version', dependency.version)
+                    }
+                }
+            }
+        }
+    }
 }

app/src/main/java/ru/evotor/framework/core/IntegrationService.java

@@ -6,6 +6,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import ru.evotor.framework.core.action.processor.ActionProcessor;
@@ -20,7 +21,7 @@ public class IntegrationService extends Service {
         public void call(IIntegrationManagerResponse response, String action, Bundle bundle) throws RemoteException {
             ActionProcessor processor = processors.get(action);
             if (processor != null) {
-                processor.process(response, bundle);
+                processor.process(action, response, bundle);
             }
         }
     };
@@ -32,10 +33,10 @@ public IBinder onBind(Intent intent) {
         return binder.asBinder();
     }
 
-    protected final void registerProcessor(ActionProcessor processor) {
-        if (processor == null) {
-            throw new IllegalArgumentException("processor can't be null");
-        }
-        processors.put(processor.getAction(), processor);
+    protected final void registerProcessor(String action, ActionProcessor processor) {
+        Objects.requireNonNull(action);
+        Objects.requireNonNull(processor);
+
+        processors.put(action, processor);
     }
 }

app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommandResult.java

@@ -12,6 +12,7 @@ public class OpenReceiptCommandResult {
 
     private static final String KEY_RESULT = "result";
     private static final String KEY_ERROR_CODE = "errorCode";
+    private static final String KEY_RECEIPT_UUID = "receiptUuid";
 
     public static final int ERROR_CODE_OK = 0;
     public static final int ERROR_CODE_RECEIPT_IS_ALREADY_OPEN = -1;
@@ -21,24 +22,30 @@ public static OpenReceiptCommandResult create(Bundle bundle) {
 
         return new OpenReceiptCommandResult(
                 Utils.safeValueOf(Result.class, resultName, Result.UNKNOWN),
-                bundle.getInt(KEY_ERROR_CODE, ERROR_CODE_OK)
+                bundle.getInt(KEY_ERROR_CODE, ERROR_CODE_OK),
+                bundle.getString(KEY_RECEIPT_UUID)
         );
     }
 
     private final Result result;
     private final int errorCode;
+    private final String receiptUuid;
 
     public OpenReceiptCommandResult(
             Result result,
-            int errorCode
+            int errorCode,
+            String receiptUuid
     ) {
         this.result = result;
         this.errorCode = errorCode;
+        this.receiptUuid = receiptUuid;
     }
 
     public Bundle toBundle() {
         Bundle bundle = new Bundle();
         bundle.putString(KEY_RESULT, result.name());
+        bundle.putInt(KEY_ERROR_CODE, errorCode);
+        bundle.putString(KEY_RECEIPT_UUID, receiptUuid);
         return bundle;
     }
 

…_receipt_command/OpenReceiptCommand.java …eipt_command/OpenSellReceiptCommand.javaapp/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommand.java renamed to app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenSellReceiptCommand.java app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenReceiptCommand.java renamed to app/src/main/java/ru/evotor/framework/core/action/command/open_receipt_command/OpenSellReceiptCommand.java

@@ -7,6 +7,7 @@
 import android.os.Looper;
 import android.os.Parcelable;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -22,23 +23,26 @@
  * Created by a.kuznetsov on 26/04/2017.
  */
 
-public class OpenReceiptCommand {
+public class OpenSellReceiptCommand {
 
     public static final String NAME = "evo.v2.receipt.sell.openReceipt";
     private static final String KEY_CHANGES = "changes";
 
-    public static OpenReceiptCommand create(Bundle bundle) {
+    public static OpenSellReceiptCommand create(Bundle bundle) {
         Parcelable[] changesParcelable = bundle.getParcelableArray(KEY_CHANGES);
-        return new OpenReceiptCommand(Utils.filterByClass(
+        return new OpenSellReceiptCommand(Utils.filterByClass(
                 ChangesMapper.INSTANCE.create(changesParcelable),
                 PositionAdd.class
         ));
     }
 
     private final List<PositionAdd> changes;
 
-    public OpenReceiptCommand(List<PositionAdd> changes) {
-        this.changes = changes;
+    public OpenSellReceiptCommand(List<PositionAdd> changes) {
+        this.changes = new ArrayList<>();
+        if (changes != null) {
+            this.changes.addAll(changes);
+        }
     }
 
     public void process(final Context context, final ICanStartActivity activityStarter, IntegrationManagerCallback callback) {
@@ -50,7 +54,7 @@ public void process(final Context context, final ICanStartActivity activityStart
             return;
         }
         new IntegrationManagerImpl(context.getApplicationContext())
-                .call(OpenReceiptCommand.NAME,
+                .call(OpenSellReceiptCommand.NAME,
 
                         componentNameList.get(0),
                         this.toBundle(),

app/src/main/java/ru/evotor/framework/core/action/event/receipt/SellReceiptOpenedEvent.java

@@ -0,0 +1,10 @@
+package ru.evotor.framework.core.action.event.receipt;
+
+/**
+ * Created by a.kuznetsov on 18/05/2017.
+ */
+
+public interface SellReceiptOpenedEvent {
+    String BROADCAST_ACTION = "evotor.intent.action.receipt.sell.OPENED";
+    String KEY_UUID = "uuid";
+}

app/src/main/java/ru/evotor/framework/core/action/event/receipt/before_positions_edited/BeforePositionsEditedEvent.java

@@ -17,27 +17,37 @@
 public class BeforePositionsEditedEvent {
     private static final String TAG = "PositionsEditedEvent";
 
-    public static final String NAME = "evo.v2.receipt.sell.beforePositionsEdited";
+    public static final String NAME_SELL_RECEIPT = "evo.v2.receipt.sell.beforePositionsEdited";
+    public static final String NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.beforePositionsEdited";
+
+    private static final String KEY_RECEIPT_UUID = "receiptUuid";
     private static final String KEY_CHANGES = "changes";
 
-    public static BeforePositionsEditedEvent create(Bundle bundle) {
-        Parcelable[] changesParcelable = bundle.getParcelableArray(KEY_CHANGES);
-        return new BeforePositionsEditedEvent(
+
+    private final String receiptUuid;
+    private final List<IPositionChange> changes;
+
+    public BeforePositionsEditedEvent(
+            String receiptUuid,
+            List<IPositionChange> changes
+    ) {
+        this.receiptUuid = receiptUuid;
+        this.changes = changes;
+    }
+
+    public BeforePositionsEditedEvent(Bundle bundle) {
+        this(
+                bundle.getString(KEY_RECEIPT_UUID, null),
                 Utils.filterByClass(
-                        ChangesMapper.INSTANCE.create(changesParcelable),
+                        ChangesMapper.INSTANCE.create(bundle.getParcelableArray(KEY_CHANGES)),
                         IPositionChange.class
                 )
         );
     }
 
-    private List<IPositionChange> changes;
-
-    public BeforePositionsEditedEvent(List<IPositionChange> changes) {
-        this.changes = changes;
-    }
-
     public Bundle toBundle() {
         Bundle result = new Bundle();
+        result.putString(KEY_RECEIPT_UUID, receiptUuid);
         Parcelable[] changesParcelable = new Parcelable[changes.size()];
         for (int i = 0; i < changesParcelable.length; i++) {
             IChange change = changes.get(i);
@@ -47,6 +57,10 @@ public Bundle toBundle() {
         return result;
     }
 
+    public String getReceiptUuid() {
+        return receiptUuid;
+    }
+
     public List<IPositionChange> getChanges() {
         return changes;
     }

app/src/main/java/ru/evotor/framework/core/action/event/receipt/before_positions_edited/BeforePositionsEditedEventActivity.java

@@ -12,6 +12,6 @@ public void setIntegrationResult(BeforePositionsEditedEventResult result) {
     }
 
     public BeforePositionsEditedEvent getEvent() {
-        return BeforePositionsEditedEvent.create(getSourceBundle());
+        return new BeforePositionsEditedEvent(getSourceBundle());
     }
 }

app/src/main/java/ru/evotor/framework/core/action/event/receipt/before_positions_edited/BeforePositionsEditedEventProcessor.java

@@ -9,15 +9,12 @@
  */
 
 public abstract class BeforePositionsEditedEventProcessor extends ActionProcessor {
-    public BeforePositionsEditedEventProcessor() {
-        super(BeforePositionsEditedEvent.NAME);
-    }
 
     @Override
-    public void process(Bundle bundle, Callback callback) {
-        call(BeforePositionsEditedEvent.create(bundle), callback);
+    public void process(String action, Bundle bundle, Callback callback) {
+        call(action, new BeforePositionsEditedEvent(bundle), callback);
     }
 
-    public abstract void call(BeforePositionsEditedEvent event, Callback callback);
+    public abstract void call(String action, BeforePositionsEditedEvent event, Callback callback);
 }
 

app/src/main/java/ru/evotor/framework/core/action/event/receipt/discount/ReceiptDiscountEvent.java

@@ -7,26 +7,40 @@
 public class ReceiptDiscountEvent {
     private static final String TAG = "ReceiptDiscountEvent";
 
-    public static final String NAME = "evo.v2.receipt.sell.receiptDiscount";
+    public static final String NAME_SELL_RECEIPT = "evo.v2.receipt.sell.receiptDiscount";
+    public static final String NAME_PAYBACK_RECEIPT = "evo.v2.receipt.payback.receiptDiscount";
+
+    private static final String KEY_RECEIPT_UUID = "receiptUuid";
     private static final String KEY_DISCOUNT = "discount";
 
     public static ReceiptDiscountEvent create(Bundle bundle) {
+        String receiptUuid = bundle.getString(KEY_RECEIPT_UUID, null);
         BigDecimal discount = new BigDecimal(bundle.getString(KEY_DISCOUNT, "0"));
-        return new ReceiptDiscountEvent(discount);
+        return new ReceiptDiscountEvent(receiptUuid, discount);
     }
 
-    private BigDecimal discount;
+    private final String receiptUuid;
+    private final BigDecimal discount;
 
-    public ReceiptDiscountEvent(BigDecimal discount) {
+    public ReceiptDiscountEvent(
+            String receiptUuid,
+            BigDecimal discount
+    ) {
+        this.receiptUuid = receiptUuid;
         this.discount = discount;
     }
 
     public Bundle toBundle() {
         Bundle result = new Bundle();
+        result.putString(KEY_RECEIPT_UUID, receiptUuid);
         result.putString(KEY_DISCOUNT, discount.toPlainString());
         return result;
     }
 
+    public String getReceiptUuid() {
+        return receiptUuid;
+    }
+
     public BigDecimal getDiscount() {
         return discount;
     }

app/src/main/java/ru/evotor/framework/core/action/event/receipt/discount/ReceiptDiscountEventProcessor.java

@@ -5,15 +5,11 @@
 import ru.evotor.framework.core.action.processor.ActionProcessor;
 
 public abstract class ReceiptDiscountEventProcessor extends ActionProcessor {
-    public ReceiptDiscountEventProcessor() {
-        super(ReceiptDiscountEvent.NAME);
-    }
-
     @Override
-    public void process(Bundle bundle, Callback callback) {
-        call(ReceiptDiscountEvent.create(bundle), callback);
+    public void process(String action, Bundle bundle, Callback callback) {
+        call(action, ReceiptDiscountEvent.create(bundle), callback);
     }
 
-    public abstract void call(ReceiptDiscountEvent event, Callback callback);
+    public abstract void call(String action, ReceiptDiscountEvent event, Callback callback);
 }