jits/FarmMapsApiClient_WURtest
1
0
Fork 0
forked from FarmMaps/FarmMapsApiClient
Code Issues Pull Requests Releases Wiki Activity

Created a generalservice for helper methods.

Browse Source 
Moved constants to Farmmaps API project.
This commit is contained in:
Mark van der Wal 2020-04-08 11:43:53 +02:00
parent 04235a4fd2
commit 418446e9d2
7 changed files with 150 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
FarmmapsApiSamples/Constants.cs → FarmmapsApi/Constants.cs
View File

1
FarmmapsApi/Extensions.cs
View File

@ -27,6 +27,7 @@ namespace FarmmapsApi
.AddSingleton<FarmmapsEventHub>()
.AddTransient<OpenIdConnectService>()
.AddTransient<FarmmapsAuthenticationHandler>()
.AddTransient<GeneralService>()
.AddHttpClient<FarmmapsApiService>()
.AddHttpMessageHandler<FarmmapsAuthenticationHandler>()
.Services;

135
FarmmapsApi/Services/GeneralService.cs Normal file
View File

@ -0,0 +1,135 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using FarmmapsApi.Models;
using Google.Apis.Upload;
using Microsoft.Extensions.Logging;
using static FarmmapsApi.Extensions;
using static FarmmapsApiSamples.Constants;
namespace FarmmapsApi.Services
{
public class GeneralService
{
private readonly ILogger<GeneralService> _logger;
private readonly FarmmapsApiService _farmmapsApiService;
private readonly string _downloadFolder = "Downloads";
public GeneralService(ILogger<GeneralService> logger, FarmmapsApiService farmmapsApiService)
{
_logger = logger;
_farmmapsApiService = farmmapsApiService;
}
public async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName)
{
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
return null;
return await FindChildItemAsync(root.Code, itemType, itemName,
i => i.Created >= startUpload &&
i.Name.ToLower().Contains(itemName.ToLower()));
}
public async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName)
{
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
return null;
var zipName = Path.GetFileNameWithoutExtension(filePath);
Item shapeItem = null;
await PollTask(TimeSpan.FromSeconds(3), async source =>
{
var uploadedFilesChildren = await _farmmapsApiService.GetItemChildrenAsync(root.Code);
var zipItems = uploadedFilesChildren.Where(i => i.Name.Contains(zipName));
var childrenTasks = new List<Task<List<Item>>>();
foreach (var zipItem in zipItems)
{
childrenTasks.Add(_farmmapsApiService.GetItemChildrenAsync(zipItem.Code,
SHAPE_PROCESSED_ITEMTYPE));
}
List<Item>[] items = await Task.WhenAll(childrenTasks);
if (items.Length > 0)
{
var flatItems = items.SelectMany(i => i).Where(i => i.Name.Contains(itemName)).ToList();
if (flatItems.Count > 0)
{
shapeItem = flatItems.Where(i => i.Created >= startUpload).OrderByDescending(i => i.Created)
.First();
source.Cancel();
}
}
});
return shapeItem;
}
public async Task<Item> ShapeToGeotiff(Item shapeItemCode)
{
var shapeToGeotiffRequest = new TaskRequest()
{
TaskType = "vnd.farmmaps.task.shapetogeotiff"
};
var taskCode = await _farmmapsApiService.QueueTaskAsync(shapeItemCode.Code, shapeToGeotiffRequest);
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
{
_logger.LogInformation("Checking shapetogeotiff task status");
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(shapeItemCode.Code, taskCode);
if (itemTaskStatus.IsFinished)
tokenSource.Cancel();
});
_logger.LogInformation("Data shape converted to geotiff");
// the parent of the shape item is now the tiff item
shapeItemCode = await _farmmapsApiService.GetItemAsync(shapeItemCode.Code);
return await _farmmapsApiService.GetItemAsync(shapeItemCode.ParentCode);
}
public async Task<Item> FindChildItemAsync(string parentCode, string itemType, string containsName,
Func<Item, bool> filter = null, int maxTries = 10)
{
Item dataItem = null;
int tries = 0;
await PollTask(TimeSpan.FromSeconds(3), async source =>
{
_logger.LogInformation($"Trying to get {containsName} data");
var uploadedFilesChildren = await _farmmapsApiService.GetItemChildrenAsync(parentCode, itemType);
if (uploadedFilesChildren.Count > 0)
{
Func<Item, bool> func = filter ?? (i => i.Name.ToLower().Contains(containsName.ToLower()));
dataItem = uploadedFilesChildren.FirstOrDefault(func);
source.Cancel();
}
else if (tries == maxTries)
{
source.Cancel();
}
tries++;
});
if (dataItem == null)
{
_logger.LogError("dataItem not found");
return null;
}
_logger.LogInformation($"Found {containsName} item");
return dataItem;
}
}
}

