#115 - CRUD for administrators frontend

Makefile

@@ -54,6 +54,11 @@ test-specific:
 fix:
 	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'composer csf'
 
+lintf:
+	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'npm run lintf'
+
+fix-all: fix lintf
+
 analyse:
 	@docker compose --file ${DOCKER_COMPOSE_FILE} exec --user "${CURRENT_USER_ID}:${CURRENT_USER_GROUP_ID}" ${DOCKER_COMPOSE_APP_CONTAINER} bash -c 'composer analyse'
 
@@ -66,4 +71,4 @@ queue:
 create-test-db:
 	@docker compose --file ${DOCKER_COMPOSE_FILE} exec ${DOCKER_COMPOSE_DATABASE_CONTAINER} bash -c 'createdb --username=${DATABASE_USERNAME} ${TEST_DATABASE_NAME} &> /dev/null && echo "Created database for tests (${TEST_DATABASE_NAME})." || echo "Database for tests (${TEST_DATABASE_NAME}) exists."'
 
-.PHONY: init check-env-file build run stop restart shell shell-root test fix create-test-db queue analyse dev
+.PHONY: init check-env-file build run stop restart shell shell-root test test-specific fix lintf fix-all create-test-db queue analyse dev

app/DTO/SchoolDTO.php

@@ -8,6 +8,7 @@ class SchoolDTO
 {
     public function __construct(
         public string $name,
+        public string $regon,
         public string $city,
         public string $street,
         public string $buildingNumber,
@@ -19,6 +20,7 @@ public static function createFromArray(array $data): self
     {
         $member = new self(
             $data["nazwa"],
+            $data["regon"],
             $data["miejscowosc"],
             $data["ulica"],
             $data["numerBudynku"],
@@ -28,4 +30,17 @@ public static function createFromArray(array $data): self
 
         return $member;
     }
+
+    public function toArray(): array
+    {
+        return [
+            "name" => $this->name,
+            "regon" => $this->regon,
+            "city" => $this->city,
+            "street" => $this->street,
+            "building_number" => $this->buildingNumber,
+            "apartment_number" => $this->apartmentNumber,
+            "zip_code" => $this->zipCode,
+        ];
+    }
 }

app/Http/Controllers/SchoolsController.php

@@ -34,7 +34,8 @@ public function store(SchoolRequest $request): RedirectResponse
         School::query()->create($request->validated());
 
         return redirect()
-            ->back();
+            ->back()
+            ->with("status", "Szkoła została dodana.");
     }
 
     public function update(SchoolRequest $request, School $school): RedirectResponse

app/Http/Controllers/UserController.php

@@ -19,9 +19,11 @@ class UserController extends Controller
     public function index(Request $request): Response
     {
         $users = User::query()->role("user")->with("school")->orderBy("id")->get();
+        $schools = School::query()->orderBy("id")->get();
 
         return Inertia::render("Admin/UsersPanel", [
             "users" => UserResource::collection($users),
+            "schools" => SchoolResource::collection($schools),
         ]);
     }
 
@@ -43,7 +45,7 @@ public function update(UserRequest $request, User $user): RedirectResponse
 
         return redirect()
             ->route("admin.users.index")
-            ->with("success", "Użytkownik zaktualizowany pomyślnie.");
+            ->with("status", "Użytkownik zaktualizowany pomyślnie.");
     }
 
     public function anonymize(User $user): RedirectResponse
@@ -58,6 +60,6 @@ public function anonymize(User $user): RedirectResponse
 
         return redirect()
             ->back()
-            ->with("success", "Dane użytkownika zostały zanonimizowane.");
+            ->with("status", "Dane użytkownika zostały zanonimizowane.");
     }
 }

app/Http/Requests/SchoolRequest.php

@@ -14,6 +14,21 @@ public function authorize(): bool
         return true;
     }
 
+    public function prepareForValidation(): void
+    {
+        if ($this->has("buildingNumber")) {
+            $this->merge(["building_number" => $this->input("buildingNumber")]);
+        }
+
+        if ($this->has("apartmentNumber")) {
+            $this->merge(["apartment_number" => $this->input("apartmentNumber")]);
+        }
+
+        if ($this->has("zipCode")) {
+            $this->merge(["zip_code" => $this->input("zipCode")]);
+        }
+    }
+
     /**
      * @return array<string, ValidationRule|array|string>
      */
