Skip to content

Commit

Permalink
fixed some code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix Ruf committed Jul 6, 2023
1 parent 8c8d30a commit 0b32b0f
Show file tree
Hide file tree
Showing 8 changed files with 124 additions and 213 deletions.
274 changes: 90 additions & 184 deletions src/Mealz/MealBundle/Controller/MealAdminController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,25 @@
namespace App\Mealz\MealBundle\Controller;

use App\Mealz\MealBundle\Entity\Day;
use App\Mealz\MealBundle\Entity\Dish;
use App\Mealz\MealBundle\Entity\Meal;
use App\Mealz\MealBundle\Entity\Week;
use App\Mealz\MealBundle\Entity\Dish;
use App\Mealz\MealBundle\Event\WeekUpdateEvent;
use App\Mealz\MealBundle\Repository\DayRepositoryInterface;
use App\Mealz\MealBundle\Repository\DishRepository;
use App\Mealz\MealBundle\Repository\DishRepositoryInterface;
use App\Mealz\MealBundle\Repository\MealRepositoryInterface;
use App\Mealz\MealBundle\Repository\WeekRepositoryInterface;
use App\Mealz\MealBundle\Service\DayService;
use App\Mealz\MealBundle\Service\DishService;
use App\Mealz\MealBundle\Service\WeekService;
use App\Mealz\MealBundle\Validator\Constraints\DishConstraint;
use DateTime;
use DateTimeZone;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException;
use Doctrine\ORM\UnitOfWork;
use JMS\Serializer\Annotation\Exclude;
use Psr\Log\LoggerInterface;
use Exception;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Validator\ConstraintViolation;
use Exception;

/**
* @Security("is_granted('ROLE_KITCHEN_STAFF')")
Expand All @@ -47,7 +36,6 @@ class MealAdminController extends BaseController
private DayService $dayService;
private DishService $dishService;
private EntityManagerInterface $em;
private LoggerInterface $logger;

public function __construct(
EventDispatcherInterface $eventDispatcher,
Expand All @@ -57,8 +45,7 @@ public function __construct(
DayRepositoryInterface $dayRepository,
DayService $dayService,
DishService $dishService,
EntityManagerInterface $em,
LoggerInterface $logger
EntityManagerInterface $em
) {
$this->eventDispatcher = $eventDispatcher;
$this->weekRepository = $weekRepository;
Expand All @@ -68,7 +55,6 @@ public function __construct(
$this->dayService = $dayService;
$this->dishService = $dishService;
$this->em = $em;
$this->logger = $logger;
}

public function getWeeks(): JsonResponse
Expand Down Expand Up @@ -125,77 +111,22 @@ public function edit(Request $request, Week $week): JsonResponse
{
$data = json_decode($request->getContent(), true);

if (null === $week || !isset($data) || !isset($data['days']) || !isset($data['id']) || $data['id'] !== $week->getId() || !isset($data['enabled'])) {
if (!isset($data) || !isset($data['days']) || !isset($data['id']) || $data['id'] !== $week->getId() || !isset($data['enabled'])) {
return new JsonResponse(['status' => 'invalid json'], 400);
}
$days = $data['days'];
$week->setEnabled($data['enabled']);

// TODO: throw instead of code 400 then catch and return, also outsource parts to services
foreach ($days as $day) {
// check if day exists
$dayEntity = $this->dayRepository->find($day['id']);
if (null === $dayEntity) {
return new JsonResponse(['status' => 'day not found'], 400);
}

if (null !== $day['enabled']) {
$dayEntity->setEnabled($day['enabled']);
}

if (null !== $day['lockDate'] && isset($day['lockDate']['date']) && isset($day['lockDate']['timezone'])) {
$newDateStr = str_replace(' ', 'T', $day['lockDate']['date']) . '+00:00';
$newDate = DateTime::createFromFormat('Y-m-d\TH:i:s.uP', $newDateStr, new DateTimeZone($day['lockDate']['timezone']));
$dayEntity->setLockParticipationDateTime($newDate);
}

$mealCollection = $day['meals'];
// max 2 main meals allowed
if (2 < count($mealCollection)) {
return new JsonResponse(['status' => 'too many meals requested'], 400);
}

// TODO: check if it is even possible to set the day
$this->dayService->removeUnusedMeals($dayEntity, $mealCollection);

// parentMeal is an array of either one meal without variations or 1-2 variations
foreach ($mealCollection as $parentDishId => $mealArr) {
foreach ($mealArr as $meal) {
if (!isset($meal['dishSlug'])) {
continue;
}
$dishEntity = $this->dishRepository->findOneBy(['slug' => $meal['dishSlug']]);
if (null === $dishEntity) {
return new JsonResponse(['status' => 'dish not found for slug: ' . $meal['dishSlug']], 400);
}
// if mealId is null create meal
if (!isset($meal['mealId'])) {
$mealEntity = new Meal($dishEntity, $dayEntity);
$this->setParticipationLimit($mealEntity, $meal);
$dayEntity->addMeal($mealEntity);
} else {
// check if meal already exists and can be modified (aka has no participations)
$mealEntity = $this->mealRepository->find($meal['mealId']);
if (null !== $mealEntity && !$mealEntity->hasParticipations()) {
$mealEntity->setDish($dishEntity);
// TODO: Participation limit can also be set per meal
$this->setParticipationLimit($mealEntity, $meal);
} elseif (null === $mealEntity) {
// this happens because meals without participations are deleted, even though they could be modified later on (this shouldn't happen but might)
$mealEntity = new Meal($dishEntity, $dayEntity);
$this->setParticipationLimit($mealEntity, $meal);
$dayEntity->addMeal($mealEntity);
} else {
return new JsonResponse(['status' => 'meal has participations for id: ' . $meal['mealId']], 400);
}
}
}
try {
foreach ($days as $day) {
$this->handleDay($day);
}
} catch (Exception $e) {
return new JsonResponse(['status' => $e->getMessage()], 500);
}

$this->em->persist($week);
$this->em->flush();
$this->logger->info('Notify: ' . $data['notify']);
$this->eventDispatcher->dispatch(new WeekUpdateEvent($week, $data['notify']));

return new JsonResponse(['status' => 'success'], 200);
Expand All @@ -206,26 +137,16 @@ public function edit(Request $request, Week $week): JsonResponse
*/
public function count(): JsonResponse
{
$timer = floor(microtime(true) * 1000);
// $dishes = $this->dishRepository->findAll();
$dishCount = [];
try {
$dishCount = $this->dishService->getDishCount();
} catch (Exception $e) {
$this->logger->info('Exception occured: ' . $e->getMessage());
return new JsonResponse(['status' => $e->getMessage(), 500]);
}

// /** @var Dish $dish */
// foreach ($dishes as $dish) {
// $dishCount[$dish->getId()] = $this->dishService->getDishCount($dish);
// }

$timer = floor(microtime(true) * 1000) - $timer;
$this->logger->info('Counting dishes took ' . $timer . 'ms');
return new JsonResponse($dishCount, 200);
}


