MMI-3272 Fix merge series

Author: Fosol

api/net/Areas/Admin/Controllers/SeriesController.cs

@@ -129,22 +129,22 @@ public IActionResult Update([FromBody] SeriesModel model)
     /// <summary>
     /// Merge two series records..
     /// </summary>
-    /// <param name="id">the master series record</param>
-    /// <param name="fromId">the record to be merged into the master</param>
+    /// <param name="intoId">the record to be merged into the master</param>
+    /// <param name="fromId">the master series record</param>
     /// <returns></returns>
-    [HttpPut("{id}/merge/{fromId}")]
+    [HttpPut("{intoId}/merge/{fromId}")]
     [Produces(MediaTypeNames.Application.Json)]
     [ProducesResponseType(typeof(SeriesModel), (int)HttpStatusCode.OK)]
     [ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)]
     [SwaggerOperation(Tags = new[] { "Series" })]
-    public IActionResult Merge(int id, int fromId)
+    public IActionResult Merge(int fromId, int intoId)
     {
         // make sure the merge target exists
-        var _ = _service.FindById(id) ?? throw new NoContentException();
+        var _ = _service.FindById(fromId) ?? throw new NoContentException();
         // make sure the merge source exists
-        _ = _service.FindById(fromId) ?? throw new NoContentException();
+        _ = _service.FindById(intoId) ?? throw new NoContentException();
         // merge the source into the target
-        var result = _service.Merge(id, fromId) ?? throw new NoContentException();
+        var result = _service.Merge(fromId, intoId) ?? throw new NoContentException();
         return new JsonResult(new SeriesModel(result));
     }
 

app/editor/src/features/admin/series/SeriesMerge.tsx

@@ -71,7 +71,7 @@ const SeriesMerge: React.FC = () => {
                 Show/Program and then click the [Merge] button.
               </p>
               <p>
-                Any content which is asociated with the merged Show/Program, will be re-associated
+                Any content which is associated with the merged Show/Program, will be re-associated
                 with the current Show/Program.
               </p>
               <Row>
@@ -108,7 +108,7 @@ const SeriesMerge: React.FC = () => {
               confirmText="Yes, merge them"
               onConfirm={async () => {
                 try {
-                  await api.mergeSeries(targetSeriesId, Number(mergeSeriesSourceOption?.value));
+                  await api.mergeSeries(Number(mergeSeriesSourceOption?.value), targetSeriesId);
                   setMergeSeriesSourceOption(undefined);
                   toast.success(`Series/Program merge completed successfully.`);
                 } finally {

libs/net/dal/Services/SeriesService.cs

@@ -139,12 +139,12 @@ public override Series UpdateAndSave(Series entity)
         return base.UpdateAndSave(original);
     }
 
-    public Series? Merge(int intoId, int fromId)
+    public Series? Merge(int fromId, int intoId)
     {
         // get a list of content ids by finding all content records which refer to the fromId
         var contentIdsToUpdate = this.Context.Contents.Where((c) => c.SeriesId == fromId).Select((c) => c.Id).ToList();
         // if there are in fact records to update, update them
-        if (contentIdsToUpdate.Any())
+        if (contentIdsToUpdate.Count != 0)
         {
             this.Context.Contents
                 .Where(f => contentIdsToUpdate.Contains(f.Id))