Merge pull request #375 from atlanhq/DVX-126

Fix bug in asset import where typeName is first column
atlanhq · Dec 9, 2023 · 417f744 · 417f744
2 parents da061d8 + cea7087
commit 417f744
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/serde/RowDeserializer.kt b/package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/serde/RowDeserializer.kt
@@ -30,8 +30,8 @@ class RowDeserializer(
     val row: List<String>,
     private val typeIdx: Int = -1,
     private val qnIdx: Int = -1,
-    private val typeName: String = row.getOrElse(typeIdx) { "" },
-    private val qualifiedName: String = row.getOrElse(qnIdx) { "" },
+    val typeName: String = row.getOrElse(typeIdx) { "" },
+    val qualifiedName: String = row.getOrElse(qnIdx) { "" },
     private val logger: KLogger,
     private val skipColumns: Set<String>,
 ) {
@@ -116,7 +116,7 @@ class RowDeserializer(
     fun getValue(fieldName: String): Any? {
         if (fieldName.isNotBlank()) {
             val i = heading.indexOf(fieldName)
-            if (i > 0) {
+            if (i >= 0) {
                 val rValue = row[i]
                 return if (fieldName.contains(CM_HEADING_DELIMITER)) {
                     // Custom metadata field...

diff --git a/samples/packages/asset-import/src/main/kotlin/com/atlan/pkg/aim/AssetImporter.kt b/samples/packages/asset-import/src/main/kotlin/com/atlan/pkg/aim/AssetImporter.kt
@@ -36,8 +36,8 @@ class AssetImporter(
 ) {
     /** {@inheritDoc} */
     override fun getBuilder(deserializer: RowDeserializer): Asset.AssetBuilder<*, *> {
-        val typeName = deserializer.getValue(Asset.TYPE_NAME.atlanFieldName)?.let { it as String } ?: ""
-        return FieldSerde.getBuilderForType(typeName)
+        val typeName = deserializer.typeName
+        return FieldSerde.getBuilderForType(typeName).qualifiedName(deserializer.qualifiedName)
     }
 
     /** {@inheritDoc} */