4
FarmmapsApiSamples/Application.cs
View File

@ -40,8 +40,8 @@ namespace FarmmapsApiSamples
await _farmmapsApiService.GetCurrentUserCodeAsync();
var roots = await _farmmapsApiService.GetCurrentUserRootsAsync();
// await _nitrogenService.TestFlow(roots);
await _herbicideService.TestFlow(roots);
await _nitrogenService.TestFlow(roots);
// await _herbicideService.TestFlow(roots);
}
catch (Exception ex)
{

123
FarmmapsApiSamples/HerbicideService.cs
View File

@ -19,14 +19,17 @@ namespace FarmmapsApiSamples
{
private readonly ILogger<HerbicideService> _logger;
private readonly FarmmapsApiService _farmmapsApiService;
private readonly GeneralService _generalService;
private HerbicideAgent liberatorTarweAgent;
private readonly string _downloadFolder = "Downloads";
public HerbicideService(ILogger<HerbicideService> logger, FarmmapsApiService farmmapsApiService)
public HerbicideService(ILogger<HerbicideService> logger, FarmmapsApiService farmmapsApiService,
GeneralService generalService)
{
_logger = logger;
_farmmapsApiService = farmmapsApiService;
_generalService = generalService;
liberatorTarweAgent = new HerbicideAgent()
{
@ -77,7 +80,7 @@ namespace FarmmapsApiSamples
var cropfieldItem = await CreateCropfieldSingleLutumItemAsync(myDrive.Code);
_logger.LogInformation("Uploading data");
var inputItem = await UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, Path.Combine("Data", "Lutum.tiff"), "Lutum.tiff");
var inputItem = await _generalService.UploadDataAsync(uploadedRoot, GEOTIFF_PROCESSED_ITEMTYPE, Path.Combine("Data", "Lutum.tiff"), "Lutum.tiff");
if(inputItem == null)
{
_logger.LogError($"Failed to upload data");
@ -117,7 +120,7 @@ namespace FarmmapsApiSamples
// upload data
_logger.LogInformation("Uploading lutum data");
var inputItem = await UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_lutum.zip"), "Lutum");
var inputItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_lutum.zip"), "Lutum");
if(inputItem == null)
{
_logger.LogError($"Failed to upload lutum data");
@ -125,7 +128,7 @@ namespace FarmmapsApiSamples
}
_logger.LogInformation("Uploading organic matter data");
var inputExtraItem = await UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_om.zip"), "OS");
var inputExtraItem = await _generalService.UploadZipWithShapeAsync(uploadedRoot, Path.Combine("Data", "vd_born_om.zip"), "OS");
if(inputExtraItem == null)
{
_logger.LogError($"Failed to upload organic matter data");
@ -133,14 +136,14 @@ namespace FarmmapsApiSamples
}
// transform shape to geotiff as nbstask only supports tiff input item
var tiffInputItem = await ShapeToGeotiff(inputItem);
var tiffInputItem = await _generalService.ShapeToGeotiff(inputItem);
if (tiffInputItem == null)
{
_logger.LogError($"Failed to convert shape to tiff for inputItem");
return;
}
var tiffInputExtraItem = await ShapeToGeotiff(inputExtraItem);
var tiffInputExtraItem = await _generalService.ShapeToGeotiff(inputExtraItem);
if (tiffInputExtraItem == null)
{
_logger.LogError($"Failed to convert shape to tiff for inputExtraItem");
@ -196,57 +199,6 @@ namespace FarmmapsApiSamples
return await _farmmapsApiService.CreateItemAsync(cropfieldItemRequest);
}
private async Task<Item> UploadDataAsync(UserRoot root, string itemType, string filePath, string itemName)
{
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
return null;
return await FindChildItemAsync(root.Code, itemType, itemName,
i => i.Created >= startUpload &&
i.Name.ToLower().Contains(itemName.ToLower()));
}
private async Task<Item> UploadZipWithShapeAsync(UserRoot root, string filePath, string itemName)
{
var startUpload = DateTime.UtcNow;
var result = await _farmmapsApiService.UploadFile(filePath, root.Code,
progress => _logger.LogInformation($"Status: {progress.Status} - BytesSent: {progress.BytesSent}"));
if (result.Progress.Status == UploadStatus.Failed)
return null;
var zipName = Path.GetFileNameWithoutExtension(filePath);
Item shapeItem = null;
await PollTask(TimeSpan.FromSeconds(3), async source =>
{
var uploadedFilesChildren = await _farmmapsApiService.GetItemChildrenAsync(root.Code);
var zipItems = uploadedFilesChildren.Where(i => i.Name.Contains(zipName));
var childrenTasks = new List<Task<List<Item>>>();
foreach (var zipItem in zipItems)
{
childrenTasks.Add(_farmmapsApiService.GetItemChildrenAsync(zipItem.Code,
SHAPE_PROCESSED_ITEMTYPE));
}
List<Item>[] items = await Task.WhenAll(childrenTasks);
if (items.Length > 0)
{
var flatItems = items.SelectMany(i => i).Where(i => i.Name.Contains(itemName)).ToList();
if (flatItems.Count > 0)
{
shapeItem = flatItems.Where(i => i.Created >= startUpload).OrderByDescending(i => i.Created).First();
source.Cancel();
}
}
});
return shapeItem;
}
private async Task<Item> CalculateApplianceMapAsync(Item cropfieldItem, HerbicideAgent agent, params Item[] inputItem)
{
if (inputItem.Length == 0)
@ -279,7 +231,7 @@ namespace FarmmapsApiSamples
}
var itemName = $"VRAHerbicide {agent.Middel}";
var applianceMapItem = await FindChildItemAsync(cropfieldItem.Code,
var applianceMapItem = await _generalService.FindChildItemAsync(cropfieldItem.Code,
GEOTIFF_PROCESSED_ITEMTYPE, itemName,
i => i.Updated >= itemTask.Finished.GetValueOrDefault(DateTime.UtcNow) &&
i.Name.ToLower().Contains(itemName.ToLower()));
@ -292,60 +244,5 @@ namespace FarmmapsApiSamples
return applianceMapItem;
}
private async Task<Item> ShapeToGeotiff(Item shapeItemCode)
{
var shapeToGeotiffRequest = new TaskRequest()
{
TaskType = "vnd.farmmaps.task.shapetogeotiff"
};
var taskCode = await _farmmapsApiService.QueueTaskAsync(shapeItemCode.Code, shapeToGeotiffRequest);
await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
{
_logger.LogInformation("Checking shapetogeotiff task status");
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(shapeItemCode.Code, taskCode);
if (itemTaskStatus.IsFinished)
tokenSource.Cancel();
});
_logger.LogInformation("Data shape converted to geotiff");
// the parent of the shape item is now the tiff item
shapeItemCode = await _farmmapsApiService.GetItemAsync(shapeItemCode.Code);
return await _farmmapsApiService.GetItemAsync(shapeItemCode.ParentCode);
}
private async Task<Item> FindChildItemAsync(string parentCode, string itemType, string containsName,
Func<Item,bool> filter = null, int maxTries = 10)
{
Item dataItem = null;
int tries = 0;
await PollTask(TimeSpan.FromSeconds(3), async source =>
{
_logger.LogInformation($"Trying to get {containsName} data");
var uploadedFilesChildren = await _farmmapsApiService.GetItemChildrenAsync(parentCode, itemType);
if (uploadedFilesChildren.Count > 0)
{
Func<Item, bool> func = filter ?? (i => i.Name.ToLower().Contains(containsName.ToLower()));
dataItem = uploadedFilesChildren.FirstOrDefault(func);
source.Cancel();
} else if (tries == maxTries)
{
source.Cancel();
}
tries++;
});
if (dataItem == null)
{
_logger.LogError("dataItem not found");
return null;
}
_logger.LogInformation($"Found {containsName} item");
return dataItem;
}
}
}

2
FarmmapsApiSamples/NitrogenService.cs
View File

@ -150,7 +150,7 @@ namespace FarmmapsApiSamples
{
_logger.LogInformation("Checking shapetogeotiff task status");
var itemTaskStatus = await _farmmapsApiService.GetTaskStatusAsync(isariaShapeItem.Code, taskCode);
if (itemTaskStatus.State == ItemTaskState.Error || itemTaskStatus.State == ItemTaskState.Ok)
if (itemTaskStatus.IsFinished)
tokenSource.Cancel();
});

2
FarmmapsApiSamples/Program.cs
View File

@ -30,7 +30,7 @@ namespace FarmmapsApiSamples
.BuildServiceProvider();
await serviceProvider.GetService<FarmmapsApiService>().AuthenticateAsync();
await serviceProvider.GetService<FarmmapsEventHub>().StartEventHub();
// await serviceProvider.GetService<FarmmapsEventHub>().StartEventHub();
await serviceProvider.GetService<IApp>().RunAsync();
}
}