Resolved conflict

ita-social-projects · Dec 8, 2024 · 32fae6e · 32fae6e
1 parent 3f26858
commit 32fae6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/OutOfSchool/OutOfSchool.BusinessLogic/Services/WorkshopDrafts/WorkshopDraftService.cs b/OutOfSchool/OutOfSchool.BusinessLogic/Services/WorkshopDrafts/WorkshopDraftService.cs
@@ -231,19 +231,10 @@ private T GetImagesUploadTaskResult<T>(Task<T> task, Guid draftId) where T : cla
 
         if (!task.IsCompletedSuccessfully)
         {
-            if (task.IsFaulted)
-            {
-                logger.LogError(
-                    task.Exception,
-                    "Images upload task for workshop draft with ID {DraftId} failed due to an exception.",
-                    draftId);
-            }
-            else
-            {
-                logger.LogError(
-                    "Images upload task for workshop draft with ID {DraftId} did not complete successfully.",
-                    draftId);
-            }
+            logger.LogError(
+                     task.Exception,
+                     "Images upload task for workshop draft with ID {DraftId} failed due to an exception.",
+                     draftId);
             return null;
         }
         return task.Result;

diff --git a/OutOfSchool/OutOfSchool.BusinessLogic/Util/MappingProfile.cs b/OutOfSchool/OutOfSchool.BusinessLogic/Util/MappingProfile.cs
@@ -354,11 +354,8 @@ public MappingProfile()
             .ForMember(dest => dest.IsBlocked, opt => opt.Ignore())
             .ForMember(dest => dest.BlockReason, opt => opt.Ignore())
             .ForMember(dest => dest.UpdatedAt, opt => opt.Ignore())
-<<<<<<< HEAD
-            .ForMember(dest => dest.Positions, opt => opt.Ignore());
-=======
+            .ForMember(dest => dest.Positions, opt => opt.Ignore())
             .ForMember(dest => dest.WorkshopDrafts, opt => opt.Ignore());
->>>>>>> 0259973a (Added WorkshopDraftService and fixed a mapping issue in tests related to JSON type.)
 
         CreateMap<Provider, ProviderCreateDto>()
             .Apply(AddCommonProvider2ProviderBaseDto);