From 76c642e4b334ed49fc1e372481a32ca32804d841 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Mon, 16 Sep 2019 15:08:22 +0300
Subject: [PATCH] Lowered code dup in get_result_event

---
 .../communicate_as_new_user.py                | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/communicate_as_new_user.py b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/communicate_as_new_user.py
index 0c36b7b94..a48c3598a 100644
--- a/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/communicate_as_new_user.py
+++ b/monkey/monkey_island/cc/services/telemetry/zero_trust_tests/communicate_as_new_user.py
@@ -3,6 +3,10 @@ from common.data.zero_trust_consts import EVENT_TYPE_MONKEY_NETWORK, STATUS_FAIL
 from monkey_island.cc.models.zero_trust.aggregate_finding import AggregateFinding
 from monkey_island.cc.models.zero_trust.event import Event
 
+COMM_AS_NEW_USER_FAILED_FORMAT = "Monkey on {} couldn't communicate as new user. Details: {}"
+COMM_AS_NEW_USER_SUCCEEDED_FORMAT = \
+    "New user created by Monkey on {} successfully tried to communicate with the internet. Details: {}"
+
 
 def test_new_user_communication(current_monkey, success, message):
     AggregateFinding.create_or_add_to_existing(
@@ -24,16 +28,9 @@ def get_attempt_event(current_monkey):
 
 
 def get_result_event(current_monkey, message, success):
-    if success:
-        event_to_append = Event.create_event(
-            title="Communicate as new user",
-            message="New user created by Monkey on {} successfully tried to communicate with the internet. "
-                    "Details: {}".format(current_monkey.hostname, message),
-            event_type=EVENT_TYPE_MONKEY_NETWORK)
-    else:
-        event_to_append = Event.create_event(
-            title="Communicate as new user",
-            message="Monkey on {} couldn't communicate as new user. Details: {}".format(
-                current_monkey.hostname, message),
-            event_type=EVENT_TYPE_MONKEY_NETWORK)
-    return event_to_append
+    message_format = COMM_AS_NEW_USER_SUCCEEDED_FORMAT if success else COMM_AS_NEW_USER_FAILED_FORMAT
+
+    return Event.create_event(
+        title="Communicate as new user",
+        message=message_format.format(current_monkey.hostname, message),
+        event_type=EVENT_TYPE_MONKEY_NETWORK)