Reorder operations to create service contact before setting email facet

.env

@@ -16,9 +16,10 @@ ID_HOST=id.sfe.localhost
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/sxp/
 SITECORE_TOOLS_REGISTRY=scr.sitecore.com/tools/
 SITECORE_MODULE_REGISTRY=scr.sitecore.com/sxp/modules/
-SITECORE_VERSION=10.1-ltsc2019
-TOOLS_VERSION=10.1-1809
-MANAGEMENT_SERVICES_VERSION=3.0-1809
+SITECORE_VERSION=10.3.2-ltsc2022
+TOOLS_VERSION=10.3-ltsc2022
+MANAGEMENT_SERVICES_VERSION=5.2.123-ltsc2022
+EXTERNAL_IMAGE_TAG_SUFFIX=ltsc2022
 
 SOLR_CORE_PREFIX_NAME=sitecore
 

docker-compose.override.yml

@@ -25,14 +25,18 @@ services:
       - ./docker/traefik:C:/etc/traefik
 
   mssql:
+    image: ${SITECORE_DOCKER_REGISTRY}nonproduction/mssql-developer:2022-${EXTERNAL_IMAGE_TAG_SUFFIX}
     mem_limit: 2GB
     volumes:
       - ${LOCAL_DATA_PATH}\mssql:c:\data
 
   solr:
+    image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.11.2-${EXTERNAL_IMAGE_TAG_SUFFIX}
     mem_limit: 1GB
     volumes:
       - ${LOCAL_DATA_PATH}\solr:c:\data
+    healthcheck:
+      test: ["CMD", "powershell", "-command", "try { $$statusCode = (iwr http://solr:8983/solr/admin/cores?action=STATUS -UseBasicParsing).StatusCode; if ($$statusCode -eq 200) { exit 0 } else { exit 1} } catch { exit 1 }"]
 
   cm:
     image: ${REGISTRY}${COMPOSE_PROJECT_NAME}-xp0-cm:${VERSION:-latest}
@@ -52,7 +56,7 @@ services:
       - ${LOCAL_DATA_PATH}\license:c:\license
     environment:
       SITECORE_LICENSE_LOCATION: c:\license\license.xml
-    entrypoint: powershell -Command "& C:\tools\entrypoints\iis\Development.ps1"
+    entrypoint: powershell -Command "& C:\\tools\\entrypoints\\iis\\Development.ps1"
 
   id:
     volumes:

docker-compose.yml

@@ -39,6 +39,23 @@ services:
       - type: bind
         source: .\mssql-data
         target: c:\data
+  mssql-init:
+    isolation: ${ISOLATION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-xp1-mssql-init:${SITECORE_VERSION}
+    environment:
+      SQL_SERVER: mssql
+      SQL_ADMIN_LOGIN: sa
+      SQL_ADMIN_PASSWORD: ${SQL_SA_PASSWORD}
+      SQL_DATABASE_PREFIX: Sitecore
+      SITECORE_ADMIN_PASSWORD: ${SITECORE_ADMIN_PASSWORD}
+      POST_DEPLOYMENT_WAIT_PERIOD: 300
+    healthcheck:
+      test: ["CMD", "powershell", "-command", "if ([System.Environment]::GetEnvironmentVariable('DatabasesDeploymentStatus', 'Machine') -eq 'Complete') { exit 0 } else { exit 1}"]
+      start_period: 300s
+      interval: 5s
+    depends_on:
+      mssql:
+        condition: service_healthy
   solr:
     isolation: ${ISOLATION}
     image: ${SITECORE_DOCKER_REGISTRY}nonproduction/solr:8.4.0-${SITECORE_VERSION}
@@ -61,7 +78,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -72,10 +89,10 @@ services:
       Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     depends_on:
-      mssql:
+      mssql-init:
         condition: service_healthy
     labels:
       - "traefik.enable=true"
@@ -133,14 +150,15 @@ services:
     ports:
       - "8081:80"
     depends_on:
-      mssql:
+      mssql-init:
         condition: service_healthy
       solr-init:
         condition: service_started
     environment:
       Sitecore_License: ${SITECORE_LICENSE}
       Sitecore_ConnectionStrings_Messaging: Data Source=mssql;Initial Catalog=Sitecore.Messaging;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Processing.Engine.Storage: Data Source=mssql;Initial Catalog=Sitecore.Processing.Engine.Storage;User ID=sa;Password=${SQL_SA_PASSWORD}
+      Sitecore_ConnectionStrings_Processing.Engine.Tasks: Data Source=mssql;Initial Catalog=Sitecore.Processing.Engine.Tasks;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Reporting: Data Source=mssql;Initial Catalog=Sitecore.Reporting;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Xdb.Marketingautomation: Data Source=mssql;Initial Catalog=Sitecore.Marketingautomation;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_ConnectionStrings_Xdb.Processing.Pools: Data Source=mssql;Initial Catalog=Sitecore.Processing.pools;User ID=sa;Password=${SQL_SA_PASSWORD}

sitecorepackagedefinition/Sitecore Forms Extensions.xml

@@ -3,7 +3,7 @@
     <metadata>
       <PackageName>Sitecore Forms Extensions for SC10.3</PackageName>
       <Author>Bart Verdonck</Author>
-      <Version>4.1.1</Version>
+      <Version>4.1.2</Version>
       <Revision />
       <License />
       <Comment />

src/Feature/FormsExtensions/code/Feature.FormsExtensions.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SitecoreFormsExtensions.Core</id>
-    <version>4.1.1</version>
+    <version>4.1.2</version>
     <title>$title$</title>
     <authors>Bart Verdonck</authors>
     <owners>$author$</owners>

src/Feature/FormsExtensions/code/Properties/AssemblyInfo.cs

@@ -3,7 +3,7 @@
 
 [assembly: AssemblyTitle("SitecoreFormsExtentions.Core")]
 [assembly: Guid("df75115a-6f76-41c6-b61f-3772e523e78e")]
-[assembly: AssemblyVersion("4.1.1")]
+[assembly: AssemblyVersion("4.1.2")]
 [assembly: AssemblyCompany("Bart Verdonck")]
 [assembly: AssemblyProduct("")]
 [assembly: AssemblyDescription("Sitecore Forms Extensions is a module to enrich the default Sitecore Forms module. This library does not intall the module, it only provides the classes and interfaces to extends on Sitecore Forms Extentions.")]

src/Feature/FormsExtensions/code/XDb/Repository/XDbContactRepository.cs

@@ -97,8 +97,8 @@ public void UpdateOrCreateXDbServiceContactWithEmail(IXDbContactWithEmail servic
                 if (contact == null)
                 {
                     contact = new Contact(new ContactIdentifier(reference.Source,reference.Identifier,ContactIdentifierType.Known));
-                    SetEmail(contact, serviceContact, client);
                     client.AddContact(contact);
+                    SetEmail(contact, serviceContact, client);
                     client.Submit();
                 }
                 else if (contact.Emails()?.PreferredEmail.SmtpAddress != serviceContact.Email)