final
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-05-20 01:36:54 +02:00
parent beab15a7ef
commit 10c1bb008f
19 changed files with 1632 additions and 19 deletions

View File

@ -32,5 +32,30 @@ namespace HanyadikHetVan.Services
var funfact = await _dbContext.FunFacts.Where(x => x.Id == funfactId).FirstOrDefaultAsync();
return funfact.FunFactor;
}
public async Task<bool> DeleteFunFact(int funfactId)
{
try
{
var item = await _dbContext.FunFacts.Where(x => x.Id == funfactId).FirstOrDefaultAsync();
_dbContext.FunFacts.Remove(item);
await _dbContext.SaveChangesAsync();
return true;
}
catch (Exception)
{
return false;
}
}
public async Task<FunFactDTO> UpdateFunFact(int funfactId, FunFactDTO funfact)
{
var funfactentity = _mapper.Map<FunFactDTO, FunFact>(funfact);
funfactentity.Id = funfactId;
_dbContext.FunFacts.Update(funfactentity);
await _dbContext.SaveChangesAsync();
var newff = await _dbContext.FunFacts.Where(x => x.Id == funfactId).FirstOrDefaultAsync();
return _mapper.Map<FunFact, FunFactDTO>(newff);
}
}
}

View File

@ -27,9 +27,17 @@ namespace HanyadikHetVan.Services
return _mapper.Map<List<Pause>, List<PauseDTO>>(pauses);
}
public async Task<PauseDTO> AddPause(PauseDTO pause)
public async Task<PauseDTO> AddPause(string userId, PauseDTO pause)
{
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.UserId == userId && x.Id == pause.WeeklyTimeSpanId).FirstOrDefaultAsync();
if (wts == null)
{
throw new Exception("Not found");
}
var pauseEntity = _mapper.Map<PauseDTO, Pause>(pause);
pauseEntity.WeeklyTimeSpanId = pause.WeeklyTimeSpanId;
var obj = _dbContext.Pauses.Add(pauseEntity);
await _dbContext.SaveChangesAsync();
return _mapper.Map<Pause, PauseDTO>(obj.Entity);

View File

@ -14,23 +14,23 @@ namespace HanyadikHetVan.Services
{
_userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
}
public async Task<UserDTO> CreateUser(string email, string password)
public async Task<UserDTO> CreateUser(UserDTO user)
{
var newUser = new User
{
UserName = email,
Email = email,
UserName = user.Email,
Email = user.Email,
EmailConfirmed = true,
};
var result = await _userManager.CreateAsync(newUser,password);
var result = await _userManager.CreateAsync(newUser, user.Password);
if (!result.Succeeded)
{
throw new Exception("Failed to create user.");
}
return new UserDTO() { Email = email };
return new UserDTO() { Email = user.Email };
}
}
}

View File

@ -24,25 +24,25 @@ namespace HanyadikHetVan.Services
public async Task<List<WeeklyTimeSpanDTO>> GetAllWeeklyTimeSpans()
{
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).ToListAsync();
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Include(x => x.FunFacts).ToListAsync();
return _mapper.Map<List<WeeklyTimeSpan>, List<WeeklyTimeSpanDTO>>(wts);
}
public async Task<WeeklyTimeSpanDTO> GetWeeklyTimeSpan(int weeklytimespanId)
{
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Id == weeklytimespanId).FirstOrDefaultAsync();
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Include(x => x.FunFacts).Where(x => x.Id == weeklytimespanId).FirstOrDefaultAsync();
return _mapper.Map<WeeklyTimeSpan, WeeklyTimeSpanDTO>(wts);
}
public async Task<List<PauseDTO>> GetPausesOfWeeklyTimeSpan(int weeklytimespanId)
{
var pauses = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Id == weeklytimespanId).FirstOrDefaultAsync();
var pauses = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Include(x => x.FunFacts).Where(x => x.Id == weeklytimespanId).FirstOrDefaultAsync();
return _mapper.Map<ICollection<Pause>, List<PauseDTO>>(pauses.Pauses);
}
public async Task<WeeklyTimeSpanDTO> GetWeeklyTimeSpanByStartdate(DateTime startTime)
{
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Where(x => x.Startdate.Date.Equals(startTime.Date)).ToListAsync();
var wts = await _dbContext.WeeklyTimeSpans.Include(x => x.Pauses).Include(x => x.FunFacts).Where(x => x.Startdate.Date.Equals(startTime.Date)).ToListAsync();
return _mapper.Map<List<WeeklyTimeSpan>, WeeklyTimeSpanDTO>(wts);
}