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.

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

Multi tags barcodes #66

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

###> symfony/framework-bundle ###
/.env
/public/bundles/
Expand All @@ -13,4 +12,7 @@
/.idea
data.sqlite
composer.lock
symfony.lock
symfony.lock

public/*
!public/index.php
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
"doctrine/doctrine-migrations-bundle": "^2.0",
"nelmio/cors-bundle": "^1.5",
"symfony/console": "^4.3",
"symfony/dotenv": "^4.3",
Expand Down
40 changes: 25 additions & 15 deletions src/Controller/Api/ArticleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
namespace App\Controller\Api;

use App\Entity\Article;
use App\Entity\ArticleTag;
use App\Entity\Barcode;
use App\Entity\Tag;
use App\Exception\ArticleBarcodeAlreadyExistsException;
use App\Exception\ArticleInactiveException;
use App\Exception\ArticleNotFoundException;
Expand Down Expand Up @@ -39,13 +42,14 @@ function list(Request $request, EntityManagerInterface $entityManager) {
$queryBuilder = $entityManager->createQueryBuilder()
->select('a1')
->from(Article::class, 'a1')
->leftJoin(Barcode::class, 'b', Join::WITH, 'b.article = a1')
->where('a1.active = :active')
->setParameter('active', $active);

$barcode = $request->query->get('barcode');
if ($barcode) {
$queryBuilder
->andWhere('a1.barcode = :barcode')
->andWhere('b.barcode = :barcode')
->setParameter('barcode', $barcode);
}

Expand Down Expand Up @@ -83,16 +87,6 @@ function list(Request $request, EntityManagerInterface $entityManager) {
function createArticle(Request $request, ArticleService $articleService, EntityManagerInterface $entityManager) {
$article = $articleService->createArticleByRequest($request);

if ($article->getBarcode()) {
$existingArticle = $entityManager->getRepository(Article::class)->findOneActiveBy([
'barcode' => $article->getBarcode()
]);

if ($existingArticle) {
throw new ArticleBarcodeAlreadyExistsException($existingArticle);
}
}

$entityManager->persist($article);
$entityManager->flush();

Expand All @@ -108,30 +102,46 @@ function search(Request $request, EntityManagerInterface $entityManager) {
$query = $request->query->get('query');
$limit = $request->query->get('limit', 25);
$barcode = $request->query->get('barcode');
$tag = $request->query->get('tag');

$queryBuilder = $entityManager->getRepository(Article::class)->createQueryBuilder('a');
$queryBuilder = $entityManager
->getRepository(Article::class)
->createQueryBuilder('a')
->leftJoin(Barcode::class, 'b', Join::WITH, 'b.article = a')
->leftJoin(ArticleTag::class, 'at', Join::WITH, 'at.article = a')
->leftJoin(Tag::class, 't', Join::WITH, 'at.tag = t');

if ($barcode) {
$query = false;

$queryBuilder
->where('a.barcode = :barcode')
->where('b.barcode = :barcode')
->setParameter('barcode', $barcode);
}

if ($tag) {
$query = false;

$queryBuilder
->where('t.tag = :tag')
->setParameter('tag', $tag);
}

if ($query) {
$queryBuilder
->where('a.barcode = :barcode')
->where('b.barcode = :barcode')
->orWhere('t.tag = :tag')
->orWhere('a.name LIKE :query')
->setParameter('barcode', $query)
->setParameter('tag', $query)
->setParameter('query', '%' . $query . '%');
}


$results = $queryBuilder
->andWhere('a.active = true')
->orderBy('a.name')
->setMaxResults($limit)
->groupBy('a')
->getQuery()
->getResult();

Expand Down
124 changes: 124 additions & 0 deletions src/Controller/Api/BarcodeController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?php

namespace App\Controller\Api;

use App\Entity\Article;
use App\Entity\Barcode;
use App\Exception\ArticleBarcodeAlreadyExistsException;
use App\Exception\ArticleNotFoundException;
use App\Exception\BarcodeInvalidException;
use App\Exception\BarcodeNotFoundException;
use App\Serializer\ArticleSerializer;
use App\Serializer\BarcodeSerializer;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;

/**
* @Route("/api")
*/
class BarcodeController extends AbstractController {

private $barcodeSerializer;

function __construct(BarcodeSerializer $barcodeSerializer) {
$this->barcodeSerializer = $barcodeSerializer;
}

/**
* @Route("/barcode", methods="GET")
*/
function listBarcodes(EntityManagerInterface $entityManager) {
$barcodes = $entityManager->getRepository(Barcode::class)->findBy([], ['created' => 'DESC']);

return $this->json([
'count' => count($barcodes),
'barcodes' => array_map(function (Barcode $barcode) {
return $this->barcodeSerializer->serialize($barcode);
}, $barcodes),
]);
}

/**
* @Route("/article/{articleId}/barcode", methods="GET")
*/
function listArticleBarcode(int $articleId, EntityManagerInterface $entityManager) {
$article = $entityManager->getRepository(Article::class)->find($articleId);
$barcodes = $article->getBarcodes()->getValues();

return $this->json([
'count' => count($barcodes),
'barcodes' => array_map(function (Barcode $barcode) {
return $this->barcodeSerializer->serialize($barcode);
}, $barcodes),
]);
}

/**
* @Route("/article/{articleId}/barcode/{barcodeId}", methods="GET")
*/
function getArticleBarcode(int $articleId, int $barcodeId, EntityManagerInterface $entityManager) {
$barcode = $entityManager->getRepository(Barcode::class)->find($barcodeId);
if (!$barcode) {
throw new BarcodeNotFoundException($barcodeId);
}

return $this->json([
'barcode' => $this->barcodeSerializer->serialize($barcode)
]);
}

/**
* @Route("/article/{articleId}/barcode", methods="POST")
*/
function addArticleBarcode(int $articleId, Request $request, ArticleSerializer $articleSerializer, EntityManagerInterface $entityManager) {
$barcode = $request->request->get('barcode');

if (!$barcode) {
throw new BarcodeInvalidException($barcode);
}

$article = $entityManager->getRepository(Article::class)->find($articleId);
if (!$article) {
throw new ArticleNotFoundException($articleId);
}

$existingBarcode = $entityManager->getRepository(Barcode::class)->findByBarcode($barcode);
if ($existingBarcode) {
throw new ArticleBarcodeAlreadyExistsException($existingBarcode);
}

$newBarcode = new Barcode($barcode);
$article->addBarcode($newBarcode);

$entityManager->persist($article);
$entityManager->flush();

return $this->json([
'article' => $articleSerializer->serialize($article)
]);
}

/**
* @Route("/article/{articleId}/barcode/{barcodeId}", methods="DELETE")
*/
function deleteArticleBarcode(int $articleId, int $barcodeId, ArticleSerializer $articleSerializer, EntityManagerInterface $entityManager) {
$article = $entityManager->getRepository(Article::class)->find($articleId);
if (!$article) {
throw new ArticleNotFoundException($articleId);
}

$existingBarcode = $entityManager->getRepository(Barcode::class)->find($barcodeId);
if (!$existingBarcode) {
throw new BarcodeNotFoundException($barcodeId);
}

$entityManager->remove($existingBarcode);
$entityManager->flush();

return $this->json([
'article' => $articleSerializer->serialize($article)
]);
}
}
141 changes: 141 additions & 0 deletions src/Controller/Api/TagController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?php

