aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Web/Tango.MachineService
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2024-06-16 12:30:19 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2024-06-16 12:30:19 +0300
commitd363149309bffad946d531db1a1c54a02f5c69bf (patch)
treed5ef47ae3844dc1894e56ecca05544a55f487a26 /Software/Visual_Studio/Web/Tango.MachineService
parentcd9c24c878501f4d2b74facf94c4212886dc4e1e (diff)
downloadTango-d363149309bffad946d531db1a1c54a02f5c69bf.tar.gz
Tango-d363149309bffad946d531db1a1c54a02f5c69bf.zip
FSE/RSM GetMachines Web Data Resolver.
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService')
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs16
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs2
2 files changed, 17 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
index 61d184870..d5de1ef5a 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/FSEController.cs
@@ -179,6 +179,22 @@ namespace Tango.MachineService.Controllers
}
[HttpPost]
+ public GetAllMachinesResponse GetAllMachines(GetAllMachinesRequest request)
+ {
+ using (var db = ObservablesWebContext.CreateContext())
+ {
+ var machines = db.Machines.Where(x => request.AllowAllMachines || x.OrganizationGuid == request.OrganizationGuid).Include(x => x.Organization).ToList();
+
+ var machinesDTO = machines.Select(x => MachineDTO.FromObservable(x)).ToList();
+
+ return new GetAllMachinesResponse()
+ {
+ Machines = machinesDTO
+ };
+ }
+ }
+
+ [HttpPost]
public GetEventTypesResponse GetEventTypes(GetEventTypesRequest request)
{
GetEventTypesResponse response = new GetEventTypesResponse();
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
index 24888db0b..22709dcd5 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
@@ -24,4 +24,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.20.0")]
+[assembly: AssemblyVersion("3.0.21.0")]