#36 Preserve name uniqueness at a school #42

Merged
okorpheus merged 1 commits from auditionadmin-36 into master 2024-07-18 05:29:22 +00:00
4 changed files with 50 additions and 0 deletions
Showing only changes of commit 950b93c0a8 - Show all commits

View File

@ -48,6 +48,13 @@ class StudentController extends Controller
'school_id' => ['required', 'exists:schools,id'], 'school_id' => ['required', 'exists:schools,id'],
]); ]);
if (Student::where('first_name', request('first_name'))
->where('last_name', request('last_name'))
->where('school_id', request('school_id'))
->exists()) {
return redirect('/admin/students/create')->with('error', 'This student already exists.');
}
Student::create([ Student::create([
'first_name' => request('first_name'), 'first_name' => request('first_name'),
'last_name' => request('last_name'), 'last_name' => request('last_name'),
@ -91,6 +98,14 @@ class StudentController extends Controller
} }
} }
if (Student::where('first_name', request('first_name'))
->where('last_name', request('last_name'))
->where('school_id', request('school_id'))
->where('id', '!=', $student->id)
->exists()) {
return redirect('/admin/students/'.$student->id.'/edit')->with('error', 'A student with that name already exists at that school');
}
$student->update([ $student->update([
'first_name' => request('first_name'), 'first_name' => request('first_name'),
'last_name' => request('last_name'), 'last_name' => request('last_name'),

View File

@ -89,6 +89,7 @@ class StudentController extends Controller
*/ */
public function update(Request $request, Student $student) public function update(Request $request, Student $student)
{ {
if ($request->user()->cannot('update', $student)) { if ($request->user()->cannot('update', $student)) {
abort(403); abort(403);
} }
@ -98,6 +99,14 @@ class StudentController extends Controller
'grade' => ['required', 'integer'], 'grade' => ['required', 'integer'],
]); ]);
if (Student::where('first_name', request('first_name'))
->where('last_name', request('last_name'))
->where('school_id', Auth::user()->school_id)
->where('id', '!=', $student->id)
->exists()) {
return redirect()->route('students.edit', $student)->with('error', 'A student with that name already exists at your school.');
}
$student->update([ $student->update([
'first_name' => request('first_name'), 'first_name' => request('first_name'),
'last_name' => request('last_name'), 'last_name' => request('last_name'),

View File

@ -224,3 +224,16 @@ it('does not allow a non administrator to delete a student', function () {
->assertRedirect(route('dashboard')); ->assertRedirect(route('dashboard'));
expect(Student::find($condemnedStudent->id))->toBeInstanceOf(Student::class); expect(Student::find($condemnedStudent->id))->toBeInstanceOf(Student::class);
}); });
it('will not duplicate a name at a school', function () {
$student1 = Student::factory()->create();
$student2 = Student::factory()->create(['school_id' => $student1->school_id]);
actingAs($this->adminUser);
$response = patch(route('admin.students.update', $student2), [
'first_name' => $student1->first_name,
'last_name' => $student1->last_name,
'grade' => $student2->grade,
'school_id' => $student2->school_id,
]);
$response->assertRedirect(route('admin.students.edit', $student2))
->assertSessionHas('error', 'A student with that name already exists at that school');
});

View File

@ -73,3 +73,16 @@ it('will not modify a student not at the users school', function () {
->assertSee('Bandit') ->assertSee('Bandit')
->assertDontSee('Bluey'); ->assertDontSee('Bluey');
}); });
it('will not duplicate a student name at the school', function () {
actingAs($this->user);
$student = Student::factory()->create(['school_id' => $this->school->id, 'first_name' => 'Bluey', 'last_name' => 'Heeler']);
patch(route('students.update', $this->student), [
'first_name' => 'Bluey',
'last_name' => 'Heeler',
'grade' => 1,
])->assertRedirect(route('students.edit', $this->student))
->assertSessionHas('error', 'A student with that name already exists at your school.')
->assertSessionHasNoErrors();
});