| @@ -45,41 +45,41 @@ discard block | ||
| 45 | 45 | use FOS\RestBundle\Controller\Annotations\Route; | 
| 46 | 46 | |
| 47 | 47 |  class ContentListItemController extends AbstractController { | 
| 48 | - private ContentListItemRepositoryInterface $contentListItemRepository; | |
| 49 | - private EntityManagerInterface $entityManager; | |
| 50 | - private ContentListServiceInterface $contentListService; | |
| 51 | - private EventDispatcherInterface $eventDispatcher; | |
| 52 | - | |
| 53 | - /** | |
| 54 | - * @param ContentListItemRepositoryInterface $contentListItemRepository | |
| 55 | - * @param EntityManagerInterface $entityManager | |
| 56 | - * @param ContentListServiceInterface $contentListService | |
| 57 | - * @param EventDispatcherInterface $eventDispatcher | |
| 58 | - */ | |
| 59 | - public function __construct( | |
| 60 | - ContentListItemRepositoryInterface $contentListItemRepository, | |
| 61 | - EntityManagerInterface $entityManager, | |
| 62 | - ContentListServiceInterface $contentListService, | |
| 63 | - EventDispatcherInterface $eventDispatcher, | |
| 64 | - string $invalidationCacheUrl, | |
| 65 | - string $invalidationToken | |
| 66 | -  ) { | |
| 67 | - $this->contentListItemRepository = $contentListItemRepository; | |
| 68 | - $this->entityManager = $entityManager; | |
| 69 | - $this->contentListService = $contentListService; | |
| 70 | - $this->eventDispatcher = $eventDispatcher; | |
| 71 | - $this->invalidationCacheUrl = $invalidationCacheUrl; | |
| 72 | - $this->invalidationToken = $invalidationToken; | |
| 73 | - } | |
| 74 | - | |
| 75 | - | |
| 76 | - /** | |
| 77 | -   * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"}) | |
| 78 | - */ | |
| 79 | -  public function listAction(Request $request, int $id): ResourcesListResponseInterface { | |
| 48 | + private ContentListItemRepositoryInterface $contentListItemRepository; | |
| 49 | + private EntityManagerInterface $entityManager; | |
| 50 | + private ContentListServiceInterface $contentListService; | |
| 51 | + private EventDispatcherInterface $eventDispatcher; | |
| 52 | + | |
| 53 | + /** | |
| 54 | + * @param ContentListItemRepositoryInterface $contentListItemRepository | |
| 55 | + * @param EntityManagerInterface $entityManager | |
| 56 | + * @param ContentListServiceInterface $contentListService | |
| 57 | + * @param EventDispatcherInterface $eventDispatcher | |
| 58 | + */ | |
| 59 | + public function __construct( | |
| 60 | + ContentListItemRepositoryInterface $contentListItemRepository, | |
| 61 | + EntityManagerInterface $entityManager, | |
| 62 | + ContentListServiceInterface $contentListService, | |
| 63 | + EventDispatcherInterface $eventDispatcher, | |
| 64 | + string $invalidationCacheUrl, | |
| 65 | + string $invalidationToken | |
| 66 | +    ) { | |
| 67 | + $this->contentListItemRepository = $contentListItemRepository; | |
| 68 | + $this->entityManager = $entityManager; | |
| 69 | + $this->contentListService = $contentListService; | |
| 70 | + $this->eventDispatcher = $eventDispatcher; | |
| 71 | + $this->invalidationCacheUrl = $invalidationCacheUrl; | |
| 72 | + $this->invalidationToken = $invalidationToken; | |
| 73 | + } | |
| 74 | + | |
| 75 | + | |
| 76 | + /** | |
| 77 | +     * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"}) | |
| 78 | + */ | |
| 79 | +    public function listAction(Request $request, int $id): ResourcesListResponseInterface { | |
| 80 | 80 |      $sort = $request->query->all('sorting'); | 
| 81 | 81 |      if (empty($sort)) { | 
| 82 | - $sort = ['sticky' => 'desc']; | |
| 82 | + $sort = ['sticky' => 'desc']; | |
| 83 | 83 | } | 
| 84 | 84 | |
| 85 | 85 | $items = $this->contentListItemRepository->getPaginatedByCriteria( | 
| @@ -112,20 +112,20 @@ discard block | ||
| 112 | 112 | ); | 
| 113 | 113 | |
| 114 | 114 | return new ResourcesListResponse($items, $responseContext); | 
| 115 | - } | |
| 115 | + } | |
| 116 | 116 | |
| 117 | - /** | |
| 118 | -   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"}) | |
| 119 | - */ | |
| 120 | -  public function getAction($listId, $id) { | |
| 117 | + /** | |
| 118 | +     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"}) | |
| 119 | + */ | |
| 120 | +    public function getAction($listId, $id) { | |
| 121 | 121 | return new SingleResourceResponse($this->findOr404($listId, $id)); | 
| 122 | - } | |
| 122 | + } | |
| 123 | 123 | |
| 124 | - /** | |
| 125 | -   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"}) | |
| 126 | - */ | |
| 127 | - public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId, | |
| 128 | -                                       $id): SingleResourceResponseInterface { | |
| 124 | + /** | |
| 125 | +     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"}) | |
| 126 | + */ | |
| 127 | + public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId, | |
| 128 | +                                        $id): SingleResourceResponseInterface { | |
| 129 | 129 | $contentListItem = $this->findOr404($listId, $id); | 
| 130 | 130 | $form = $formFactory->createNamed( | 
| 131 | 131 | '', | 
| @@ -137,13 +137,13 @@ discard block | ||
| 137 | 137 | $form->handleRequest($request); | 
| 138 | 138 | |
| 139 | 139 |      if ($form->isSubmitted() && $form->isValid()) { | 
| 140 | - $contentListItem->getContentList()->setUpdatedAt(new DateTime()); | |
| 140 | + $contentListItem->getContentList()->setUpdatedAt(new DateTime()); | |
| 141 | 141 | |
| 142 | -      if (null !== $contentListItem->getStickyPosition()) { | |
| 142 | +        if (null !== $contentListItem->getStickyPosition()) { | |
| 143 | 143 | $contentListItem->setPosition($contentListItem->getStickyPosition()); | 
| 144 | - } | |
| 144 | + } | |
| 145 | 145 | |
| 146 | - $this->entityManager->flush(); | |
| 146 | + $this->entityManager->flush(); | |
| 147 | 147 | ContentListController::invalidateCache( | 
| 148 | 148 | $this->invalidationCacheUrl, | 
| 149 | 149 | $this->invalidationToken, | 
| @@ -155,46 +155,46 @@ discard block | ||
| 155 | 155 | ] | 
| 156 | 156 | ); | 
| 157 | 157 | |
| 158 | - return new SingleResourceResponse($contentListItem); | |
| 158 | + return new SingleResourceResponse($contentListItem); | |
| 159 | 159 | } | 
| 160 | 160 | |
| 161 | 161 | return new SingleResourceResponse($form, new ResponseContext(400)); | 
| 162 | - } | |
| 163 | - | |
| 164 | - /** | |
| 165 | -   * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"}) | |
| 166 | - */ | |
| 167 | - public function batchUpdateAction( | |
| 168 | - Request $request, | |
| 169 | - FormFactoryInterface $formFactory, | |
| 170 | - ContentListRepositoryInterface $contentListRepository, | |
| 171 | - ArticleRepositoryInterface $articleRepository, | |
| 172 | - EventDispatcherInterface $eventDispatcher, | |
| 173 | - int $listId | |
| 174 | -  ): SingleResourceResponseInterface { | |
| 162 | + } | |
| 163 | + | |
| 164 | + /** | |
| 165 | +     * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"}) | |
| 166 | + */ | |
| 167 | + public function batchUpdateAction( | |
| 168 | + Request $request, | |
| 169 | + FormFactoryInterface $formFactory, | |
| 170 | + ContentListRepositoryInterface $contentListRepository, | |
| 171 | + ArticleRepositoryInterface $articleRepository, | |
| 172 | + EventDispatcherInterface $eventDispatcher, | |
| 173 | + int $listId | |
| 174 | +    ): SingleResourceResponseInterface { | |
| 175 | 175 | /** @var ContentListInterface $list */ | 
| 176 | 176 | $list = $contentListRepository->findOneBy(['id' => $listId]); | 
| 177 | 177 |      if (null === $list) { | 
| 178 | -      throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list)); | |
| 178 | +        throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list)); | |
| 179 | 179 | } | 
| 180 | 180 | |
| 181 | 181 |      $form = $formFactory->createNamed('', ContentListItemsType::class, [], ['method' => $request->getMethod()]); | 
| 182 | 182 | |
| 183 | 183 | $form->handleRequest($request); | 
| 184 | 184 |      if ($form->isSubmitted() && $form->isValid()) { | 
| 185 | - $data = $form->getData(); | |
| 186 | -      $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC')); | |
| 187 | -      $updatedAt->setTimezone(new DateTimeZone('UTC')); | |
| 188 | - $listUpdatedAt = $list->getUpdatedAt(); | |
| 189 | -      $listUpdatedAt->setTimezone(new DateTimeZone('UTC')); | |
| 190 | -      if ($updatedAt < $listUpdatedAt) { | |
| 185 | + $data = $form->getData(); | |
| 186 | +        $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC')); | |
| 187 | +        $updatedAt->setTimezone(new DateTimeZone('UTC')); | |
| 188 | + $listUpdatedAt = $list->getUpdatedAt(); | |
| 189 | +        $listUpdatedAt->setTimezone(new DateTimeZone('UTC')); | |
| 190 | +        if ($updatedAt < $listUpdatedAt) { | |
| 191 | 191 |          throw new ConflictHttpException('List was already updated'); | 
| 192 | - } | |
| 192 | + } | |
| 193 | 193 | |
| 194 | - $updatedArticles = []; | |
| 195 | - $updatedItemsInvalidateCache = []; | |
| 196 | - /** @var ContentListAction $item */ | |
| 197 | -      foreach ($data['items'] as $item) { | |
| 194 | + $updatedArticles = []; | |
| 195 | + $updatedItemsInvalidateCache = []; | |
| 196 | + /** @var ContentListAction $item */ | |
| 197 | +        foreach ($data['items'] as $item) { | |
| 198 | 198 | $position = $item->getPosition(); | 
| 199 | 199 | $isSticky = $item->isSticky(); | 
| 200 | 200 | $contentId = $item->getContentId(); | 
| @@ -208,7 +208,7 @@ discard block | ||
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 |          switch ($item->getAction()) { | 
| 211 | - case ContentListAction::ACTION_MOVE: | |
| 211 | + case ContentListAction::ACTION_MOVE: | |
| 212 | 212 | $updated = false; | 
| 213 | 213 | $contentListItem = $this->findByContentOr404($list, $contentId); | 
| 214 | 214 | |
| @@ -236,7 +236,7 @@ discard block | ||
| 236 | 236 | $updatedArticles[$contentId] = $contentListItem->getContent(); | 
| 237 | 237 | |
| 238 | 238 | break; | 
| 239 | - case ContentListAction::ACTION_ADD: | |
| 239 | + case ContentListAction::ACTION_ADD: | |
| 240 | 240 | $this->ensureThereIsNoItemOnPositionOrThrow409( | 
| 241 | 241 | $listId, | 
| 242 | 242 | $position, | 
| @@ -250,7 +250,7 @@ discard block | ||
| 250 | 250 | $updatedArticles[$contentId] = $contentListItem->getContent(); | 
| 251 | 251 | |
| 252 | 252 | break; | 
| 253 | - case ContentListAction::ACTION_DELETE: | |
| 253 | + case ContentListAction::ACTION_DELETE: | |
| 254 | 254 | $contentListItem = $this->findByContentOr404($list, $contentId); | 
| 255 | 255 | $this->entityManager->remove($contentListItem); | 
| 256 | 256 |              $list->setUpdatedAt(new DateTime('now')); | 
| @@ -259,29 +259,29 @@ discard block | ||
| 259 | 259 | |
| 260 | 260 | break; | 
| 261 | 261 | } | 
| 262 | - } | |
| 263 | - | |
| 264 | - $this->contentListService->repositionStickyItems($list); | |
| 265 | - | |
| 266 | - ContentListController::invalidateCache( | |
| 267 | - $this->invalidationCacheUrl, | |
| 268 | - $this->invalidationToken, | |
| 269 | - [ | |
| 270 | - 'id' => $list->getId(), | |
| 271 | - 'name' => $list->getName(), | |
| 272 | - 'type' => $list->getType(), | |
| 273 | - 'action' => 'BATCH-UPDATE', | |
| 274 | - 'items' => $updatedItemsInvalidateCache | |
| 275 | - ] | |
| 276 | - ); | |
| 277 | - | |
| 278 | - return new SingleResourceResponse($list, new ResponseContext(201)); | |
| 262 | + } | |
| 263 | + | |
| 264 | + $this->contentListService->repositionStickyItems($list); | |
| 265 | + | |
| 266 | + ContentListController::invalidateCache( | |
| 267 | + $this->invalidationCacheUrl, | |
| 268 | + $this->invalidationToken, | |
| 269 | + [ | |
| 270 | + 'id' => $list->getId(), | |
| 271 | + 'name' => $list->getName(), | |
| 272 | + 'type' => $list->getType(), | |
| 273 | + 'action' => 'BATCH-UPDATE', | |
| 274 | + 'items' => $updatedItemsInvalidateCache | |
| 275 | + ] | |
| 276 | + ); | |
| 277 | + | |
| 278 | + return new SingleResourceResponse($list, new ResponseContext(201)); | |
| 279 | 279 | } | 
| 280 | 280 | |
| 281 | 281 | return new SingleResourceResponse($form, new ResponseContext(400)); | 
| 282 | - } | |
| 282 | + } | |
| 283 | 283 | |
| 284 | -  private function findByContentOr404($listId, $contentId): ContentListItemInterface { | |
| 284 | +    private function findByContentOr404($listId, $contentId): ContentListItemInterface { | |
| 285 | 285 | /** @var ContentListItemInterface $listItem */ | 
| 286 | 286 | $listItem = $this->contentListItemRepository->findOneBy([ | 
| 287 | 287 | 'contentList' => $listId, | 
| @@ -289,13 +289,13 @@ discard block | ||
| 289 | 289 | ]); | 
| 290 | 290 | |
| 291 | 291 |      if (null === $listItem) { | 
| 292 | -      throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId)); | |
| 292 | +        throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId)); | |
| 293 | 293 | } | 
| 294 | 294 | |
| 295 | 295 | return $listItem; | 
| 296 | - } | |
| 296 | + } | |
| 297 | 297 | |
| 298 | -  private function findOr404($listId, $id): ContentListItemInterface { | |
| 298 | +    private function findOr404($listId, $id): ContentListItemInterface { | |
| 299 | 299 | /** @var ContentListItemInterface $listItem */ | 
| 300 | 300 | $listItem = $this->contentListItemRepository->findOneBy([ | 
| 301 | 301 | 'contentList' => $listId, | 
| @@ -303,29 +303,29 @@ discard block | ||
| 303 | 303 | ]); | 
| 304 | 304 | |
| 305 | 305 |      if (null === $listItem) { | 
| 306 | -      throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id)); | |
| 306 | +        throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id)); | |
| 307 | 307 | } | 
| 308 | 308 | |
| 309 | 309 | return $listItem; | 
| 310 | - } | |
| 310 | + } | |
| 311 | 311 | |
| 312 | - private function ensureThereIsNoItemOnPositionOrThrow409( | |
| 313 | - int $listId, | |
| 314 | - int $position, | |
| 315 | - bool $isSticky, | |
| 316 | -      string $action): void { | |
| 317 | - $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position); | |
| 312 | + private function ensureThereIsNoItemOnPositionOrThrow409( | |
| 313 | + int $listId, | |
| 314 | + int $position, | |
| 315 | + bool $isSticky, | |
| 316 | +        string $action): void { | |
| 317 | + $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position); | |
| 318 | 318 | |
| 319 | -      if (!$existingContentListItem && !$isSticky) { | |
| 320 | - return; | |
| 321 | - } | |
| 319 | +        if (!$existingContentListItem && !$isSticky) { | |
| 320 | + return; | |
| 321 | + } | |
| 322 | 322 | |
| 323 | -      if ($existingContentListItem && $existingContentListItem->isSticky()) { | |
| 323 | +        if ($existingContentListItem && $existingContentListItem->isSticky()) { | |
| 324 | 324 |          throw new ConflictHttpException('There is already an item pinned on that position. Unpin it first.'); | 
| 325 | - } | |
| 325 | + } | |
| 326 | 326 | |
| 327 | -      if ($action === ContentListAction::ACTION_MOVE && $isSticky) { | |
| 328 | -          throw new ConflictHttpException('Cannot move pinned item. Unpin it first.'); | |
| 329 | - } | |
| 330 | - } | |
| 327 | +        if ($action === ContentListAction::ACTION_MOVE && $isSticky) { | |
| 328 | +            throw new ConflictHttpException('Cannot move pinned item. Unpin it first.'); | |
| 329 | + } | |
| 330 | + } | |
| 331 | 331 | } |