fix: show imported buddies in review step and fix profile temperature

Author: ericgriffin

lib/features/dive_import/data/services/uddf_entity_importer.dart

@@ -1289,7 +1289,7 @@ class UddfEntityImporter {
     Map<String, String> buddyIdMapping,
     BuddyRepository repository,
   ) async {
-    // Link referenced buddies
+    // Link referenced buddies (from pre-imported buddy entities)
     final buddyRefsValue = diveData['buddyRefs'];
     final buddyRefs = buddyRefsValue is List
         ? buddyRefsValue.whereType<String>().toList()
@@ -1301,6 +1301,22 @@ class UddfEntityImporter {
       }
     }
 
+    // Link referenced dive guides (same buddy entities, different role)
+    final guideRefsValue = diveData['diveGuideRefs'];
+    final guideRefs = guideRefsValue is List
+        ? guideRefsValue.whereType<String>().toList()
+        : <String>[];
+    for (final guideRef in guideRefs) {
+      final newGuideId = buddyIdMapping[guideRef];
+      if (newGuideId != null) {
+        await repository.addBuddyToDive(
+          diveId,
+          newGuideId,
+          BuddyRole.diveGuide,
+        );
+      }
+    }
+
     // Handle inline buddy names not in the diver section
     final inlineIds = <String>{};
     final unmatchedNamesValue = diveData['unmatchedBuddyNames'];

lib/features/universal_import/data/parsers/subsurface_xml_parser.dart

