Bug fix for POCOAutomation

Author: sgiffinlcd

src/Standard/CodeFactory.Automation.Standard.Logic/CodeFactory.Automation.Standard.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" >
 	<metadata>
 		<id>CodeFactory.Automation.Standard.Logic</id>
-		<version>2.23164.1-PreRelease</version>
+		<version>2.23165.1-PreRelease</version>
 		<title>Standard automation logic to be used with CodeFactory Commands.</title>
 		<authors>CodeFactory, LLC.</authors>
 		<owners>CodeFactory, LLC.</owners>
@@ -18,6 +18,8 @@
 			- Add Missing interface members.
 			  - Added loglLevel optional prameter sets logging level when logging in methods and properties.
 			  - added tryBlock optional parameter that sets the try,catch,finally logic for methods. If not provided will use the default built in logic. 
+		    - POCOAutomation
+			  - Fixed type check logic error.
 		</releaseNotes>
 		<copyright>Copyright © 2023 CodeFactory, LLC.</copyright>
 		<tags>Factory Automation</tags>

src/Standard/CodeFactory.Automation.Standard.Logic/POCOAutomation.cs

@@ -284,14 +284,13 @@ private static async Task<CsClass> UpdatePOCOAsync(this IVsActions source, CsCla
 
                         if (targetPocoModel == null)
                         {
-                            var sourceModelClass = propertyToAdd.PropertyType.GetClassModel();
+                            var sourceModelClass = propertyToAdd.PropertyType.GetClassModel() ?? throw new CodeFactoryException(
+                                    $"Could not load the data model '{propertyToAdd.PropertyType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
 
-                            if (sourceModelClass == null)
-                                throw new CodeFactoryException(
-                                    $"Could not the data model '{propertyToAdd.PropertyType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
+                            if (sourceModelClass.IsLoaded == false) throw new CodeFactoryException($"Could not load the data model '{propertyToAdd.PropertyType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
 
                             await source.RefreshPOCOAsync(sourceModelClass, pocoProject, defaultNamespaces, pocoFolder,
-                                pocoSummary, convertNullableTypes);
+                                $"POCO data class that supports '{sourceModelClass.Name}'", convertNullableTypes);
                         }
                     }
                 }
@@ -301,21 +300,24 @@ await source.RefreshPOCOAsync(sourceModelClass, pocoProject, defaultNamespaces,
                     //Checking to make sure other source class objects used by the poco also have poco's created.
                     foreach (var propGenericType in propertyToAdd.PropertyType.GenericTypes)
                     {
-                        if (propGenericType.Name != sourceClass.Name)
+                        //Checking to make sure other source class objects used by the poco also have poco's created.
+                        if (propGenericType.TypeInTargetNamespace(sourceClass.Namespace))
                         {
-                            var targetPocoModel =
-                                await pocoProject.FindCSharpSourceByClassNameAsync(propGenericType.Name);
-
-                            if (targetPocoModel == null)
+                            if (propGenericType.Name != sourceClass.Name)
                             {
-                                var sourceModelClass = propGenericType.GetClassModel();
+                                var targetPocoModel =
+                                    await pocoProject.FindCSharpSourceByClassNameAsync(propGenericType.Name);
+
+                                if (targetPocoModel == null)
+                                {
+                                    var sourceModelClass = propGenericType.GetClassModel() ?? throw new CodeFactoryException(
+                                            $"Could not load the data model '{propertyToAdd.PropertyType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
 
-                                if (sourceModelClass == null)
-                                    throw new CodeFactoryException(
-                                        $"Could not the data model '{propGenericType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
+                                    if (sourceModelClass.IsLoaded == false) throw new CodeFactoryException($"Could not load the data model '{propertyToAdd.PropertyType.Name}' could not refresh the poco model, cannot update the POCO class '{pocoClass.Name}'.");
 
-                                await source.RefreshPOCOAsync(sourceModelClass, pocoProject, defaultNamespaces,
-                                    pocoFolder, pocoSummary, convertNullableTypes);
+                                    await source.RefreshPOCOAsync(sourceModelClass, pocoProject, defaultNamespaces, pocoFolder,
+                                        $"POCO data class that supports '{sourceModelClass.Name}'", convertNullableTypes);
+                                }
                             }
                         }
                     }

src/Standard/CodeFactory.Automation.Standard.Logic/Properties/AssemblyInfo.cs

@@ -34,6 +34,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.23164.0.1")]
+[assembly: AssemblyFileVersion("2.23165.0.1")]
 [assembly: AssemblyCFEnvironment("CFVSW")]
 [assembly: AssemblyCFSdkVersion("2.23160.0.1")]