fix: catch tendon and link as warning (#538)

Author: bjoernsteinhagen

Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs

@@ -125,9 +125,13 @@ private SendConversionResult ConvertCsiObject(ICsiWrapper csiObject, Collection
     string sourceType = csiObject.ObjectName;
     string applicationId = csiObject switch
     {
-      CsiFrameWrapper frameWrapper => frameWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
       CsiJointWrapper jointWrapper => jointWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiFrameWrapper frameWrapper => frameWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiCableWrapper cableWrapper => cableWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiTendonWrapper tendonWrapper => tendonWrapper.ObjectName, // No GetGUID method in the Csi API available
       CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiSolidWrapper solidWrapper => solidWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiLinkWrapper linkWrapper => linkWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
       _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject))
     };
 
@@ -140,6 +144,16 @@ private SendConversionResult ConvertCsiObject(ICsiWrapper csiObject, Collection
 
       return new(Status.SUCCESS, applicationId, sourceType, converted);
     }
+    // Expected not implemented:
+    // TODO: SAP 2000: CsiCableWrapper, CsiSolidWrapper
+    // TODO: ETABS: CsiLinkWrapper, CsiTendonWrapper
+    // NOTE: CsiLinkWrapper - not important to data extraction workflow
+    // NOTE: CsiTendonWrapper - not typically modelled in ETABS, rather SAFE
+    catch (NotImplementedException ex)
+    {
+      _logger.LogError(ex, sourceType);
+      return new(Status.WARNING, applicationId, sourceType, null, ex);
+    }
     catch (Exception ex) when (!ex.IsFatal())
     {
       _logger.LogError(ex, sourceType);

Converters/CSi/Speckle.Converters.CSiShared/Extensions/SpeckleApplicationIdExtensions.cs

@@ -2,6 +2,16 @@ namespace Speckle.Converters.CSiShared.Extensions;
 
 public static class SpeckleApplicationIdExtensions
 {
+  /// <summary>
+  /// Retrieves the Speckle object application id for a joint object
+  /// </summary>
+  public static string GetSpeckleApplicationId(this CsiJointWrapper wrapper, cSapModel sapModel)
+  {
+    string applicationId = string.Empty;
+    _ = sapModel.PointObj.GetGUID(wrapper.Name, ref applicationId);
+    return applicationId;
+  }
+
   /// <summary>
   /// Retrieves the Speckle object application id for a frame object
   /// </summary>
@@ -13,12 +23,12 @@ public static string GetSpeckleApplicationId(this CsiFrameWrapper wrapper, cSapM
   }
 
   /// <summary>
-  /// Retrieves the Speckle object application id for a joint object
+  /// Retrieves the Speckle object application id for a cable object
   /// </summary>
-  public static string GetSpeckleApplicationId(this CsiJointWrapper wrapper, cSapModel sapModel)
+  public static string GetSpeckleApplicationId(this CsiCableWrapper wrapper, cSapModel sapModel)
   {
     string applicationId = string.Empty;
-    _ = sapModel.PointObj.GetGUID(wrapper.Name, ref applicationId);
+    _ = sapModel.CableObj.GetGUID(wrapper.Name, ref applicationId);
     return applicationId;
   }
 
@@ -31,4 +41,24 @@ public static string GetSpeckleApplicationId(this CsiShellWrapper wrapper, cSapM
     _ = sapModel.AreaObj.GetGUID(wrapper.Name, ref applicationId);
     return applicationId;
   }
+
+  /// <summary>
+  /// Retrieves the Speckle object application id for a solid object
+  /// </summary>
+  public static string GetSpeckleApplicationId(this CsiSolidWrapper wrapper, cSapModel sapModel)
+  {
+    string applicationId = string.Empty;
+    _ = sapModel.SolidObj.GetGUID(wrapper.Name, ref applicationId);
+    return applicationId;
+  }
+
+  /// <summary>
+  /// Retrieves the Speckle object application id for a link object
+  /// </summary>
+  public static string GetSpeckleApplicationId(this CsiLinkWrapper wrapper, cSapModel sapModel)
+  {
+    string applicationId = string.Empty;
+    _ = sapModel.LinkObj.GetGUID(wrapper.Name, ref applicationId);
+    return applicationId;
+  }
 }

Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/SharedPropertiesExtractor.cs

@@ -57,15 +57,22 @@ public PropertyExtractionResult Extract(ICsiWrapper wrapper)
 
     switch (wrapper)
     {
-      case CsiFrameWrapper frame:
-        _csiFramePropertiesExtractor.ExtractProperties(frame, objectData);
-        break;
       case CsiJointWrapper joint:
         _csiJointPropertiesExtractor.ExtractProperties(joint, objectData);
         break;
+      case CsiFrameWrapper frame:
+        _csiFramePropertiesExtractor.ExtractProperties(frame, objectData);
+        break;
       case CsiShellWrapper shell:
         _csiShellPropertiesExtractor.ExtractProperties(shell, objectData);
         break;
+      case CsiTendonWrapper:
+      case CsiLinkWrapper:
+      case CsiCableWrapper:
+      case CsiSolidWrapper:
+        throw new NotImplementedException($"Data extraction for {wrapper.ObjectName} not yet supported.");
+      default:
+        throw new ArgumentException($"Unsupported wrapper type: {nameof(wrapper)}");
     }
 
     return objectData;