[FEATURE#128384] fix(SprinterService): Les options libres sont mergée…

…s avec les params
etna-alternance · Jun 27, 2019 · 5b3a5ee · 5b3a5ee
1 parent ab42c72
commit 5b3a5ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -53,7 +53,8 @@ public function jeVeuxEnvoyerLeTemplateAvecLeStudent($template, $student_array)
             function () use ($container, $template, $file, $student) {
                 $sprinter = $container->get('sprinter.sprinter_service');
                 $routing_key = $sprinter->getDefaultRoutingKey();
-                $sprinter->sendPrint($template, $file, false, $routing_key, $student);
+                $opts        = ["to test opts add" => "we put any shit on it"];
+                $sprinter->sendPrint($template, $file, false, $routing_key, $student, $opts);
             }
         );
     }
@@ -70,9 +71,10 @@ public function jeVeuxEnvoyerLeTemplateAvecLeStudentEtUnPrintFlagMoisi($template
         $student   = include $path_to_student;
         $this->getContext("ETNA\FeatureContext\ExceptionContainerContext")->try(
             function () use ($container, $template, $file, $student) {
-                $sprinter = $container->get('sprinter.sprinter_service');
+                $sprinter    = $container->get('sprinter.sprinter_service');
                 $routing_key = $sprinter->getDefaultRoutingKey();
-                $sprinter->sendPrint($template, $file, "\xB1\x31", $routing_key, $student);
+                $opts        = ["to test opts add" => "we put any shit on it"];
+                $sprinter->sendPrint($template, $file, "\xB1\x31", $routing_key, $student, $opts);
             }
         );
     }