private function setParticipationLimit(Meal $mealEntity, $meal): void
{
if (isset($meal['participationLimit']) && 0 < $meal['participationLimit']) {
Expand All @@ -235,99 +156,84 @@ private function setParticipationLimit(Meal $mealEntity, $meal): void
}
}

// /**
// * @return RedirectResponse|Response
// *
// * @throws OptimisticLockException|ORMException
// *
// * @Security("is_granted('ROLE_KITCHEN_STAFF')")
// */
// public function edit(Request $request, Week $week, DishRepository $dishRepository)
// {
// $dishes = $dishRepository->getSortedDishesQueryBuilder()->getQuery()->getResult();
// $form = $this->createForm(WeekForm::class, $week);
//
// // handle form submission
// if (true === $request->isMethod('POST')) {
// $form->handleRequest($request);
//
// if (true === $form->get('Cancel')->isClicked()) {
// return $this->redirectToRoute('MealzMealBundle_Meal');
// }
//
// if (true === $form->isValid()) {
// $notify = $form->get('notifyCheckbox')->getData();
// if (true === $this->updateWeek($week, $notify)) {
// $message = $this->get('translator')->trans('week.modified', [], 'messages');
// $this->addFlashMessage($message, 'success');
// }
// } else {
// $errors = $form->getErrors(true);
// foreach ($errors as $error) {
// if ($error->getCause() instanceof ConstraintViolation
// && $error->getCause()->getConstraint() instanceof DishConstraint
// ) {
// $translator = $this->get('translator');
// $messageTemplate = $error->getMessageTemplate();
// $messageParameters = $error->getMessageParameters();
// $day = $messageParameters['%day%'];
// $messageParameters['%day%'] = $translator->trans($day, [], 'date');
// $message = $translator->trans($messageTemplate, $messageParameters, 'messages');
// $this->addFlashMessage($message, 'danger');
// }
// }
// }
//
// return $this->redirectToRoute(
// 'MealzMealBundle_Meal_edit',
// ['week' => $week->getId()]
// );
// }
//
// return $this->render(
// 'MealzMealBundle:MealAdmin:week.html.twig',
// [
// 'dishes' => $dishes,
// 'week' => $week,
// 'form' => $form->createView(),
// ]
// );
// }

