Skip to content

Commit

Permalink
Convert annotations to attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@zapotocnylubos
zapotocnylubos committed Jul 19, 2024
1 parent 7d95c43 commit 12053f0
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 215 deletions.
37 changes: 8 additions & 29 deletions webapp/src/Controller/BlogController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
namespace App\Controller;

use App\Entity\BlogPost;
use App\Entity\Clarification;
use App\Entity\User;
use App\Service\ConfigurationService;
use App\Service\DOMJudgeService;
use App\Service\EventLogService;
use App\Utils\Utils;
use DateTime;
use Doctrine\ORM\EntityManagerInterface;
use Setono\EditorJS\Parser\BlockParser\CodeBlockParser;
Expand All @@ -19,49 +16,33 @@
use Setono\EditorJS\Parser\BlockParser\TableBlockParser;
use Setono\EditorJS\Parser\Parser;
use Setono\EditorJS\Renderer\BlockRenderer\CodeBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\DelimiterBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\HeaderBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\ImageBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\ListBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\ParagraphBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\RawBlockRenderer;
use Setono\EditorJS\Renderer\BlockRenderer\TableBlockRenderer;
use Setono\EditorJS\Renderer\Renderer;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Attribute\Route;

/**
* @Route("/public/blog")
*/
#[Route("/public/blog")]
class BlogController extends BaseController
{
protected EntityManagerInterface $em;
protected DOMJudgeService $dj;
protected ConfigurationService $config;
protected EventLogService $eventLogService;

private int $postsPerPage;

public function __construct(
EntityManagerInterface $em,
DOMJudgeService $dj,
ConfigurationService $config,
EventLogService $eventLogService
protected EntityManagerInterface $em,
protected DOMJudgeService $dj,
protected ConfigurationService $config,
protected EventLogService $eventLogService
)
{
$this->em = $em;
$this->dj = $dj;
$this->config = $config;
$this->eventLogService = $eventLogService;

$this->postsPerPage = $this->config->get('blog_posts_per_page');
}

/**
* @Route("", name="public_blog_list")
*/
#[Route("", name: "public_blog_list")]
public function listAction(Request $request): Response
{
$totalPosts = $this->em->getRepository(BlogPost::class)
Expand Down Expand Up @@ -94,9 +75,7 @@ public function listAction(Request $request): Response
]);
}

/**
* @Route("/{slug}", name="public_blog_post")
*/
#[Route("/{slug}", name: "public_blog_post")]
public function viewAction(string $slug): Response
{
/** @var BlogPost $blogPost */
Expand Down
10 changes: 3 additions & 7 deletions webapp/src/Controller/HelpController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@
namespace App\Controller;

use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;

/**
* @Route("/public/help")
*/
#[Route('/public/help')]
class HelpController extends BaseController
{
/**
* @Route("", name="public_help")
*/
#[Route('', name: 'public_help')]
public function helpAction(): Response
{
return $this->render('public/help.html.twig');
Expand Down
37 changes: 12 additions & 25 deletions webapp/src/Controller/Jury/BlogController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@

use App\Controller\BaseController;
use App\Entity\BlogPost;
use App\Entity\Role;
use App\Entity\User;
use App\Form\Type\BlogPostType;
use App\Service\ConfigurationService;
use App\Service\DOMJudgeService;
use App\Service\EventLogService;
use App\Utils\Utils;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\File\Exception\FileException;
use Symfony\Component\HttpFoundation\File\UploadedFile;
Expand All @@ -20,14 +17,12 @@
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\PropertyAccess\PropertyAccess;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Component\String\Slugger\AsciiSlugger;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;

/**
* @Route("/jury/blog")
* @IsGranted("ROLE_JURY")
*/
#[Route(path: '/jury/blog')]
#[IsGranted('ROLE_JURY')]
class BlogController extends BaseController
{
private const EDITORJS_IMAGE_BASE_URL = '/media/cache/resolve/cache/media/images/';
Expand Down Expand Up @@ -57,9 +52,7 @@ public function __construct(
$this->slugger = new AsciiSlugger();
}

/**
* @Route("", methods={"GET"}, name="jury_blog")
*/
#[Route(path: '', name: 'jury_blog', methods: ['GET'])]
public function indexAction(): Response
{
/** @var BlogPost[] $blogPosts */
Expand Down Expand Up @@ -132,10 +125,8 @@ public function indexAction(): Response
]);
}

/**
* @Route("/send/image-upload", methods={"POST"}, name="jury_blog_image_upload")
* @IsGranted("ROLE_ADMIN")
*/
#[Route(path: '/send/image-upload', name: 'jury_blog_image_upload', methods: ['POST'])]
#[IsGranted('ROLE_ADMIN')]
public function uploadPostImageAction(Request $request): JsonResponse
{
/** @var UploadedFile|null $imageFile */
Expand Down Expand Up @@ -165,11 +156,9 @@ public function uploadPostImageAction(Request $request): JsonResponse
]);
}

/**
* @Route("/send", methods={"GET", "POST"}, name="jury_blog_post_send")
* @Route("/{id<\d+>}/edit", methods={"GET", "POST"}, name="jury_blog_post_edit")
* @IsGranted("ROLE_ADMIN")
*/
#[Route(path: '/send', name: 'jury_blog_post_send', methods: ['GET', 'POST'])]
#[Route(path: '/{id<\d+>}/edit', name: 'jury_blog_post_edit', methods: ['GET', 'POST'])]
#[IsGranted('ROLE_ADMIN')]
public function sendBlogPostAction(Request $request, ?int $id = null): Response
{
$editing = $id !== null;
Expand Down Expand Up @@ -229,10 +218,8 @@ public function sendBlogPostAction(Request $request, ?int $id = null): Response
]);
}