diff --git a/features/suites/results/sprinter_body.json b/features/suites/results/sprinter_body.json
@@ -8,5 +8,5 @@
         "Content": "c3R1ZGVudF9pZDtzdHVkZW50X3VzZXJfaWQ7c3R1ZGVudF9wcm9zcGVjdF9pZDtzdHVkZW50X2xvZ2luO3N0dWRlbnRfYmlydGhkYXk7c3R1ZGVudF9iaXJ0aGRheV9wbGFjZTtzdHVkZW50X25hdGlvbmFsaXR5O3N0dWRlbnRfZW1haWxfZXRuYTtzdHVkZW50X3RlbF9wcm87c3R1ZGVudF9tb2JpbGVfcHJvO3N0dWRlbnRfbWVsZWU7c3R1ZGVudF9iYWNfc2VyaWU7c3R1ZGVudF9iYWNfeWVhcjtzdHVkZW50X2xlYXJuaW5nX29yaWdpbjtzdHVkZW50X3NjaG9vbF9vcmlnaW47c3R1ZGVudF9sZWFybmluZ19hY2NvbXBsaXNoZWQ7c3R1ZGVudF9pbl9ldG5hX2RhdGU7c3R1ZGVudF9vdXRfZXRuYV9kYXRlO3N0dWRlbnRfc29jaWFsX29yZ2FuaXphdGlvbjtzdHVkZW50X3NvY2lhbF9udW1iZXI7c3R1ZGVudF9zb2NpYWxfc2l0dWF0aW9uO3N0dWRlbnRfc29jaWFsX2NvbXBsZW1lbnQ7c3R1ZGVudF9pbnN1cmVyO3N0dWRlbnRfaW5zdXJhbmNlX251bWJlcjtzdHVkZW50X3JlZmVyZW50O3N0dWRlbnRfY2xvc2U7c3R1ZGVudF9yZXNpZGVuY2VfcGVybWl0X2V4cGlyYXRpb247c3R1ZGVudF9wcm9zcGVjdF91cmw7Y29udGFjdHNfZmF0aGVyX3NhbHV0YXRpb247Y29udGFjdHNfZmF0aGVyX2xhc3RuYW1lO2NvbnRhY3RzX2ZhdGhlcl9maXJzdG5hbWU7Y29udGFjdHNfZmF0aGVyX2VtYWlsO2NvbnRhY3RzX2ZhdGhlcl90ZWw7Y29udGFjdHNfZmF0aGVyX21vYmlsZTtjb250YWN0c19mYXRoZXJfYWRkcmVzczE7Y29udGFjdHNfZmF0aGVyX2FkZHJlc3MyO2NvbnRhY3RzX2ZhdGhlcl96aXBfY29kZTtjb250YWN0c19mYXRoZXJfY2l0eTtjb250YWN0c19mYXRoZXJfY291bnRyeTtjb250YWN0c19tb3RoZXJfc2FsdXRhdGlvbjtjb250YWN0c19tb3RoZXJfbGFzdG5hbWU7Y29udGFjdHNfbW90aGVyX2ZpcnN0bmFtZTtjb250YWN0c19tb3RoZXJfZW1haWw7Y29udGFjdHNfbW90aGVyX3RlbDtjb250YWN0c19tb3RoZXJfbW9iaWxlO2NvbnRhY3RzX21vdGhlcl9hZGRyZXNzMTtjb250YWN0c19tb3RoZXJfYWRkcmVzczI7Y29udGFjdHNfbW90aGVyX3ppcF9jb2RlO2NvbnRhY3RzX21vdGhlcl9jaXR5O2NvbnRhY3RzX21vdGhlcl9jb3VudHJ5O2NvbnRhY3RzX2VtZXJnZW5jeV9zYWx1dGF0aW9uO2NvbnRhY3RzX2VtZXJnZW5jeV9sYXN0bmFtZTtjb250YWN0c19lbWVyZ2VuY3lfZmlyc3RuYW1lO2NvbnRhY3RzX2VtZXJnZW5jeV9lbWFpbDtjb250YWN0c19lbWVyZ2VuY3lfdGVsO2NvbnRhY3RzX2VtZXJnZW5jeV9tb2JpbGU7Y29udGFjdHNfZW1lcmdlbmN5X2FkZHJlc3MxO2NvbnRhY3RzX2VtZXJnZW5jeV9hZGRyZXNzMjtjb250YWN0c19lbWVyZ2VuY3lfemlwX2NvZGU7Y29udGFjdHNfZW1lcmdlbmN5X2NpdHk7Y29udGFjdHNfZW1lcmdlbmN5X2NvdW50cnk7c3R1ZGVudF9zYWx1dGF0aW9uO3N0dWRlbnRfbGFzdG5hbWU7c3R1ZGVudF9maXJzdG5hbWU7c3R1ZGVudF9lbWFpbDtzdHVkZW50X3RlbDtzdHVkZW50X21vYmlsZTtzdHVkZW50X2FkZHJlc3MxO3N0dWRlbnRfYWRkcmVzczI7c3R1ZGVudF96aXBfY29kZTtzdHVkZW50X2NpdHk7c3R1ZGVudF9jb3VudHJ5O2xhc3RfdGVybV9pZDtsYXN0X3Rlcm1fdGVybV9uYW1lO2xhc3RfdGVybV9wcm9tbztsYXN0X3Rlcm1fc3BlO2xhc3RfdGVybV9sZWFybmluZ19zdGFydDtsYXN0X3Rlcm1fbGVhcm5pbmdfZW5kO2xhc3RfdGVybV9yZXNpZ25hdGlvbl9kYXRlO2xhc3RfdGVybV9zdGF0dXM7bGFzdF90ZXJtX2NyZWF0ZWRfYXQ7bGFzdF90ZXJtX3ZhbGlkYXRlZF9hdDtsYXN0X3Rlcm1fZGVuaWVkX2F0CjI7Mjs7YW5jZXNjX2w7MTk4My0wMy0wNFQwMDowMDowMCswMDowMDsiQm9uZHkgKDkzKSI7RlJBTkNBSVNFO2FuY2VzY19sQGV0bmEtYWx0ZXJuYW5jZS5uZXQ7Ozs7Ozs7O0JBQzsyMDAwLTAxLTAxVDAwOjAwOjAwKzAwOjAwOzIwMDktMDYtMDZUMDA6MDA6MDArMDA6MDA7Ozs7Ozs7Ozs7O01vbnNpZXVyOzs7Ozs7Ozs7OztNYWRhbWU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7TW9uc2lldXI7QU5DRVNDSEk7TGF1cmVudDsibGF1cmVudC5hbmNlc2NoaUBnbWFpbC5jb20gIjswNjI1MjYzNTMxOzsiMzEsIGF2ZW51ZSBNYXJpZSBDdXJpZSAiOzs3NzYwMDsiQlVTU1kgU1QgR0VPUkdFUyI7RlJBTkNFOzQ7ZXRuYTM7MjAwODtJRFY7MjAwNy0wOS0wMVQwMDowMDowMCswMDowMDsyMDA4LTA4LTMxVDAwOjAwOjAwKzAwOjAwOzt2YWxpZDsyMDE1LTAyLTE4VDE0OjU4OjI1KzAwOjAwOzs="
     },
     "printflag": false,
-    "opts": []
+    "to test opts add": "we put any shit on it"
 }
diff --git a/src/Services/SprinterService.php b/src/Services/SprinterService.php
@@ -90,10 +90,12 @@ public function sendPrint(
             'template'   => $template,
             'data'       => $data,
             'printflag'  => $print_flag,
-            'opts'       => $sprinter_opts,
         ];
-        $routing_key      = $routing_key ?: $this->routing_key;
-        $msgBody          = json_encode($params);
+        if (!empty($sprinter_opts)) {
+            $params = array_merge($params, $sprinter_opts);
+        }
+        $routing_key = $routing_key ?: $this->routing_key;
+        $msgBody     = json_encode($params);
         if (false === $msgBody) {
             throw new \Exception(
                 'Encoding message to producer failed',