Merge pull request #2179 from BacLuc/adapt-collaborators-to-api-platform

Adapt collaborators to api platform

Author: BacLuc

api/src/DataPersister/CampCollaborationDataPersister.php

@@ -2,6 +2,7 @@
 
 namespace App\DataPersister;
 
+use ApiPlatform\Core\Validator\ValidatorInterface;
 use App\DataPersister\Util\AbstractDataPersister;
 use App\DataPersister\Util\CustomActionListener;
 use App\DataPersister\Util\DataPersisterObservable;
@@ -23,6 +24,7 @@ public function __construct(
         private Security $security,
         private UserRepository $userRepository,
         private MailService $mailService,
+        private ValidatorInterface $validator
     ) {
         $resendInvitationListener = CustomActionListener::of(
             CampCollaboration::RESEND_INVITATION,
@@ -47,6 +49,7 @@ public function beforeCreate($data): BaseEntity {
             if (null != $userByInviteEmail) {
                 $data->user = $userByInviteEmail;
             }
+            $data->inviteKey = IdGenerator::generateRandomHexString(64);
         }
 
         return $data;
@@ -56,11 +59,16 @@ public function afterCreate($data): void {
         /** @var User $user */
         $user = $this->security->getUser();
         if (CampCollaboration::STATUS_INVITED == $data->status && $data->inviteEmail) {
-            $data->inviteKey = IdGenerator::generateRandomHexString(64);
             $this->mailService->sendInviteToCampMail($user, $data->camp, $data->inviteKey, $data->inviteEmail);
         }
     }
 
+    public function beforeRemove($data): ?BaseEntity {
+        $this->validator->validate($data, ['groups' => ['delete']]);
+
+        return null;
+    }
+
     public function onStatusChange(CampCollaboration $data) {
         /** @var User $user */
         $user = $this->security->getUser();

api/src/Entity/CampCollaboration.php

@@ -160,6 +160,7 @@ class CampCollaboration extends BaseEntity implements BelongsToCampInterface {
      */
     #[Assert\Choice(choices: self::VALID_STATUS)]
     #[Assert\EqualTo(value: self::STATUS_INVITED, groups: ['resend_invitation'])]
+    #[Assert\EqualTo(value: self::STATUS_INACTIVE, groups: ['delete'])]
     #[AssertAllowTransitions(
         [
             ['from' => self::STATUS_INVITED, 'to' => [self::STATUS_INACTIVE]],

api/tests/Api/CampCollaborations/DeleteCampCollaborationTest.php

@@ -10,7 +10,7 @@
  */
 class DeleteCampCollaborationTest extends ECampApiTestCase {
     public function testDeleteCampCollaborationIsDeniedForAnonymousUser() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createBasicClient()->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId());
         $this->assertResponseStatusCodeSame(401);
         $this->assertJsonContains([
@@ -20,7 +20,7 @@ public function testDeleteCampCollaborationIsDeniedForAnonymousUser() {
     }
 
     public function testDeleteCampCollaborationIsDeniedForUnrelatedUser() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createClientWithCredentials(['username' => static::$fixtures['user4unrelated']->getUsername()])
             ->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId())
         ;
@@ -33,7 +33,7 @@ public function testDeleteCampCollaborationIsDeniedForUnrelatedUser() {
     }
 
     public function testDeleteCampCollaborationIsDeniedForInactiveCollaborator() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createClientWithCredentials(['username' => static::$fixtures['user5inactive']->getUsername()])
             ->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId())
         ;
@@ -46,7 +46,7 @@ public function testDeleteCampCollaborationIsDeniedForInactiveCollaborator() {
     }
 
     public function testDeleteCampCollaborationIsDeniedForGuest() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createClientWithCredentials(['username' => static::$fixtures['user3guest']->getUsername()])
             ->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId())
         ;
@@ -59,7 +59,7 @@ public function testDeleteCampCollaborationIsDeniedForGuest() {
     }
 
     public function testDeleteCampCollaborationIsAllowedForMember() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createClientWithCredentials(['username' => static::$fixtures['user2member']->getUsername()])
             ->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId())
         ;
@@ -68,12 +68,18 @@ public function testDeleteCampCollaborationIsAllowedForMember() {
     }
 
     public function testDeleteCampCollaborationIsAllowedForManager() {
-        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        $campCollaboration = static::$fixtures['campCollaboration5inactive'];
         static::createClientWithCredentials()->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId());
         $this->assertResponseStatusCodeSame(204);
         $this->assertNull($this->getEntityManager()->getRepository(CampCollaboration::class)->find($campCollaboration->getId()));
     }
 
+    public function testDeleteCampCollaborationIsDeniedIfStatusNotInactive() {
+        $campCollaboration = static::$fixtures['campCollaboration1manager'];
+        static::createClientWithCredentials()->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId());
+        $this->assertResponseStatusCodeSame(422);
+    }
+
     public function testDeleteCampCollaborationFromCampPrototypeIsDeniedForUnrelatedUser() {
         $campCollaboration = static::$fixtures['campCollaboration1campPrototype'];
         static::createClientWithCredentials()->request('DELETE', '/camp_collaborations/'.$campCollaboration->getId());

frontend/src/components/camp/CollaboratorListItem.vue

@@ -58,7 +58,7 @@
             <button-delete
               :disabled="(disabled && !isOwnCampCollaboration) || isLastManager"
               icon="mdi-cancel"
-              @click="api.del(collaborator)">
+              @click="api.patch(collaborator, {status: 'inactive'})">
               {{ $tc("components.camp.collaboratorListItem.deactivate") }}
             </button-delete>
           </div>
@@ -107,10 +107,9 @@ export default {
   methods: {
     resendInvitation () {
       this.resendingEmail = true
-      this.api.href(this.api.get(), 'invitation', {
-        action: 'resend',
-        campCollaborationId: this.collaborator.id
-      }).then(postUrl => this.api.post(postUrl, {}))
+      this.api.href(this.api.get(), 'campCollaborations', {
+        id: this.collaborator.id
+      }).then(postUrl => this.api.patch(postUrl + '/resend_invitation', {}))
         .finally(() => { this.resendingEmail = false })
     }
   }

frontend/src/views/camp/Collaborators.vue

@@ -130,12 +130,14 @@ export default {
   },
   methods: {
     invite () {
-      this.api.post('/camp-collaborations', {
-        campId: this.camp().id,
-        inviteEmail: this.inviteEmail,
-        role: this.inviteRole
-      }).then(this.refreshCamp,
-        this.handleError)
+      this.api.href(this.api.get(), 'campCollaborations')
+        .then(url => this.api.post(url, {
+          camp: this.camp()._meta.self,
+          inviteEmail: this.inviteEmail,
+          role: this.inviteRole
+        }))
+        .then(this.refreshCamp,
+          this.handleError)
     },
     handleError (e) {
       if (e.response) {