merge conflict take remot

1 files changed, 36 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 77b3a180f..10a732221 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -107,6 +107,7 @@ namespace Tango.MachineService.Controllers
                 var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
                 response.Version = latest_machine_version.Version;
+                response.FirmwareVersion = latest_machine_version.FirmwareVersion;
 
                 var manager = new BlobStorageManager();
                 var container = manager.GetContainer(MachineServiceConfig.TANGO_VERSIONS_CONTAINER);
@@ -195,6 +196,7 @@ namespace Tango.MachineService.Controllers
                 var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
                 response.Version = latest_machine_version.Version;
+                response.FirmwareVersion = latest_machine_version.FirmwareVersion;
 
                 var manager = new BlobStorageManager();
                 var container = manager.GetContainer(MachineServiceConfig.TANGO_VERSIONS_CONTAINER);
@@ -273,6 +275,11 @@ namespace Tango.MachineService.Controllers
                         tangoUpdate.FailedReason = request.FailedReason;
                         tangoUpdate.FailedLog = request.FailedLog;
 
+                        if (request.ReportsAboutDbCheckNoDifferences)
+                        {
+                            db.TangoUpdates.Remove(tangoUpdate);
+                        }
+
                         db.SaveChanges();
                     }
                 }
@@ -313,6 +320,7 @@ namespace Tango.MachineService.Controllers
                     }
 
                     response.Version = latest_machine_version.Version;
+                    response.FirmwareVersion = latest_machine_version.FirmwareVersion;
 
                     //Compare database
 
@@ -588,6 +596,34 @@ namespace Tango.MachineService.Controllers
                         }
                     }
                 }
+
+                //Insert TangoUpdates.
+                foreach (var dto in request.OfflineUpdates)
+                {
+                    using (ObservablesContext db = ObservablesContextHelper.CreateContext())
+                    {
+                        try
+                        {
+                            var update = dto.ToObservable();
+                            update.ID = 0;
+                            update.IsSynchronized = true;
+
+                            if (db.TangoUpdates.SingleOrDefault(x => x.Guid == update.Guid) == null)
+                            {
+                                db.TangoUpdates.Add(update);
+                                db.SaveChanges();
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            response.FailedOfflineUpdates.Add(new SynchronizationFailedEntity()
+                            {
+                                Guid = dto.Guid,
+                                Reason = ex.FlattenMessage(),
+                            });
+                        }
+                    }
+                }
             }
             catch (Exception ex)
             {