@@ -89,6 +89,7 @@ class SubsurfaceXmlParser implements ImportParser {
       final dives = <Map<String, dynamic>>[];
       final trips = <Map<String, dynamic>>[];
       final allTags = <String, Map<String, dynamic>>{};
+      final allBuddies = <String, Map<String, dynamic>>{};
 
       // Process trip-wrapped dives
       for (final tripElement in divesElement.findElements('trip')) {
@@ -103,6 +104,7 @@ class SubsurfaceXmlParser implements ImportParser {
             if (diveData != null) {
               diveData['tripRef'] = tripId;
               _collectTags(diveElement, diveData, allTags);
+              _collectBuddies(diveElement, diveData, allBuddies);
               dives.add(diveData);
               tripDives.add(diveData);
             }
@@ -135,6 +137,7 @@ class SubsurfaceXmlParser implements ImportParser {
           final diveData = _parseDive(diveElement, siteMap: siteMap);
           if (diveData != null) {
             _collectTags(diveElement, diveData, allTags);
+            _collectBuddies(diveElement, diveData, allBuddies);
             dives.add(diveData);
           }
         } catch (e) {
@@ -153,6 +156,9 @@ class SubsurfaceXmlParser implements ImportParser {
       if (allTags.isNotEmpty) {
         entities[ImportEntityType.tags] = allTags.values.toList();
       }
+      if (allBuddies.isNotEmpty) {
+        entities[ImportEntityType.buddies] = allBuddies.values.toList();
+      }
     }
 
     return ImportPayload(
@@ -250,23 +256,8 @@ class SubsurfaceXmlParser implements ImportParser {
           : WaterType.fresh;
     }
 
-    // Buddy -> proper Buddy entities via unmatchedBuddyNames
-    final buddyEl = dive.findElements('buddy').firstOrNull;
-    if (buddyEl != null) {
-      final buddyNames = _splitNames(buddyEl.innerText);
-      if (buddyNames.isNotEmpty) {
-        result['unmatchedBuddyNames'] = buddyNames;
-      }
-    }
-
-    // Divemaster -> proper Buddy entities with diveGuide role
-    final divemasterEl = dive.findElements('divemaster').firstOrNull;
-    if (divemasterEl != null) {
-      final dmNames = _splitNames(divemasterEl.innerText);
-      if (dmNames.isNotEmpty) {
-        result['unmatchedDiveGuideNames'] = dmNames;
-      }
-    }
+    // Buddy and divemaster names are collected separately via _collectBuddies
+    // after _parseDive returns, so they appear in ImportEntityType.buddies
 
     // Composite notes: <notes> + "Suit: <suit>" + "SAC: <sac attr>"
     final notesParts = <String>[];
@@ -368,6 +359,34 @@ class SubsurfaceXmlParser implements ImportParser {
     };
   }
 
+  void _collectBuddies(
+    XmlElement diveElement,
+    Map<String, dynamic> diveData,
+    Map<String, Map<String, dynamic>> allBuddies,
+  ) {
+    final buddyEl = diveElement.findElements('buddy').firstOrNull;
+    if (buddyEl != null) {
+      final names = _splitNames(buddyEl.innerText);
+      if (names.isNotEmpty) {
+        diveData['buddyRefs'] = names;
+        for (final name in names) {
+          allBuddies.putIfAbsent(name, () => {'name': name, 'uddfId': name});
+        }
+      }
+    }
+
+    final dmEl = diveElement.findElements('divemaster').firstOrNull;
+    if (dmEl != null) {
+      final names = _splitNames(dmEl.innerText);
+      if (names.isNotEmpty) {
+        diveData['diveGuideRefs'] = names;
+        for (final name in names) {
+          allBuddies.putIfAbsent(name, () => {'name': name, 'uddfId': name});
+        }
+      }
+    }
+  }
+
   void _collectTags(
     XmlElement diveElement,
     Map<String, dynamic> diveData,

test/features/universal_import/data/parsers/subsurface_xml_parser_test.dart

@@ -81,7 +81,7 @@ void main() {
   });
 
   group('dive metadata', () {
-    test('parses buddies and divemasters as unmatched name lists', () async {
+    test('creates buddy entities and sets refs on dives', () async {
       final result = await parser.parse(
         xmlBytes('''
 <divelog program='subsurface' version='3'>
@@ -97,9 +97,16 @@ void main() {
 </divelog>
 '''),
       );
+      // Buddy entities created for review step
+      final buddies = result.entitiesOf(ImportEntityType.buddies);
+      expect(buddies.length, 3);
+      final buddyNames = buddies.map((b) => b['name']).toSet();
+      expect(buddyNames, containsAll(['John Doe', 'Alice', 'Jane Smith']));
+
+      // Dive has refs, not inline text
       final dive = result.entitiesOf(ImportEntityType.dives).first;
-      expect(dive['unmatchedBuddyNames'], ['John Doe', 'Alice']);
-      expect(dive['unmatchedDiveGuideNames'], ['Jane Smith']);
+      expect(dive['buddyRefs'], ['John Doe', 'Alice']);
+      expect(dive['diveGuideRefs'], ['Jane Smith']);
       expect(dive.containsKey('buddy'), isFalse);
       expect(dive.containsKey('diveMaster'), isFalse);
     });
@@ -581,10 +588,14 @@ void main() {
       // Verify a specific dive has expected data
       final dive1 = dives.firstWhere((d) => d['diveNumber'] == 1);
       expect(dive1['dateTime'], DateTime(2025, 9, 20, 7, 44, 37));
-      final buddyNames = dive1['unmatchedBuddyNames'] as List<String>;
-      expect(buddyNames, isNotEmpty);
-      final guideNames = dive1['unmatchedDiveGuideNames'] as List<String>;
-      expect(guideNames, isNotEmpty);
+      final buddyRefs = dive1['buddyRefs'] as List<String>;
+      expect(buddyRefs, isNotEmpty);
+      final guideRefs = dive1['diveGuideRefs'] as List<String>;
+      expect(guideRefs, isNotEmpty);
+
+      // Buddy entities should be in the payload for the review step
+      final buddies = result.entitiesOf(ImportEntityType.buddies);
+      expect(buddies.length, greaterThanOrEqualTo(2));
       expect(dive1['visibility'], Visibility.poor);
       expect(dive1['currentStrength'], CurrentStrength.strong);
       expect(dive1['waterType'], WaterType.salt);