From 4bf76757bde3820b34dd727a61f1285437a5bdac Mon Sep 17 00:00:00 2001
From: Jayant Chhillar <jayant17154@iiitd.ac.in>
Date: Wed, 12 Jul 2023 13:05:59 +0530
Subject: [PATCH 1/3] zipped-order-delivery-963: Updated delivery function in
 orders

---
 .gitignore                       |  2 +-
 planet/order_request.py          |  4 ++++
 tests/unit/test_order_request.py | 26 ++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3088081b9..1f619955f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,6 @@ coverage.xml
 
 # Editors
 .vscode/
-
+.idea/
 # Docs build
 site
diff --git a/planet/order_request.py b/planet/order_request.py
index 51baa9f14..a504b91f1 100644
--- a/planet/order_request.py
+++ b/planet/order_request.py
@@ -199,6 +199,10 @@ def delivery(archive_type: Optional[str] = None,
     if archive_type:
         archive_type = specs.validate_archive_type(archive_type)
 
+        # for missing archive options set single_archive to false
+        if archive_filename is None and single_archive is False:
+            single_archive = True
+
     fields = ['archive_type', 'single_archive', 'archive_filename']
     values = [archive_type, single_archive, archive_filename]
 
diff --git a/tests/unit/test_order_request.py b/tests/unit/test_order_request.py
index 0fc21dbfd..84e551a4d 100644
--- a/tests/unit/test_order_request.py
+++ b/tests/unit/test_order_request.py
@@ -160,6 +160,32 @@ def test_delivery():
     assert delivery_config == expected
 
 
+def test_delivery_missing_archive_details():
+    as3_config = {
+        'amazon_s3': {
+            'aws_access_key_id': 'aws_access_key_id',
+            'aws_secret_access_key': 'aws_secret_access_key',
+            'bucket': 'bucket',
+            'aws_region': 'aws_region'
+        }
+    }
+    delivery_config = order_request.delivery('zip',
+                                             False,
+                                             cloud_config=as3_config)
+
+    expected = {
+        'archive_type': 'zip',
+        'single_archive': True,
+        'amazon_s3': {
+            'aws_access_key_id': 'aws_access_key_id',
+            'aws_secret_access_key': 'aws_secret_access_key',
+            'bucket': 'bucket',
+            'aws_region': 'aws_region'
+        }
+    }
+    assert delivery_config == expected
+
+
 def test_amazon_s3():
     as3_config = order_request.amazon_s3('aws_access_key_id',
                                          'aws_secret_access_key',

From a5dfa0eb7dd94b62523308a2158b41b05a809ca9 Mon Sep 17 00:00:00 2001
From: Jayant Chhillar <jayant17154@iiitd.ac.in>
Date: Thu, 13 Jul 2023 12:03:16 +0530
Subject: [PATCH 2/3] zipped-order-delivery-963: updated unit tests

---
 .gitignore                       | 1 -
 tests/unit/test_order_request.py | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f619955f..7d69a814c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,5 @@ coverage.xml
 
 # Editors
 .vscode/
-.idea/
 # Docs build
 site
diff --git a/tests/unit/test_order_request.py b/tests/unit/test_order_request.py
index 84e551a4d..6c8fd532c 100644
--- a/tests/unit/test_order_request.py
+++ b/tests/unit/test_order_request.py
@@ -169,8 +169,7 @@ def test_delivery_missing_archive_details():
             'aws_region': 'aws_region'
         }
     }
-    delivery_config = order_request.delivery('zip',
-                                             False,
+    delivery_config = order_request.delivery(archive_type='zip',
                                              cloud_config=as3_config)
 
     expected = {

From 8a0e672806dd91cc492412ff7601b33fa1e3eeb5 Mon Sep 17 00:00:00 2001
From: Jayant Chhillar <jayant17154@iiitd.ac.in>
Date: Sun, 16 Jul 2023 18:44:23 +0530
Subject: [PATCH 3/3] zipped-order-delivery-963: updated order request logic

---
 planet/order_request.py          | 6 +++---
 tests/unit/test_order_request.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/planet/order_request.py b/planet/order_request.py
index a504b91f1..f36644ca6 100644
--- a/planet/order_request.py
+++ b/planet/order_request.py
@@ -199,9 +199,9 @@ def delivery(archive_type: Optional[str] = None,
     if archive_type:
         archive_type = specs.validate_archive_type(archive_type)
 
-        # for missing archive options set single_archive to false
-        if archive_filename is None and single_archive is False:
-            single_archive = True
+        # for missing archive file name
+        if archive_filename is None:
+            archive_filename = "{{name}}_{{order_id}}.zip"
 
     fields = ['archive_type', 'single_archive', 'archive_filename']
     values = [archive_type, single_archive, archive_filename]
diff --git a/tests/unit/test_order_request.py b/tests/unit/test_order_request.py
index 6c8fd532c..e702cce72 100644
--- a/tests/unit/test_order_request.py
+++ b/tests/unit/test_order_request.py
@@ -174,7 +174,7 @@ def test_delivery_missing_archive_details():
 
     expected = {
         'archive_type': 'zip',
-        'single_archive': True,
+        'archive_filename': "{{name}}_{{order_id}}.zip",
         'amazon_s3': {
             'aws_access_key_id': 'aws_access_key_id',
             'aws_secret_access_key': 'aws_secret_access_key',