namespace App\Controller\Api;

use App\Entity\Article;
use App\Entity\ArticleTag;
use App\Entity\Tag;
use App\Exception\ArticleNotFoundException;
use App\Exception\ArticleTagAlreadyExistsException;
use App\Exception\BarcodeNotFoundException;
use App\Exception\TagNotFoundException;
use App\Serializer\ArticleSerializer;
use App\Serializer\TagSerializer;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;

/**
* @Route("/api")
*/
class TagController extends AbstractController {

private $tagSerializer;

function __construct(TagSerializer $tagSerializer) {
$this->tagSerializer = $tagSerializer;
}

/**
* @Route("/tag", methods="GET")
*/
function listTags(EntityManagerInterface $entityManager) {
$tags = $entityManager->getRepository(Tag::class)->findAll();

usort($tags, function (Tag $a, Tag $b) {
return $a->getUsageCount() <=> $b->getUsageCount() && $a->getCreated() <=> $b->getCreated();
});

return $this->json([
'count' => count($tags),
'tags' => array_map(function (Tag $tag) {
return $this->tagSerializer->serialize($tag);
}, $tags),
]);
}

/**
* @Route("/article/{articleId}/tag", methods="GET")
*/
function listArticleBarcode(int $articleId, EntityManagerInterface $entityManager) {
$article = $entityManager->getRepository(Article::class)->find($articleId);
$tags = $article->getTags();

return $this->json([
'count' => count($tags),
'tags' => array_map(function (Tag $tag) {
return $this->tagSerializer->serialize($tag);
}, $tags),
]);
}

/**
* @Route("/article/{articleId}/tag/{tagId}", methods="GET")
*/
function getArticleTag(int $articleId, int $tagId, EntityManagerInterface $entityManager) {
$tag = $entityManager->getRepository(Tag::class)->find($tagId);
if (!$tag) {
throw new BarcodeNotFoundException($tagId);
}

return $this->json([
'tag' => $this->tagSerializer->serialize($tag)
]);
}

/**
* @Route("/article/{articleId}/tag", methods="POST")
*/
function addArticleTag(int $articleId, Request $request, ArticleSerializer $articleSerializer, EntityManagerInterface $entityManager) {
$tag = $request->request->get('tag');

$article = $entityManager->getRepository(Article::class)->find($articleId);
if (!$article) {
throw new ArticleNotFoundException($articleId);
}

$newTag = new Tag($tag);
$existingTag = $entityManager->getRepository(Tag::class)->findByTag($tag);
if ($existingTag) {
if ($article->hasTag($existingTag)) {
throw new ArticleTagAlreadyExistsException($article, $existingTag);
}

// use already existing tag, just add reference!
$newTag = $existingTag;
}

$article->addTag($newTag);

$entityManager->persist($article);
$entityManager->flush();

return $this->json([
'article' => $articleSerializer->serialize($article)
]);
}

/**
* @Route("/article/{articleId}/tag/{articleTagId}", methods="DELETE")
*/
function deleteArticleTag(int $articleId, int $articleTagId, ArticleSerializer $articleSerializer, EntityManagerInterface $entityManager) {
$article = $entityManager->getRepository(Article::class)->find($articleId);
if (!$article) {
throw new ArticleNotFoundException($articleId);
}

/**
* @var $articleTag ArticleTag
*/
$articleTag = $entityManager->getRepository(ArticleTag::class)->find($articleTagId);
if (!$articleTag) {
throw new TagNotFoundException($articleTagId);
}

$entityManager->transactional(function() use ($entityManager, $articleTag) {
$entityManager->remove($articleTag);

$tag = $articleTag->getTag();
if ($tag->getUsageCount() === 1) {
$entityManager->remove($tag);
}

$entityManager->flush();
});

return $this->json([
'article' => $articleSerializer->serialize($article)
]);
}
}
Loading