@@ -22,9 +37,10 @@ public function rules(): array
         return [
             "name" => ["required", "string"],
             "city" => ["required", "string"],
+            "regon" => ["required", "string"],
             "street" => ["required", "string"],
             "building_number" => ["required", "string"],
-            "apartment_number" => ["string"],
+            "apartment_number" => ["string", "nullable"],
             "zip_code" => ["required", "string"],
         ];
     }

app/Http/Resources/SchoolResource.php

@@ -17,7 +17,15 @@ public function toArray(Request $request): array
         return [
             "id" => $this->id,
             "name" => $this->name,
+            "regon" => $this->regon,
             "city" => $this->city,
+            "street" => $this->street,
+            "buildingNumber" => $this->building_number,
+            "apartmentNumber" => $this->apartment_number,
+            "zipCode" => $this->zip_code,
+            "numberOfStudents" => $this->users()->count(),
+            "createdAt" => $this->created_at,
+            "updatedAt" => $this->updated_at,
         ];
     }
 }

app/Http/Resources/UserResource.php

@@ -23,6 +23,8 @@ public function toArray(Request $request): array
             "isAnonymized" => $this->is_anonymized,
             "isAdmin" => $this->hasRole("admin"),
             "isSuperAdmin" => $this->hasRole("super_admin"),
+            "createdAt" => $this->created_at,
+            "updatedAt" => $this->updated_at,
         ];
     }
 }

app/Models/School.php

@@ -5,11 +5,14 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * @property int $id
+ * @property string $regon
  * @property string $name
  * @property string $city
  * @property string $street
@@ -18,17 +21,24 @@
  * @property string $zip_code
  * @property Carbon $created_at
  * @property Carbon $updated_at
+ * @property Collection<User> $users
  */
 class School extends Model
 {
     use HasFactory;
 
     protected $fillable = [
         "name",
+        "regon",
         "city",
         "street",
         "building_number",
         "apartment_number",
         "zip_code",
     ];
+
+    public function users(): HasMany
+    {
+        return $this->hasMany(User::class);
+    }
 }

app/Services/GetSchoolDataService.php

@@ -47,15 +47,10 @@ protected function fetchSchools(Voivodeship $voivodeship, array $schoolTypes): C
      */
     protected function store(Collection $schools): void
     {
-        foreach ($schools as $school) {
-            School::firstOrCreate([
-                "name" => $school->name,
-                "city" => $school->city,
-                "street" => $school->street,
-                "building_number" => $school->buildingNumber,
-                "apartment_number" => $school->apartmentNumber,
-                "zip_code" => $school->zipCode,
-            ]);
+        foreach ($schools as $dto) {
+            $school = School::query()->firstOrNew(["regon" => $dto->regon]);
+            $school->fill($dto->toArray());
+            $school->save();
         }
     }
 }

database/factories/SchoolFactory.php

@@ -7,6 +7,8 @@
 use App\Models\School;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+use function str;
+
 /**
  * @extends Factory<School>
  */
