From 070f3fc26d11590974276217c8489d176e355d3d Mon Sep 17 00:00:00 2001
From: rein-d <room083@gmail.com>
Date: Thu, 3 Mar 2022 15:46:59 +0300
Subject: [PATCH] =?UTF-8?q?STDEV-10442=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20userUuid=20=D0=B2=20Receipt.Header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/action/datamapper/ReceiptHeaderMapper.java         | 3 +++
 src/main/java/ru/evotor/framework/receipt/Receipt.kt        | 6 +++++-
 src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt     | 1 +
 .../java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt  | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java b/src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java
index 5f171ff9bf..1c8f5d5d2b 100644
--- a/src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java
+++ b/src/main/java/ru/evotor/framework/core/action/datamapper/ReceiptHeaderMapper.java
@@ -13,6 +13,7 @@ public final class ReceiptHeaderMapper {
 
     private static final String KEY_RECEIPT_UUID = "receiptUuid";
     private static final String KEY_BASE_RECEIPT_UUID = "baseReceiptUuid";
+    private static final String KEY_USER_UUID = "userUuid";
     private static final String KEY_RECEIPT_NUMBER = "receiptNumber";
     private static final String KEY_RECEIPT_TYPE = "receiptType";
     private static final String KEY_RECEIPT_DATE = "receiptDate";
@@ -41,6 +42,7 @@ public static Receipt.Header from(@Nullable Bundle bundle) {
         return new Receipt.Header(
                 receiptUuid,
                 baseReceiptUuid,
+                bundle.getString(KEY_USER_UUID),
                 receiptNumber,
                 Utils.safeValueOf(Receipt.Type.class, receiptType, null),
                 date,
@@ -58,6 +60,7 @@ public static Bundle toBundle(@Nullable Receipt.Header header) {
         Bundle bundle = new Bundle();
         bundle.putString(KEY_RECEIPT_UUID, header.getUuid());
         bundle.putString(KEY_BASE_RECEIPT_UUID, header.getBaseReceiptUuid());
+        bundle.putString(KEY_USER_UUID, header.getUserUuid());
         bundle.putString(KEY_RECEIPT_NUMBER, header.getNumber());
         bundle.putString(KEY_RECEIPT_TYPE, header.getType().name());
 
diff --git a/src/main/java/ru/evotor/framework/receipt/Receipt.kt b/src/main/java/ru/evotor/framework/receipt/Receipt.kt
index b57c0b25ed..fafd5d0685 100644
--- a/src/main/java/ru/evotor/framework/receipt/Receipt.kt
+++ b/src/main/java/ru/evotor/framework/receipt/Receipt.kt
@@ -60,6 +60,10 @@ data class Receipt
              * Uuid чека-основания
              */
             val baseReceiptUuid: String?,
+            /**
+             * Uuid кассира
+             */
+            val userUuid: String?,
             /**
              * Номер чека. Может быть null для еще незакрытого чека
              */
@@ -166,4 +170,4 @@ data class Receipt
                     })
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt b/src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
index d5fd7ac2b5..93c60ff6fe 100644
--- a/src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
+++ b/src/main/java/ru/evotor/framework/receipt/ReceiptApi.kt
@@ -538,6 +538,7 @@ object ReceiptApi {
         return Receipt.Header(
             uuid = cursor.getString(cursor.getColumnIndex(ReceiptHeaderTable.COLUMN_UUID)),
             baseReceiptUuid = cursor.optString(ReceiptHeaderTable.COLUMN_BASE_RECEIPT_UUID),
+            userUuid = cursor.optString(ReceiptHeaderTable.COLUMN_USER_UUID),
             number = cursor.optString(ReceiptHeaderTable.COLUMN_NUMBER),
             type = Utils.safeValueOf(Receipt.Type::class.java, cursor.getString(cursor.getColumnIndex(ReceiptHeaderTable.COLUMN_TYPE)), null)
                 ?: return null,
diff --git a/src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt b/src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt
index 404222734e..b32be5e2cb 100644
--- a/src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt
+++ b/src/main/java/ru/evotor/framework/receipt/ReceiptHeaderTable.kt
@@ -3,6 +3,7 @@ package ru.evotor.framework.receipt
 object ReceiptHeaderTable {
     const val COLUMN_UUID = "UUID"
     const val COLUMN_BASE_RECEIPT_UUID = "BASE_RECEIPT_UUID"
+    const val COLUMN_USER_UUID = "USER_UUID"
     const val COLUMN_NUMBER = "NUMBER"
     const val COLUMN_TYPE = "TYPE"
     const val COLUMN_DATE = "DATE"