Merge pull request #4 from SaliBhdr/main

store dragging result to database

Author: AliMehraei

app/Http/Controllers/Api/V1/CourseController.php

@@ -6,6 +6,7 @@
 use App\Models\Course;
 use App\Models\Group;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 
 class CourseController extends Controller
@@ -27,11 +28,11 @@ public function index()
         /** @var Course $course */
         foreach ($courses as $course) {
             $response[] = [
-                'id'          => $course->id,
-                'title'       => $course->title,
+                'id' => $course->id,
+                'title' => $course->title,
                 'study_field' => $course->studyField()->first()->title,
-                'teacher'     => $course->teacher()->first()->name,
-                'lesson'      => $course->lesson()->first()->title,
+                'teacher' => $course->teacher()->first()->name,
+                'lesson' => $course->lesson()->first()->title,
             ];
         }
 
@@ -56,14 +57,14 @@ public function show(Course $course)
                     'name',
                     'family',
                     'email'
-                ])->orderBy('group_user.joined_at');
+                ])->orderBy('group_user.joined_at','asc');
             }
         ])->get();
 
         $groupIds = $groups->pluck('id')->toArray();
 
-        $users = $course->users()->whereDoesntHave('groups',function ($q) use ($groupIds){
-            $q->whereIn('id',$groupIds);
+        $users = $course->users()->whereDoesntHave('groups', function ($q) use ($groupIds) {
+            $q->whereIn('id', $groupIds);
         })->select([
             'id',
             'name',
@@ -76,12 +77,49 @@ public function show(Course $course)
         $lesson = $course->lesson()->first();
 
         return response([
-            'course'     => $course,
-            'lesson'     => $lesson,
-            'teacher'    => $teacher,
+            'course' => $course,
+            'lesson' => $lesson,
+            'teacher' => $teacher,
             'studyField' => $studyField,
-            'users'      => $users,
-            'groups'     => $groups,
+            'users' => $users,
+            'groups' => $groups,
         ]);
     }
+
+    public function updateGroup(Request $request)
+    {
+        /**
+         * @var Group $srcGroup
+         * @var Group $desGroup
+         * @var User $user
+         */
+        $srcGroup = Group::query()->find($request->input('srcGroupId'));
+        $desGroup = Group::query()->find($request->input('destinationGroupId'));
+        $user = Group::query()->find($request->input('userId'));
+
+        $srcGroup->users()->detach([$user->id]);
+        $desGroup->users()->syncWithoutDetaching([$user->id]);
+
+        return response([],200);
+    }
+
+    public function updateUsers(Request $request)
+    {
+        /**
+         * @var Group|null $srcGroup
+         * @var Group|null $desGroup
+         * @var User $user
+         */
+        $srcGroup = $request->has('srcGroupId') ? Group::query()->find($request->input('srcGroupId')) : null;
+        $desGroup = $request->has('destinationGroupId') ? Group::query()->find($request->input('destinationGroupId')) : null;
+        $user = Group::query()->find($request->input('userId'));
+
+        if(!empty($srcGroup)){
+            $srcGroup->users()->detach([$user->id]);
+        }elseif (!empty($desGroup)){
+            $desGroup->users()->syncWithoutDetaching([$user->id]);
+        }
+
+        return response([],200);
+    }
 }

app/Models/Group.php

@@ -30,9 +30,6 @@ public function course()
 
     public function users()
     {
-        return $this->belongsToMany(User::class, 'group_user')->withPivot([
-            'is_leader',
-            'is_final',
-        ])->withTimestamps(['joined_at']);
+        return $this->belongsToMany(User::class, 'group_user')->withTimestamps(['joined_at']);
     }
 }

app/Models/User.php

@@ -74,10 +74,7 @@ public function courses()
 
     public function groups()
     {
-        return $this->belongsToMany(Group::class, 'group_user')->withPivot([
-            'is_leader',
-            'is_final',
-        ])->withTimestamps(['joined_at']);
+        return $this->belongsToMany(Group::class, 'group_user')->withTimestamps(['joined_at']);
     }
 
     public function scopeUserRole($query)

database/factories/UserFactory.php

@@ -25,7 +25,7 @@ public function definition()
         return [
             'role'              => $this->faker->randomElement(['admin', 'user']),
             'name'              => $this->faker->name,
-            'family'            => $this->faker->name,
+//            'family'            => $this->faker->name,
             'student_number'    => $this->faker->unique()->randomNumber(5),
             'api_token'         => Str::random(60),
             'email'             => $this->faker->unique()->safeEmail,

database/migrations/2021_01_10_231515_create_group_user_table.php

@@ -19,9 +19,6 @@ public function up()
             $table->unsignedBigInteger('user_id');
             $table->unsignedBigInteger('group_id');
 
-            $table->boolean('is_leader')->default(false);
-            $table->boolean('is_final')->default(false);
-
             $table->timestamp('joined_at')->useCurrent();
 
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');

public/assets/css/custom.css

@@ -56,3 +56,8 @@ h1, h2, h3, h4, h5, h6 {
 .pricing .box {
      height: auto;
 }
+
+.mobile-nav-toggle {
+    right: unset;
+    left: 15px;
+}