/**
* @Route("/{id<\d+>}/delete", name="jury_blog_post_delete")
* @IsGranted("ROLE_ADMIN")
*/
#[Route(path: '/{id<\d+>}/delete', name: 'jury_blog_post_delete', methods: ['POST'])]
#[IsGranted('ROLE_ADMIN')]
public function deleteBlogPostAction(Request $request, int $id): Response
{
/** @var BlogPost $blogPost */
Expand Down
69 changes: 24 additions & 45 deletions webapp/src/Controller/Jury/ProblemTestcaseGroupController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
use Doctrine\ORM\NoResultException;
use Doctrine\ORM\Query\Expr\Join;
use Exception;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RedirectResponse;
Expand All @@ -42,46 +41,29 @@
use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
use Symfony\Component\HttpKernel\KernelInterface;
use Symfony\Component\PropertyAccess\PropertyAccess;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;

use Symfony\Component\Yaml\Yaml;
use ZipArchive;

/**
* @Route("/jury/problems")
* @IsGranted("ROLE_JURY")
*/
#[Route('/jury/problems')]
#[IsGranted('ROLE_JURY')]
class ProblemTestcaseGroupController extends BaseController
{
protected EntityManagerInterface $em;
protected DOMJudgeService $dj;
protected ConfigurationService $config;
protected KernelInterface $kernel;
protected EventLogService $eventLogService;
protected SubmissionService $submissionService;
protected ImportProblemService $importProblemService;

public function __construct(
EntityManagerInterface $em,
DOMJudgeService $dj,
ConfigurationService $config,
KernelInterface $kernel,
EventLogService $eventLogService,
SubmissionService $submissionService,
ImportProblemService $importProblemService
protected EntityManagerInterface $em,
protected DOMJudgeService $dj,
protected ConfigurationService $config,
protected KernelInterface $kernel,
protected EventLogService $eventLogService,
protected SubmissionService $submissionService,
protected ImportProblemService $importProblemService
)
{
$this->em = $em;
$this->dj = $dj;
$this->config = $config;
$this->kernel = $kernel;
$this->eventLogService = $eventLogService;
$this->submissionService = $submissionService;
$this->importProblemService = $importProblemService;
}

/**
* @Route("/{probId<\d+>}/testcase-groups", name="jury_problem_testcase_groups")
*/
#[Route('/{probId<\d+>}/testcase-groups', name: 'jury_problem_testcase_groups')]
public function indexAction(Request $request, int $probId): Response
{
/** @var Problem $problem */
Expand Down Expand Up @@ -155,11 +137,12 @@ public function indexAction(Request $request, int $probId): Response
return $this->render('jury/problem_testcase_groups.html.twig', $data);
}

private function generateTestcaseGroupsTable($testcaseGroups,
array $tableFields,
bool $allowDeletion,
bool $problemIsLocked,
int $problemId): array
private function generateTestcaseGroupsTable(
$testcaseGroups,
array $tableFields,
bool $allowDeletion,
bool $problemIsLocked,
int $problemId): array
{
$propertyAccessor = PropertyAccess::createPropertyAccessor();
$testcaseGroupsTable = [];
Expand Down Expand Up @@ -217,10 +200,8 @@ private function generateTestcaseGroupsTable($testcaseGroups,
return $testcaseGroupsTable;
}

/**
* @Route("/{probId<\d+>}/testcase-groups/{testcaseGroupId<\d+>}/delete", name="jury_problem_testcase_group_delete")
* @IsGranted("ROLE_ADMIN")
*/
#[Route('/{probId<\d+>}/testcase-groups/{testcaseGroupId<\d+>}/delete', name: 'jury_problem_testcase_group_delete')]
#[IsGranted('ROLE_ADMIN')]
public function deleteAction(Request $request, int $probId, int $testcaseGroupId): Response
{
$testcaseGroup = $this->em->getRepository(TestcaseGroup::class)->find($testcaseGroupId);
Expand All @@ -236,11 +217,9 @@ public function deleteAction(Request $request, int $probId, int $testcaseGroupId
[$testcaseGroup], $this->generateUrl('jury_problem_testcase_groups', ['probId' => $probId]));
}

/**
* @Route("/{probId<\d+>}/testcase-groups/add", name="jury_problem_testcase_group_add")
* @Route("/{probId<\d+>}/testcase-groups/{testcaseGroupId<\d+>}/edit", name="jury_problem_testcase_group_edit")
* @IsGranted("ROLE_ADMIN")
*/
#[Route('/{probId<\d+>}/testcase-groups/add', name: 'jury_problem_testcase_group_add')]
#[Route('/{probId<\d+>}/testcase-groups/{testcaseGroupId<\d+>}/edit', name: 'jury_problem_testcase_group_edit')]
#[IsGranted('ROLE_ADMIN')]
public function addEditAction(Request $request, int $probId, ?int $testcaseGroupId = null): Response
{
$editing = $testcaseGroupId !== null;
Expand Down
Loading

0 comments on commit 12053f0

Please sign in to comment.