Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sonarcloud fixups #11

Merged
merged 5 commits into from
Sep 16, 2022
Merged

Sonarcloud fixups #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05c01f9
SonarCloud fixups (phase 1)
davewalker5 Sep 16, 2022
b74e2c3
SonarCloud fixups (phase 1)
davewalker5 Sep 16, 2022
2eb3075
SonarCloud fixups (phase 2)
davewalker5 Sep 16, 2022
bec012d
SonarCloud fixups (phase 2)
davewalker5 Sep 16, 2022
9c3502a
SonarCloud fixups (phase 3)
davewalker5 Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FlightRecorder.BusinessLogic/Logic/AircraftManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal class AircraftManager : IAircraftManager
{
private const int AllModelsPageSize = 1000000;

private FlightRecorderFactory _factory;
private readonly FlightRecorderFactory _factory;

internal AircraftManager(FlightRecorderFactory factory)
{
Expand Down
268 changes: 134 additions & 134 deletions src/FlightRecorder.BusinessLogic/Logic/AirlineManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,136 +1,136 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using FlightRecorder.BusinessLogic.Extensions;
using FlightRecorder.Data;
using FlightRecorder.Entities.Db;
using FlightRecorder.Entities.Interfaces;
using Microsoft.EntityFrameworkCore;

namespace FlightRecorder.BusinessLogic.Logic
{
internal class AirlineManager : IAirlineManager
{
private FlightRecorderDbContext _context;

internal AirlineManager(FlightRecorderDbContext context)
{
_context = context;
}

/// <summary>
/// Return the first entity matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <returns></returns>
public Airline Get(Expression<Func<Airline, bool>> predicate)
=> List(predicate, 1, 1).FirstOrDefault();

/// <summary>
/// Get the first airline matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <returns></returns>
public async Task<Airline> GetAsync(Expression<Func<Airline, bool>> predicate)
{
List<Airline> airlines = await _context.Airlines
.Where(predicate)
.ToListAsync();
return airlines.FirstOrDefault();
}

/// <summary>
/// Return all entities matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <param name="pageNumber"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public IEnumerable<Airline> List(Expression<Func<Airline, bool>> predicate, int pageNumber, int pageSize)
{
IEnumerable<Airline> results;
if (predicate == null)
{
results = _context.Airlines;
results = results.Skip((pageNumber - 1) * pageSize)
.Take(pageSize);
}
else
{
results = _context.Airlines
.Where(predicate)
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize); ;
}

return results;
}

/// <summary>
/// Return all entities matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <param name="pageNumber"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public IAsyncEnumerable<Airline> ListAsync(Expression<Func<Airline, bool>> predicate, int pageNumber, int pageSize)
{
IAsyncEnumerable<Airline> results;
if (predicate == null)
{
results = _context.Airlines
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.AsAsyncEnumerable();
}
else
{
results = _context.Airlines.Where(predicate).AsAsyncEnumerable();
}

return results;
}

/// <summary>
/// Add a named airline, if it doesn't already exist
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public Airline Add(string name)
{
name = name.CleanString();
Airline airline = Get(a => a.Name == name);

if (airline == null)
{
airline = new Airline { Name = name };
_context.Airlines.Add(airline);
_context.SaveChanges();
}

return airline;
}

/// <summary>
/// Add a named airline, if it doesn't already exist
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public async Task<Airline> AddAsync(string name)
{
name = name.CleanString();
Airline airline = await GetAsync(a => a.Name == name);

if (airline == null)
{
airline = new Airline { Name = name };
await _context.Airlines.AddAsync(airline);
await _context.SaveChangesAsync();
}

return airline;
}
}
}
using System.Threading.Tasks;
using FlightRecorder.BusinessLogic.Extensions;
using FlightRecorder.Data;
using FlightRecorder.Entities.Db;
using FlightRecorder.Entities.Interfaces;
using Microsoft.EntityFrameworkCore;
namespace FlightRecorder.BusinessLogic.Logic
{
internal class AirlineManager : IAirlineManager
{
private readonly FlightRecorderDbContext _context;
internal AirlineManager(FlightRecorderDbContext context)
{
_context = context;
}
/// <summary>
/// Return the first entity matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <returns></returns>
public Airline Get(Expression<Func<Airline, bool>> predicate)
=> List(predicate, 1, 1).FirstOrDefault();
/// <summary>
/// Get the first airline matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <returns></returns>
public async Task<Airline> GetAsync(Expression<Func<Airline, bool>> predicate)
{
List<Airline> airlines = await _context.Airlines
.Where(predicate)
.ToListAsync();
return airlines.FirstOrDefault();
}
/// <summary>
/// Return all entities matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <param name="pageNumber"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public IEnumerable<Airline> List(Expression<Func<Airline, bool>> predicate, int pageNumber, int pageSize)
{
IEnumerable<Airline> results;
if (predicate == null)
{
results = _context.Airlines;
results = results.Skip((pageNumber - 1) * pageSize)
.Take(pageSize);
}
else
{
results = _context.Airlines
.Where(predicate)
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize);
}
return results;
}
/// <summary>
/// Return all entities matching the specified criteria
/// </summary>
/// <param name="predicate"></param>
/// <param name="pageNumber"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public IAsyncEnumerable<Airline> ListAsync(Expression<Func<Airline, bool>> predicate, int pageNumber, int pageSize)
{
IAsyncEnumerable<Airline> results;
if (predicate == null)
{
results = _context.Airlines
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.AsAsyncEnumerable();
}
else
{
results = _context.Airlines.Where(predicate).AsAsyncEnumerable();
}
return results;
}
/// <summary>
/// Add a named airline, if it doesn't already exist
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public Airline Add(string name)
{
name = name.CleanString();
Airline airline = Get(a => a.Name == name);
if (airline == null)
{
airline = new Airline { Name = name };
_context.Airlines.Add(airline);
_context.SaveChanges();
}
return airline;
}
/// <summary>
/// Add a named airline, if it doesn't already exist
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public async Task<Airline> AddAsync(string name)
{
name = name.CleanString();
Airline airline = await GetAsync(a => a.Name == name);
if (airline == null)
{
airline = new Airline { Name = name };
await _context.Airlines.AddAsync(airline);
await _context.SaveChangesAsync();
}
return airline;
}
}
}
2 changes: 1 addition & 1 deletion src/FlightRecorder.BusinessLogic/Logic/FlightManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace FlightRecorder.BusinessLogic.Logic
{
internal class FlightManager : IFlightManager
{
private FlightRecorderFactory _factory;
private readonly FlightRecorderFactory _factory;

internal FlightManager(FlightRecorderFactory factory)
{
Expand Down
Loading