// /**
// * @throws OptimisticLockException|ORMException
// */
// private function updateWeek(Week $week, bool $notify = false): bool
// {
// /** @var EntityManager $entityManager */
// $entityManager = $this->getDoctrine()->getManager();
//
// /** @var Day $day */
// foreach ($week->getDays() as $day) {
// /** @var Meal $meal */
// foreach ($day->getMeals() as $meal) {
// if (UnitOfWork::STATE_REMOVED === $entityManager->getUnitOfWork()->getEntityState($meal) && 0 < count($meal->getParticipants())) {
// $message = $this->get('translator')->trans(
// 'error.meal.has_participants',
// [
// '%dish%' => $meal->getDish()->getTitle(),
// '%day%' => $day->getDateTime()->format('d.m'),
// ],
// 'messages'
// );
// $this->addFlashMessage($message, 'danger');
//
// return false;
// } elseif (UnitOfWork::STATE_REMOVED === $entityManager->getUnitOfWork()->getEntityState($meal)) {
// $day->removeMeal($meal);
// }
// }
// }
//
// $entityManager->persist($week);
// $entityManager->flush();
// $this->eventDispatcher->dispatch(new WeekUpdateEvent($week, $notify));
//
// return true;
// }
private function handleDay(array $day)
{
// check if day exists
$dayEntity = $this->dayRepository->find($day['id']);
if (null === $dayEntity) {
throw new Exception('day not found');
}

if (null !== $day['enabled']) {
$dayEntity->setEnabled($day['enabled']);
}

$this->setLockParticipationForDay($dayEntity, $day);

$mealCollection = $day['meals'];
// max 2 main meals allowed
if (2 < count($mealCollection)) {
throw new Exception('too many meals requested');
}

$this->dayService->removeUnusedMeals($dayEntity, $mealCollection);

// parentMeal is an array of either one meal without variations or 1-2 variations
foreach ($mealCollection as $mealArr) {
$this->handleMealArray($mealArr, $dayEntity);
}
}

private function setLockParticipationForDay(Day $dayEntity, array $day)
{
if (null !== $day['lockDate'] && isset($day['lockDate']['date']) && isset($day['lockDate']['timezone'])) {
$newDateStr = str_replace(' ', 'T', $day['lockDate']['date']) . '+00:00';
$newDate = DateTime::createFromFormat('Y-m-d\TH:i:s.uP', $newDateStr, new DateTimeZone($day['lockDate']['timezone']));
$dayEntity->setLockParticipationDateTime($newDate);
}
}

private function handleMealArray(array $mealArr, Day $dayEntity)
{
foreach ($mealArr as $meal) {
if (!isset($meal['dishSlug'])) {
continue;
}
$dishEntity = $this->dishRepository->findOneBy(['slug' => $meal['dishSlug']]);
if (null === $dishEntity) {
throw new Exception('dish not found for slug: ' . $meal['dishSlug']);
}
// if mealId is null create meal
if (!isset($meal['mealId'])) {
$this->createMeal($dishEntity, $dayEntity, $meal);
} else {
$this->modifyMeal($meal, $dishEntity, $dayEntity);
}
}
}

private function createMeal(Dish $dishEntity, Day $dayEntity, array $meal)
{
$mealEntity = new Meal($dishEntity, $dayEntity);
$this->setParticipationLimit($mealEntity, $meal);
$dayEntity->addMeal($mealEntity);
}

private function modifyMeal(array $meal, Dish $dishEntity, Day $dayEntity)
{
$mealEntity = $this->mealRepository->find($meal['mealId']);

// check if meal already exists and can be modified (aka has no participations)
if (null !== $mealEntity && !$mealEntity->hasParticipations()) {
$mealEntity->setDish($dishEntity);
$this->setParticipationLimit($mealEntity, $meal);
} elseif (null === $mealEntity) {
// this happens because meals without participations are deleted, even though they could be modified later on (this shouldn't happen but might)
$mealEntity = new Meal($dishEntity, $dayEntity);
$this->setParticipationLimit($mealEntity, $meal);
$dayEntity->addMeal($mealEntity);
} else {
throw new Exception('meal has participations for id: ' . $meal['mealId']);
}
}
}
2 changes: 0 additions & 2 deletions src/Mealz/MealBundle/Repository/DishRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use App\Mealz\MealBundle\Entity\Meal;
use App\Mealz\MealBundle\EventListener\LocalisationListener;
use DateTime;
use DateTimeInterface;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NonUniqueResultException;
Expand Down Expand Up @@ -112,7 +111,6 @@ public function countNumberDishWasTaken(Dish $dish, string $countPeriod): int
*/
public function countNumberDishesWereTaken(string $countPeriod): array
{

$rsm = new ResultSetMapping();
$rsm->addScalarResult('count(dish_id)', 'count', 'integer');
$rsm->addScalarResult('dish_id', 'id');
Expand Down
Loading

0 comments on commit 0b32b0f

Please sign in to comment.