[Domain] infer imported layout and validation

CMakeLists.txt

@@ -71,10 +71,14 @@ add_library(safecrowd_domain STATIC
     src/domain/DxfImportService.h
     src/domain/DxfImportService.cpp
     src/domain/FacilityLayout2D.h
+    src/domain/FacilityLayoutBuilder.h
+    src/domain/FacilityLayoutBuilder.cpp
     src/domain/ImportIssue.h
     src/domain/ImportIssue.cpp
     src/domain/ImportResult.h
     src/domain/ImportOrchestrator.h
+    src/domain/ImportValidationService.h
+    src/domain/ImportValidationService.cpp
     src/domain/ImportContracts.h
 )
 
@@ -104,6 +108,7 @@ if (BUILD_TESTING)
         tests/EcsCoreTests.cpp
         tests/ImportContractsTests.cpp
         tests/DxfImportServiceTests.cpp
+        tests/FacilityLayoutBuilderTests.cpp
         tests/WorldQueryTests.cpp
     )
 

src/domain/DxfImportService.cpp

@@ -12,6 +12,9 @@
 #include <utility>
 #include <vector>
 
+#include "domain/FacilityLayoutBuilder.h"
+#include "domain/ImportValidationService.h"
+
 namespace safecrowd::domain {
 namespace {
 
@@ -248,6 +251,32 @@ std::vector<std::string> collectSourceIds(const SourceTrace& trace) {
     return sourceIds;
 }
 
+void appendLayoutTraceRef(std::vector<ImportTraceRef>& traceRefs, const std::string& targetId, const ElementProvenance& provenance) {
+    traceRefs.push_back({
+        .targetId = targetId,
+        .sourceIds = provenance.sourceIds,
+        .canonicalIds = provenance.canonicalIds,
+    });
+}
+
+void appendLayoutTraceRefs(const FacilityLayout2D& layout, std::vector<ImportTraceRef>& traceRefs) {
+    for (const auto& zone : layout.zones) {
+        appendLayoutTraceRef(traceRefs, zone.id, zone.provenance);
+    }
+
+    for (const auto& connection : layout.connections) {
+        appendLayoutTraceRef(traceRefs, connection.id, connection.provenance);
+    }
+
+    for (const auto& barrier : layout.barriers) {
+        appendLayoutTraceRef(traceRefs, barrier.id, barrier.provenance);
+    }
+
+    for (const auto& control : layout.controls) {
+        appendLayoutTraceRef(traceRefs, control.id, control.provenance);
+    }
+}
+
 class DxfAsciiParser {
 public:
     DxfAsciiParser(std::filesystem::path sourcePath, std::vector<DxfGroup> groups)
@@ -957,7 +986,28 @@ ImportResult DxfImportService::importFile(const ImportRequest& request) const {
 
     auto groups = loadGroups(request.sourcePath);
     DxfAsciiParser parser(request.sourcePath, std::move(groups));
-    return parser.parse();
+    result = parser.parse();
+
+    if (result.canonicalGeometry.has_value()) {
+        FacilityLayoutBuilder builder;
+        auto buildResult = builder.build(*result.canonicalGeometry);
+        result.layout = std::move(buildResult.layout);
+        result.issues.insert(result.issues.end(), buildResult.issues.begin(), buildResult.issues.end());
+        appendLayoutTraceRefs(*result.layout, result.traceRefs);
+
+        if (request.runValidation) {
+            ImportValidationService validator;
+            auto validationIssues = validator.validate(*result.layout);
+            result.issues.insert(result.issues.end(), validationIssues.begin(), validationIssues.end());
+        }
+    }
+
+    if (!request.preserveRawModel) {
+        result.rawModel.reset();
+    }
+
+    result.reviewStatus = hasBlockingImportIssue(result.issues) ? ImportReviewStatus::Rejected : ImportReviewStatus::Pending;
+    return result;
 }
 
 }  // namespace safecrowd::domain