diff --git a/migrations/Version20260825211700.php b/migrations/Version20260825211700.php new file mode 100644 index 0000000..ca77b00 --- /dev/null +++ b/migrations/Version20260825211700.php @@ -0,0 +1,37 @@ +addSql('CREATE TABLE user_setting (id INT AUTO_INCREMENT NOT NULL, label VARCHAR(255) NOT NULL, value VARCHAR(255) NOT NULL, user_id_id INT NOT NULL, INDEX IDX_C779A6929D86650F (user_id_id), PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci`'); + $this->addSql('ALTER TABLE user_setting ADD CONSTRAINT FK_C779A6929D86650F FOREIGN KEY (user_id_id) REFERENCES `user` (id)'); + $this->addSql('ALTER TABLE user_settings DROP FOREIGN KEY `FK_5C844C59D86650F`'); + $this->addSql('DROP TABLE user_settings'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('CREATE TABLE user_settings (id INT AUTO_INCREMENT NOT NULL, user_id_id INT NOT NULL, label VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, value VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, INDEX IDX_5C844C59D86650F (user_id_id), PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('ALTER TABLE user_settings ADD CONSTRAINT `FK_5C844C59D86650F` FOREIGN KEY (user_id_id) REFERENCES user (id)'); + $this->addSql('ALTER TABLE user_setting DROP FOREIGN KEY FK_C779A6929D86650F'); + $this->addSql('DROP TABLE user_setting'); + } +} diff --git a/package.json b/package.json index 497e644..5ffa29a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "watch": "encore dev --watch", "dev": "concurrently --names server,assets,scheduler \"frankenphp run\" \"npm run watch\" \"frankenphp php-cli bin/console messenger:consume scheduler_scheduler_weather -vv\"", "build": "encore production --progress", - "scheduler": "frankenphp php-cli bin/console messenger:consume scheduler_scheduler_weather" + "dev_scheduler": "frankenphp php-cli bin/console messenger:consume scheduler_scheduler_weather" }, "dependencies": { "@fontsource/noto-sans": "^5.3.0", diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index 65a797d..a557430 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -5,7 +5,7 @@ use App\Entity\Settings; use App\Entity\User; use App\Entity\Task; -use App\Entity\UserSettings; +use App\Entity\UserSetting; use App\Form\TaskType; use App\Repository\TaskRepository; use App\Service\TaskRecommendationService; @@ -204,7 +204,7 @@ final class TaskController extends AbstractController return $this->redirectToRoute('app_task_index'); } - public function getUserSettings(string $label): Settings{ + public function getUserSetting(string $label): Settings{ $user = $this->getUser(); $settings = $user->getSettings(); diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingController.php similarity index 72% rename from src/Controller/UserSettingsController.php rename to src/Controller/UserSettingController.php index e6398d7..2a7a3de 100644 --- a/src/Controller/UserSettingsController.php +++ b/src/Controller/UserSettingController.php @@ -2,9 +2,9 @@ namespace App\Controller; -use App\Entity\UserSettings; -use App\Form\UserSettings1Type; -use App\Repository\UserSettingsRepository; +use App\Entity\UserSetting; +use App\Form\UserSetting1Type; +use App\Repository\UserSettingRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -12,21 +12,21 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Attribute\Route; #[Route('/user/settings')] -final class UserSettingsController extends AbstractController +final class UserSettingController extends AbstractController { #[Route(name: 'app_user_settings_index', methods: ['GET'])] - public function index(UserSettingsRepository $userSettingsRepository): Response + public function index(UserSettingRepository $UserSettingRepository): Response { return $this->render('user_settings/index.html.twig', [ - 'user_settings' => $userSettingsRepository->findAll(), + 'user_settings' => $UserSettingRepository->findAll(), ]); } #[Route('/new', name: 'app_user_settings_new', methods: ['GET', 'POST'])] public function new(Request $request, EntityManagerInterface $entityManager): Response { - $userSetting = new UserSettings(); - $form = $this->createForm(UserSettings1Type::class, $userSetting); + $userSetting = new UserSetting(); + $form = $this->createForm(UserSetting1Type::class, $userSetting); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { @@ -43,7 +43,7 @@ final class UserSettingsController extends AbstractController } #[Route('/{id}', name: 'app_user_settings_show', methods: ['GET'])] - public function show(UserSettings $userSetting): Response + public function show(UserSetting $userSetting): Response { return $this->render('user_settings/show.html.twig', [ 'user_setting' => $userSetting, @@ -51,9 +51,9 @@ final class UserSettingsController extends AbstractController } #[Route('/{id}/edit', name: 'app_user_settings_edit', methods: ['GET', 'POST'])] - public function edit(Request $request, UserSettings $userSetting, EntityManagerInterface $entityManager): Response + public function edit(Request $request, UserSetting $userSetting, EntityManagerInterface $entityManager): Response { - $form = $this->createForm(UserSettings1Type::class, $userSetting); + $form = $this->createForm(UserSetting1Type::class, $userSetting); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { @@ -69,7 +69,7 @@ final class UserSettingsController extends AbstractController } #[Route('/{id}', name: 'app_user_settings_delete', methods: ['POST'])] - public function delete(Request $request, UserSettings $userSetting, EntityManagerInterface $entityManager): Response + public function delete(Request $request, UserSetting $userSetting, EntityManagerInterface $entityManager): Response { if ($this->isCsrfTokenValid('delete'.$userSetting->getId(), $request->getPayload()->getString('_token'))) { $entityManager->remove($userSetting); diff --git a/src/Entity/User.php b/src/Entity/User.php index 6da463a..d49516c 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -38,14 +38,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface private ?Settings $settings = null; /** - * @var Collection + * @var Collection */ - #[ORM\OneToMany(targetEntity: UserSettings::class, mappedBy: 'user_id', orphanRemoval: true)] - private Collection $userSettings; + #[ORM\OneToMany(targetEntity: UserSetting::class, mappedBy: 'user_id', orphanRemoval: true)] + private Collection $UserSetting; public function __construct() { - $this->userSettings = new ArrayCollection(); + $this->UserSetting = new ArrayCollection(); } @@ -143,26 +143,26 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface } /** - * @return Collection + * @return Collection */ - public function getUserSettings(): Collection + public function getUserSetting(): Collection { - return $this->userSettings; + return $this->UserSetting; } - public function addUserSetting(UserSettings $userSetting): static + public function addUserSetting(UserSetting $userSetting): static { - if (!$this->userSettings->contains($userSetting)) { - $this->userSettings->add($userSetting); + if (!$this->UserSetting->contains($userSetting)) { + $this->UserSetting->add($userSetting); $userSetting->setUserId($this); } return $this; } - public function removeUserSetting(UserSettings $userSetting): static + public function removeUserSetting(UserSetting $userSetting): static { - if ($this->userSettings->removeElement($userSetting)) { + if ($this->UserSetting->removeElement($userSetting)) { // set the owning side to null (unless already changed) if ($userSetting->getUserId() === $this) { $userSetting->setUserId(null); diff --git a/src/Entity/UserSettings.php b/src/Entity/UserSetting.php similarity index 86% rename from src/Entity/UserSettings.php rename to src/Entity/UserSetting.php index f5d2134..5d13636 100644 --- a/src/Entity/UserSettings.php +++ b/src/Entity/UserSetting.php @@ -2,11 +2,11 @@ namespace App\Entity; -use App\Repository\UserSettingsRepository; +use App\Repository\UserSettingRepository; use Doctrine\ORM\Mapping as ORM; -#[ORM\Entity(repositoryClass: UserSettingsRepository::class)] -class UserSettings +#[ORM\Entity(repositoryClass: UserSettingRepository::class)] +class UserSetting { #[ORM\Id] #[ORM\GeneratedValue] @@ -22,7 +22,7 @@ class UserSettings #[ORM\Column(length: 255)] private ?string $value = null; - #[ORM\ManyToOne(inversedBy: 'userSettings')] + #[ORM\ManyToOne(inversedBy: 'UserSetting')] #[ORM\JoinColumn(nullable: false)] private ?User $user_id = null; diff --git a/src/Form/UserSettings1Type.php b/src/Form/UserSetting1Type.php similarity index 85% rename from src/Form/UserSettings1Type.php rename to src/Form/UserSetting1Type.php index ada5bc0..ecb31e8 100644 --- a/src/Form/UserSettings1Type.php +++ b/src/Form/UserSetting1Type.php @@ -3,13 +3,13 @@ namespace App\Form; use App\Entity\User; -use App\Entity\UserSettings; +use App\Entity\UserSetting; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -class UserSettings1Type extends AbstractType +class UserSetting1Type extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options): void { @@ -26,7 +26,7 @@ class UserSettings1Type extends AbstractType public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ - 'data_class' => UserSettings::class, + 'data_class' => UserSetting::class, ]); } } diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingType.php similarity index 80% rename from src/Form/UserSettingsType.php rename to src/Form/UserSettingType.php index 6843887..0c632da 100644 --- a/src/Form/UserSettingsType.php +++ b/src/Form/UserSettingType.php @@ -2,12 +2,12 @@ namespace App\Form; -use App\Entity\UserSettings; +use App\Entity\UserSetting; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -class UserSettingsType extends AbstractType +class UserSettingType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options): void { @@ -21,7 +21,7 @@ class UserSettingsType extends AbstractType public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ - 'data_class' => UserSettings::class, + 'data_class' => UserSetting::class, ]); } } diff --git a/src/Repository/UserSettingsRepository.php b/src/Repository/UserSettingRepository.php similarity index 77% rename from src/Repository/UserSettingsRepository.php rename to src/Repository/UserSettingRepository.php index db057b5..d390cd5 100644 --- a/src/Repository/UserSettingsRepository.php +++ b/src/Repository/UserSettingRepository.php @@ -2,22 +2,22 @@ namespace App\Repository; -use App\Entity\UserSettings; +use App\Entity\UserSetting; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; /** - * @extends ServiceEntityRepository + * @extends ServiceEntityRepository */ -class UserSettingsRepository extends ServiceEntityRepository +class UserSettingRepository extends ServiceEntityRepository { public function __construct(ManagerRegistry $registry) { - parent::__construct($registry, UserSettings::class); + parent::__construct($registry, UserSetting::class); } // /** - // * @return UserSettings[] Returns an array of UserSettings objects + // * @return UserSetting[] Returns an array of UserSetting objects // */ // public function findByExampleField($value): array // { @@ -31,7 +31,7 @@ class UserSettingsRepository extends ServiceEntityRepository // ; // } - // public function findOneBySomeField($value): ?UserSettings + // public function findOneBySomeField($value): ?UserSetting // { // return $this->createQueryBuilder('u') // ->andWhere('u.exampleField = :val') diff --git a/templates/user_settings/edit.html.twig b/templates/user_settings/edit.html.twig index d00bf8e..304f834 100644 --- a/templates/user_settings/edit.html.twig +++ b/templates/user_settings/edit.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}Edit UserSettings{% endblock %} +{% block title %}Edit UserSetting{% endblock %} {% block body %} -

Edit UserSettings

+

Edit UserSetting

{{ include('user_settings/_form.html.twig', {'button_label': 'Update'}) }} diff --git a/templates/user_settings/index.html.twig b/templates/user_settings/index.html.twig index a0aa14e..72e939d 100644 --- a/templates/user_settings/index.html.twig +++ b/templates/user_settings/index.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}UserSettings index{% endblock %} +{% block title %}UserSetting index{% endblock %} {% block body %} -

UserSettings index

+

UserSetting index

diff --git a/templates/user_settings/new.html.twig b/templates/user_settings/new.html.twig index faacf6a..6b672d6 100644 --- a/templates/user_settings/new.html.twig +++ b/templates/user_settings/new.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}New UserSettings{% endblock %} +{% block title %}New UserSetting{% endblock %} {% block body %} -

Create new UserSettings

+

Create new UserSetting

{{ include('user_settings/_form.html.twig') }} diff --git a/templates/user_settings/show.html.twig b/templates/user_settings/show.html.twig index 9efe828..2f48c66 100644 --- a/templates/user_settings/show.html.twig +++ b/templates/user_settings/show.html.twig @@ -1,9 +1,9 @@ {% extends 'base.html.twig' %} -{% block title %}UserSettings{% endblock %} +{% block title %}UserSetting{% endblock %} {% block body %} -

UserSettings

+

UserSetting