From 33875ded1f566fa579869862489c74a82c20a03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= <joern.berkefeld@accenture.com>
Date: Wed, 22 Mar 2023 19:19:31 +0100
Subject: [PATCH] #139: remove Marketing Cloud role, add TimeZone and LocalCode

---
 .../user/testExisting_user.user-meta.json     |  7 +++--
 .../user/testNew_user.user-meta.json          |  8 ++----
 .../1111111/accountUser/create-response.xml   | 26 ++++++++---------
 .../1111111/accountUser/retrieve-response.xml | 28 ++++++++-----------
 .../1111111/accountUser/update-response.xml   | 26 ++++++++---------
 .../1111111/user/build-expected.json          |  4 ++-
 .../1111111/user/create-expected.json         |  8 ++----
 .../1111111/user/retrieve-expected.json       |  4 ++-
 .../1111111/user/template-expected.json       |  4 ++-
 .../1111111/user/update-expected.json         |  8 ++----
 10 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/test/mockRoot/deploy/testInstance/_ParentBU_/user/testExisting_user.user-meta.json b/test/mockRoot/deploy/testInstance/_ParentBU_/user/testExisting_user.user-meta.json
index ed9adbbb5..7e0eaa58f 100644
--- a/test/mockRoot/deploy/testInstance/_ParentBU_/user/testExisting_user.user-meta.json
+++ b/test/mockRoot/deploy/testInstance/_ParentBU_/user/testExisting_user.user-meta.json
@@ -25,7 +25,8 @@
     "c__RoleNamesGlobal": [
         "Administrator",
         "Distributed Sending User",
-        "Individual role for 700301950",
-        "Marketing Cloud Administrator"
-    ]
+        "Individual role for 700301950"
+    ],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/mockRoot/deploy/testInstance/_ParentBU_/user/testNew_user.user-meta.json b/test/mockRoot/deploy/testInstance/_ParentBU_/user/testNew_user.user-meta.json
index 9235cabfe..d87c38774 100644
--- a/test/mockRoot/deploy/testInstance/_ParentBU_/user/testNew_user.user-meta.json
+++ b/test/mockRoot/deploy/testInstance/_ParentBU_/user/testNew_user.user-meta.json
@@ -22,9 +22,7 @@
     "DefaultBusinessUnit": 1111111,
     "c__type": "User",
     "c__AssociatedBusinessUnits": [1111111, 9999999],
