@@ -81,3 +82,13 @@
{% macro submit(label, opt) %}
{{ _self.button(label|default(__('form.submit')), {'type': 'submit', 'btn_type': 'primary'}|merge(opt|default({}))) }}
{%- endmacro %}
+
+{% macro switch(name, label, checked, opt) %}
+
+
+
+
+{%- endmacro %}
diff --git a/src/Controllers/Admin/UserShirtController.php b/src/Controllers/Admin/UserShirtController.php
new file mode 100644
index 00000000..240674f7
--- /dev/null
+++ b/src/Controllers/Admin/UserShirtController.php
@@ -0,0 +1,129 @@
+ 'user.edit.shirt',
+ 'saveShirt' => 'user.edit.shirt',
+ ];
+
+ /**
+ * @param Authenticator $auth
+ * @param Config $config
+ * @param LoggerInterface $log
+ * @param Redirector $redirector
+ * @param Response $response
+ * @param User $user
+ */
+ public function __construct(
+ Authenticator $auth,
+ Config $config,
+ LoggerInterface $log,
+ Redirector $redirector,
+ Response $response,
+ User $user
+ ) {
+ $this->auth = $auth;
+ $this->config = $config;
+ $this->log = $log;
+ $this->redirect = $redirector;
+ $this->response = $response;
+ $this->user = $user;
+ }
+
+ /**
+ * @param Request $request
+ *
+ * @return Response
+ */
+ public function editShirt(Request $request): Response
+ {
+ $id = $request->getAttribute('id');
+ $user = $this->user->findOrFail($id);
+
+ return $this->response->withView(
+ 'admin/user/edit-shirt.twig',
+ ['userdata' => $user] + $this->getNotifications()
+ );
+ }
+
+ /**
+ * @param Request $request
+ *
+ * @return Response
+ */
+ public function saveShirt(Request $request): Response
+ {
+ $id = $request->getAttribute('id');
+ /** @var User $user */
+ $user = $this->user->findOrFail($id);
+
+ $data = $this->validate($request, [
+ 'shirt_size' => 'required',
+ 'arrived' => 'optional|checked',
+ 'active' => 'optional|checked',
+ 'got_shirt' => 'optional|checked',
+ ]);
+
+ if (isset($this->config->get('tshirt_sizes')[$data['shirt_size']])) {
+ $user->personalData->shirt_size = $data['shirt_size'];
+ $user->personalData->save();
+ }
+
+ if ($this->auth->can('admin_arrive')) {
+ $user->state->arrived = (bool)$data['arrived'];
+ }
+
+ $user->state->active = (bool)$data['active'];
+ $user->state->got_shirt = (bool)$data['got_shirt'];
+ $user->state->save();
+
+ $this->log->info(
+ 'Updated user shirt state "{user}" ({id}): {size}, arrived: {arrived}, got shirt: {got_shirt}',
+ [
+ 'id' => $user->id,
+ 'user' => $user->name,
+ 'size' => $user->personalData->shirt_size,
+ 'arrived' => $user->state->arrived,
+ 'got_shirt' => $user->state->got_shirt
+ ]
+ );
+
+ $this->addNotification('user.edit.success');
+
+ return $this->redirect->back();
+ }
+}
diff --git a/src/Models/User/State.php b/src/Models/User/State.php
index 471b6758..10576e27 100644
--- a/src/Models/User/State.php
+++ b/src/Models/User/State.php
@@ -33,6 +33,15 @@ class State extends HasUserModel
'arrival_date',
];
+ /** @var array */
+ protected $casts = [
+ 'arrived' => 'boolean',
+ 'active' => 'boolean',
+ 'force_active' => 'boolean',
+ 'got_shirt' => 'boolean',
+ 'got_voucher' => 'integer',
+ ];
+
/** The attributes that are mass assignable */
protected $fillable = [
'user_id',
diff --git a/tests/Unit/Controllers/Admin/UserShirtControllerTest.php b/tests/Unit/Controllers/Admin/UserShirtControllerTest.php
new file mode 100644
index 00000000..414996f1
--- /dev/null
+++ b/tests/Unit/Controllers/Admin/UserShirtControllerTest.php
@@ -0,0 +1,163 @@
+request->withAttribute('id', 1);
+ /** @var Authenticator|MockObject $auth */
+ $auth = $this->createMock(Authenticator::class);
+ /** @var Redirector|MockObject $redirector */
+ $redirector = $this->createMock(Redirector::class);
+ $user = new User();
+ User::factory()->create();
+
+ $this->setExpects($this->response, 'withView', ['admin/user/edit-shirt.twig'], $this->response);
+
+ $controller = new UserShirtController($auth, $this->config, $this->log, $redirector, $this->response, $user);
+
+ $controller->editShirt($request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserShirtController::editShirt
+ */
+ public function testIndexUserNotFound()
+ {
+ /** @var Authenticator|MockObject $auth */
+ $auth = $this->createMock(Authenticator::class);
+ /** @var Redirector|MockObject $redirector */
+ $redirector = $this->createMock(Redirector::class);
+ $user = new User();
+
+ $controller = new UserShirtController($auth, $this->config, $this->log, $redirector, $this->response, $user);
+
+ $this->expectException(ModelNotFoundException::class);
+ $controller->editShirt($this->request);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserShirtController::saveShirt
+ */
+ public function testSaveShirt()
+ {
+ $request = $this->request
+ ->withAttribute('id', 1)
+ ->withParsedBody([
+ 'shirt_size' => 'S',
+ ]);
+ /** @var Authenticator|MockObject $auth */
+ $auth = $this->createMock(Authenticator::class);
+ $this->config->set('tshirt_sizes', ['S' => 'Small']);
+ /** @var Redirector|MockObject $redirector */
+ $redirector = $this->createMock(Redirector::class);
+ User::factory()
+ ->has(State::factory())
+ ->has(PersonalData::factory())
+ ->create();
+
+ $auth
+ ->expects($this->exactly(4))
+ ->method('can')
+ ->with('admin_arrive')
+ ->willReturnOnConsecutiveCalls(true, true, true, false);
+ $this->setExpects($redirector, 'back', null, $this->response, $this->exactly(4));
+
+ $controller = new UserShirtController(
+ $auth,
+ $this->config,
+ $this->log,
+ $redirector,
+ $this->response,
+ new User()
+ );
+ $controller->setValidator(new Validator());
+
+ // Set shirt size
+ $controller->saveShirt($request);
+
+ $this->assertHasNotification('user.edit.success');
+ $this->assertTrue($this->log->hasInfoThatContains('Updated user shirt state'));
+
+ $user = User::find(1);
+ $this->assertEquals('S', $user->personalData->shirt_size);
+ $this->assertFalse($user->state->arrived);
+ $this->assertFalse($user->state->active);
+ $this->assertFalse($user->state->got_shirt);
+
+ // Set active, arrived and got_shirt
+ $request = $request
+ ->withParsedBody([
+ 'shirt_size' => 'S',
+ 'arrived' => '1',
+ 'active' => '1',
+ 'got_shirt' => '1',
+ ]);
+
+ $controller->saveShirt($request);
+
+ $user = User::find(1);
+ $this->assertTrue($user->state->active);
+ $this->assertTrue($user->state->arrived);
+ $this->assertTrue($user->state->got_shirt);
+
+ // Shirt size not available
+ $request = $request
+ ->withParsedBody([
+ 'shirt_size' => 'L',
+ ]);
+
+ $controller->saveShirt($request);
+ $user = User::find(1);
+ $this->assertEquals('S', $user->personalData->shirt_size);
+
+ // Not allowed changing arrived
+ $request = $request
+ ->withParsedBody([
+ 'shirt_size' => 'S',
+ 'arrived' => '1',
+ ]);
+
+ $this->assertFalse($user->state->arrived);
+ $controller->saveShirt($request);
+ $user = User::find(1);
+ $this->assertFalse($user->state->arrived);
+ }
+
+ /**
+ * @covers \Engelsystem\Controllers\Admin\UserShirtController::saveShirt
+ */
+ public function testSaveShirtUserNotFound()
+ {
+ /** @var Authenticator|MockObject $auth */
+ $auth = $this->createMock(Authenticator::class);
+ /** @var Redirector|MockObject $redirector */
+ $redirector = $this->createMock(Redirector::class);
+ $user = new User();
+
+ $controller = new UserShirtController($auth, $this->config, $this->log, $redirector, $this->response, $user);
+
+ $this->expectException(ModelNotFoundException::class);
+ $controller->editShirt($this->request);
+ }
+}
diff --git a/tests/Unit/HasDatabase.php b/tests/Unit/HasDatabase.php
index be48038b..f5c87491 100644
--- a/tests/Unit/HasDatabase.php
+++ b/tests/Unit/HasDatabase.php
@@ -53,6 +53,7 @@ trait HasDatabase
['migration' => '2020_04_07_000000_change_mysql_database_encoding_to_utf8mb4'],
['migration' => '2020_09_12_000000_create_welcome_angel_permissions_group'],
['migration' => '2020_12_28_000000_oauth_set_identifier_binary'],
+ ['migration' => '2021_08_26_000000_add_shirt_edit_permissions'],
]
);