Patch Temporarily map media for empty instruments with a transaction

Ontica · Aug 8, 2022 · 1159c30 · 1159c30
1 parent 967d053
commit 1159c30
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/Land.Core/Instruments/Adapters/InstrumentMapper.cs b/Land.Core/Instruments/Adapters/InstrumentMapper.cs
@@ -11,6 +11,7 @@
 
 using Empiria.Land.Media;
 using Empiria.Land.Media.Adapters;
+using Empiria.Land.Registration.Transactions;
 
 namespace Empiria.Land.Instruments.Adapters {
 
@@ -45,6 +46,23 @@ static internal InstrumentDto Map(Instrument instrument) {
       return dto;
     }
 
+
+    static internal InstrumentDto Map(Instrument instrument, LRSTransaction transaction) {
+      if (!instrument.IsNew && !instrument.IsEmptyInstance) {
+        return Map(instrument);
+      }
+
+      InstrumentDto dto = Map(instrument);
+
+      FixedList<LandMediaPosting> mediaPostings = LandMediaReadServices.TransactionFiles(transaction);
+
+      FixedList<LandMediaFileDto> mediaFilesDtos = LandMediaFileMapper.Map(mediaPostings);
+
+      dto.Media = mediaFilesDtos;
+
+      return dto;
+    }
+
   }  // class InstrumentMapper
 
 }  // namespace Empiria.Land.Instruments.Adapters
diff --git a/Land.Core/Registration/Adapters/InstrumentRecordingMapper.cs b/Land.Core/Registration/Adapters/InstrumentRecordingMapper.cs
@@ -37,15 +37,13 @@ static internal InstrumentRecordingDto Map(RecordingDocument instrumentRecording
 
       Instrument instrument = Instrument.Parse(instrumentRecording.InstrumentId);
 
-
-
       var actions = new InstrumentRecordingControlData(instrumentRecording, instrument, transaction);
 
       var bookEntries = instrument.RecordingBookEntries;
 
       dto.UID = instrumentRecording.GUID;
       dto.InstrumentRecordingID = instrumentRecording.UID;
-      dto.Instrument = InstrumentMapper.Map(instrument);
+      dto.Instrument = InstrumentMapper.Map(instrument, transaction);
 
       if (bookEntries.Count > 0) {
         dto.BookEntries = RecordingBookMapper.MapBookEntriesListDto(bookEntries);

diff --git a/Land.Core/Transactions/Adapters/TransactionMapper.cs b/Land.Core/Transactions/Adapters/TransactionMapper.cs
@@ -74,7 +74,7 @@ static internal TransactionPreprocessingDto Map(TransactionPreprocessingData dat
       dto.Actions.Show.AntecedentRecordingActs = data.ShowAntecedentRecordingActs;
 
       dto.Media = mediaDto;
-      dto.Instrument = InstrumentMapper.Map(data.Instrument);
+      dto.Instrument = InstrumentMapper.Map(data.Instrument, data.Transaction);
       dto.Antecedent = data.Antecedent;
       dto.AntecedentRecordingActs = data.AntecedentRecordingActs;