-    "c__RoleNamesGlobal": [
-        "Administrator",
-        "Distributed Sending User",
-        "Marketing Cloud Administrator"
-    ]
+    "c__RoleNamesGlobal": ["Administrator", "Distributed Sending User"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/resources/1111111/accountUser/create-response.xml b/test/resources/1111111/accountUser/create-response.xml
index c1ada6757..84a6f108e 100644
--- a/test/resources/1111111/accountUser/create-response.xml
+++ b/test/resources/1111111/accountUser/create-response.xml
@@ -43,6 +43,17 @@
                     <NotificationEmailAddress>testNew_user@accenture.com</NotificationEmailAddress>
                     <IsLocked>false</IsLocked>
                     <DefaultBusinessUnit>1111111</DefaultBusinessUnit>
+                    <Locale>
+                        <PartnerKey xsi:nil="true" />
+                        <ObjectID xsi:nil="true" />
+                        <LocaleCode>en-GB</LocaleCode>
+                    </Locale>
+                    <TimeZone>
+                        <PartnerKey xsi:nil="true" />
+                        <ID>5</ID>
+                        <ObjectID xsi:nil="true" />
+                        <Name>(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *</Name>
+                    </TimeZone>
                     <Roles>
                         <Role>
                             <Client>
@@ -74,21 +85,6 @@
                                 </AssignmentConfiguration>
                             </AssignmentConfigurations>
                         </Role>
-                        <Role>
-                            <Client>
-                                <ID>1111111</ID>
-                                <EnterpriseID>1111111</EnterpriseID>
-                            </Client>
-                            <PartnerKey xsi:nil="true" />
-                            <ObjectID>63a50610-315c-e111-beee-8e001800001f</ObjectID>
-                            <Name>Marketing Cloud Administrator</Name>
-                            <AssignmentConfigurations>
-                                <AssignmentConfiguration>
-                                    <AccountUserId>717510285</AccountUserId>
-                                    <AssignmentConfigureType>RoleUser</AssignmentConfigureType>
-                                </AssignmentConfiguration>
-                            </AssignmentConfigurations>
-                        </Role>
                     </Roles>
                 </Object>
             </Results>
diff --git a/test/resources/1111111/accountUser/retrieve-response.xml b/test/resources/1111111/accountUser/retrieve-response.xml
index 14b6357c4..8e3ea8c94 100644
--- a/test/resources/1111111/accountUser/retrieve-response.xml
+++ b/test/resources/1111111/accountUser/retrieve-response.xml
@@ -68,6 +68,17 @@
                     <AccountType>None</AccountType>
                     <Subscription xsi:nil="true" />
                 </DefaultBusinessUnitObject>
+                <Locale>
+                    <PartnerKey xsi:nil="true" />
+                    <ObjectID xsi:nil="true" />
+                    <LocaleCode>en-GB</LocaleCode>
+                </Locale>
+                <TimeZone>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>5</ID>
+                    <ObjectID xsi:nil="true" />
+                    <Name>(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *</Name>
+                </TimeZone>
                 <Roles>
                     <Role>
                         <Client>
@@ -120,23 +131,6 @@
                         <IsPrivate>true</IsPrivate>
                         <IsSystemDefined>false</IsSystemDefined>
                     </Role>
-                    <Role>
-                        <Client>
-                            <ID>0</ID>
-                            <CreatedBy>0</CreatedBy>
-                            <ModifiedBy>0</ModifiedBy>
-                            <EnterpriseID>0</EnterpriseID>
-                        </Client>
-                        <PartnerKey xsi:nil="true" />
-                        <CreatedDate>2012-02-21T02:09:19.983</CreatedDate>
-                        <ModifiedDate>2013-12-23T16:48:50.533</ModifiedDate>
-                        <ObjectID>63a50610-315c-e111-beee-8e001800001f</ObjectID>
-                        <CustomerKey>SYS_DEF_IMHADMIN</CustomerKey>
-                        <Name>Marketing Cloud Administrator</Name>
-                        <Description>Assign Marketing Cloud roles to users and manage Mobile, Social and Sites Channels, Hub Apps and Marketing Cloud Tools</Description>
-                        <IsPrivate>false</IsPrivate>
-                        <IsSystemDefined>true</IsSystemDefined>
-                    </Role>
                 </Roles>
             </Results>
         </RetrieveResponseMsg>
diff --git a/test/resources/1111111/accountUser/update-response.xml b/test/resources/1111111/accountUser/update-response.xml
index 879e4da4d..14584ee76 100644
--- a/test/resources/1111111/accountUser/update-response.xml
+++ b/test/resources/1111111/accountUser/update-response.xml
@@ -43,6 +43,17 @@
                     <NotificationEmailAddress>user_test@accenture.com</NotificationEmailAddress>
                     <IsLocked>false</IsLocked>
                     <DefaultBusinessUnit>9999999</DefaultBusinessUnit>
+                    <Locale>
+                        <PartnerKey xsi:nil="true" />
+                        <ObjectID xsi:nil="true" />
+                        <LocaleCode>en-GB</LocaleCode>
+                    </Locale>
+                    <TimeZone>
+                        <PartnerKey xsi:nil="true" />
+                        <ID>5</ID>
+                        <ObjectID xsi:nil="true" />
+                        <Name>(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *</Name>
+                    </TimeZone>
                     <Roles>
                         <Role>
                             <Client>
@@ -89,21 +100,6 @@
                                 </AssignmentConfiguration>
                             </AssignmentConfigurations>
                         </Role>
-                        <Role>
-                            <Client>
-                                <ID>1111111</ID>
-                                <EnterpriseID>1111111</EnterpriseID>
-                            </Client>
-                            <PartnerKey xsi:nil="true" />
-                            <ObjectID>63a50610-315c-e111-beee-8e001800001f</ObjectID>
-                            <Name>Marketing Cloud Administrator</Name>
-                            <AssignmentConfigurations>
-                                <AssignmentConfiguration>
-                                    <AccountUserId>700301950</AccountUserId>
-                                    <AssignmentConfigureType>RoleUser</AssignmentConfigureType>
-                                </AssignmentConfiguration>
-                            </AssignmentConfigurations>
-                        </Role>
                     </Roles>
                 </Object>
             </Results>
diff --git a/test/resources/1111111/user/build-expected.json b/test/resources/1111111/user/build-expected.json
index 2fd3e232c..dea03643d 100644
--- a/test/resources/1111111/user/build-expected.json
+++ b/test/resources/1111111/user/build-expected.json
@@ -11,5 +11,7 @@
     "DefaultBusinessUnit": "1111111",
     "c__type": "User",
     "c__AssociatedBusinessUnits": ["1111111", "1111111"],
-    "c__RoleNamesGlobal": ["Administrator", "Content Creator", "Marketing Cloud Administrator"]
+    "c__RoleNamesGlobal": ["Administrator", "Content Creator"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/resources/1111111/user/create-expected.json b/test/resources/1111111/user/create-expected.json
index 55b958881..6c85e3c6b 100644
--- a/test/resources/1111111/user/create-expected.json
+++ b/test/resources/1111111/user/create-expected.json
@@ -11,9 +11,7 @@
     "DefaultBusinessUnit": 1111111,
     "c__type": "User",
     "c__AssociatedBusinessUnits": [1111111, 9999999],
-    "c__RoleNamesGlobal": [
-        "Administrator",
-        "Distributed Sending User",
-        "Marketing Cloud Administrator"
-    ]
+    "c__RoleNamesGlobal": ["Administrator", "Distributed Sending User"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/resources/1111111/user/retrieve-expected.json b/test/resources/1111111/user/retrieve-expected.json
index 2e95ff343..1a6b2bd2b 100644
--- a/test/resources/1111111/user/retrieve-expected.json
+++ b/test/resources/1111111/user/retrieve-expected.json
@@ -14,5 +14,7 @@
     "DefaultBusinessUnit": 1111111,
     "c__type": "User",
     "c__AssociatedBusinessUnits": [1111111, 9999999],
-    "c__RoleNamesGlobal": ["Administrator", "Content Creator", "Marketing Cloud Administrator"]
+    "c__RoleNamesGlobal": ["Administrator", "Content Creator"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/resources/1111111/user/template-expected.json b/test/resources/1111111/user/template-expected.json
index 5e39be1f7..1d63801d9 100644
--- a/test/resources/1111111/user/template-expected.json
+++ b/test/resources/1111111/user/template-expected.json
@@ -11,5 +11,7 @@
     "DefaultBusinessUnit": "1111111",
     "c__type": "User",
     "c__AssociatedBusinessUnits": ["1111111", "{{{mid}}}"],
-    "c__RoleNamesGlobal": ["Administrator", "Content Creator", "Marketing Cloud Administrator"]
+    "c__RoleNamesGlobal": ["Administrator", "Content Creator"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }
diff --git a/test/resources/1111111/user/update-expected.json b/test/resources/1111111/user/update-expected.json
index f40d76eba..47952650d 100644
--- a/test/resources/1111111/user/update-expected.json
+++ b/test/resources/1111111/user/update-expected.json
@@ -11,9 +11,7 @@
     "DefaultBusinessUnit": 9999999,
     "c__type": "User",
     "c__AssociatedBusinessUnits": [9999999],
-    "c__RoleNamesGlobal": [
-        "Administrator",
-        "Distributed Sending User",
-        "Marketing Cloud Administrator"
-    ]
+    "c__RoleNamesGlobal": ["Administrator", "Distributed Sending User"],
+    "c__TimeZoneName": "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna *",
+    "c__LocaleCode": "en-GB"
 }