@@ -21,6 +23,7 @@ public function definition(): array
     {
         return [
             "name" => fake()->company(),
+            "regon" => str(fake()->randomNumber(9)),
             "city" => fake()->city(),
             "street" => fake()->streetName(),
             "building_number" => fake()->buildingNumber(),

database/migrations/2024_08_08_113859_create_schools_table.php

@@ -11,6 +11,7 @@ public function up(): void
     {
         Schema::create("schools", function (Blueprint $table): void {
             $table->bigIncrements("id")->unique();
+            $table->string("regon");
             $table->string("name");
             $table->string("city");
             $table->string("street");

resources/js/Helpers/Sorter.ts

@@ -0,0 +1,48 @@
+import {onMounted, ref, type Ref, watch} from 'vue'
+import dayjs from 'dayjs'
+import {keysWrapper} from '@/Helpers/KeysManager'
+
+function setSorter<T extends Sortable>(sorter: Ref<Sorter<T> | undefined>, sorterName: string, type: 'name' | 'title' | 'creationDate' | 'modificationDate', desc = false) {
+  sessionStorage.setItem(`${sorterName}SorterPreference`, JSON.stringify([type, desc]))
+
+  sorter.value = (a: T, b: T) => {
+    if (desc) {
+      [a, b] = [b, a]
+    }
+
+    const comparators = {
+      title: () => ('title' in a && 'title' in b) ? a.title.localeCompare(b.title) : 0,
+      name: () => ('name' in a && 'name' in b) ? a.name.localeCompare(b.name) : 0,
+      creationDate: () => dayjs(a.createdAt).diff(dayjs(b.createdAt)),
+      modificationDate: () => dayjs(a.updatedAt).diff(dayjs(b.updatedAt)),
+    }
+
+    return comparators[type]()
+  }
+}
+
+export function useSorter<T extends Sortable>(sorterName: string, data: () => T[], options: SortOptionConstructor[]): [Ref<T[], T[]>, SortOption[]] {
+  const items = ref<T[]>(data()) as Ref<T[]>
+  const sorter = ref<(a: T, b: T) => number>()
+  const sortOptions = keysWrapper(options.map((option) => ({
+    text: option.text,
+    action: () => setSorter(sorter, sorterName, option.type, option.desc) }
+  )))
+
+  onMounted(() => {
+    const savedSorter = sessionStorage.getItem(`${sorterName}SorterPreference`)
+    const [type, desc] = savedSorter ? JSON.parse(savedSorter) : ['modificationDate', true]
+    setSorter(sorter, sorterName, type, desc)
+  })
+
+  watch(
+    [data, sorter],
+    ([newData, sorter]) => {
+      items.value = newData
+      items.value.sort(sorter)
+    },
+    { immediate: true },
+  )
+
+  return [items, sortOptions]
+}

resources/js/Helpers/vDynamicInputWidth.ts

@@ -10,12 +10,20 @@ function initDynamicWidthCalc(input:HTMLInputElement & { _calculateDynamicWidth:
 }
 
 function calculateDynamicWidth(input:HTMLInputElement, binding?:DirectiveBinding<boolean>){
-  if (binding?.value === false) return
+  if (binding?.value === false) {
+    return
+  }
+
   const context = canvas.getContext('2d')
-  if (!context) return
+
+  if (!context) {
+    return
+  }
+
   const { fontWeight, fontSize, fontFamily } = window.getComputedStyle(input)
   context.font = `${fontWeight} ${fontSize} ${fontFamily}`
-  const width = `${context.measureText(input.value).width}px`
+  const width = `${context.measureText(input.value || input.placeholder).width}px`
+
   input.style.width = `clamp(1.1rem,${width},100%)`
 }
 

resources/js/Helpers/vDynamicTextAreaHeight.ts

@@ -0,0 +1,35 @@
+import { type DirectiveBinding } from 'vue'
+
+function initDynamicHeightCalc(input:HTMLTextAreaElement & { _calculateDynamicHeight:() => void }, binding?:DirectiveBinding<boolean>) {
+  input._calculateDynamicHeight = () => calculateDynamicHeight(input, binding)
+
+  document.fonts.addEventListener('loadingdone', input._calculateDynamicHeight)
+  input.addEventListener('transitionend', input._calculateDynamicHeight)
+
+  input._calculateDynamicHeight()
+  input.style.resize = 'none'
+}
+
+function calculateDynamicHeight(input:HTMLTextAreaElement, binding?:DirectiveBinding<boolean>){
+  if (binding?.value === false) {
+    return
+  }
+
+  // Reset the height to a minimal value to refresh scrollHeight.
+  // This ensures the textarea will shrink when text is removed.
+  input.style.height = '5px'
+  input.style.height = `${input.scrollHeight}px`
+}
+
+function removeDynamicHeightCalc(input:HTMLTextAreaElement & { _calculateDynamicHeight:() => void }) {
+  document.fonts.removeEventListener('loadingdone', input._calculateDynamicHeight)
+  input.removeEventListener('transitionend', input._calculateDynamicHeight)
+}
+
+const vDynamicInputHeight = {
+  mounted: initDynamicHeightCalc,
+  updated: calculateDynamicHeight,
+  unmounted: removeDynamicHeightCalc,
+}
+
+export default vDynamicInputHeight