updates and add badoo

config/packages/lexik_jwt_authentication.yaml

@@ -2,3 +2,4 @@ lexik_jwt_authentication:
     secret_key: '%env(resolve:JWT_SECRET_KEY)%'
     public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
     pass_phrase: '%env(JWT_PASSPHRASE)%'
+    token_ttl: 2592000 #30 Days

src/Entity/Discussion.php

@@ -146,7 +146,7 @@ public function jsonSerialize()
         return array(
             'appId' => $this->getAppId(),
             'profile' => $this->getProfile(),
-            'createdDate' => $this->getCreatedDate()->format(\DateTime::ISO8601),
+            'createdDate' => $this->getCreatedDate() ? $this->getCreatedDate()->format(\DateTime::ISO8601) : null,
             'messages' => $this->getMessages(),
             'app' => $this->getApp(),
         );

src/Entity/Message.php

@@ -60,7 +60,7 @@ public function setProfile(Profile $profile): void
      */
     public function getContent()
     {
-        return $this->content;
+        return trim($this->content);
     }
 
     /**
@@ -90,7 +90,7 @@ public function setAppId(string $appId): void
     /**
      * @return mixed
      */
-    public function getSentDate() : \DateTime
+    public function getSentDate() : ?\DateTime
     {
         return $this->sentDate;
     }
@@ -138,8 +138,8 @@ public function jsonSerialize()
         return array(
             'appId' => $this->getAppId(),
             'content' => $this->getContent(),
-            'profile' => $this->getProfile()->toArray('small'),
-            'sentDate' => $this->getSentDate()->format(\DateTime::ISO8601),
+            'profile' => $this->getProfile() ? $this->getProfile()->toArray('small') : array(),
+            'sentDate' => $this->getSentDate() ? $this->getSentDate()->format(\DateTime::ISO8601) : null,
             'app' => $this->getApp(),
         );
     }

src/Entity/Profile.php

@@ -41,11 +41,6 @@ class Profile extends Entity implements \JsonSerializable
      */
     protected $bio;
 
-    /**
-     * @var string
-     * @ORM\Column(type="string", length=64,nullable=true)
-     */
-    protected $jobTitle;
 
     /**
      * @var int
@@ -61,11 +56,6 @@ class Profile extends Entity implements \JsonSerializable
     protected $distance;
 
 
-    /**
-     * @var string
-     * @ORM\Column(type="string", length=64,nullable=true)
-     */
-    protected $school;
 
 
     /**
@@ -94,6 +84,12 @@ class Profile extends Entity implements \JsonSerializable
      */
     protected $appId;
 
+    /**
+     * @var array
+     * @ORM\Column(type="array")
+     */
+    protected $profileFields = array();
+
 
     /**
      * @var User
@@ -178,23 +174,7 @@ public function setBio(?string $bio)
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getJobTitle(): ?string
-    {
-        return $this->jobTitle;
-    }
 
-    /**
-     * @param string $jobTitle
-     */
-    public function setJobTitle(?string $jobTitle)
-    {
-        $this->jobTitle = $jobTitle;
-
-        return $this;
-    }
 
     /**
      * @return int
@@ -301,25 +281,6 @@ public function setAppId(string $appId)
         return $this;
     }
 
-    /**
-     * @return string
-     */
-    public function getSchool(): ?string
-    {
-        return $this->school;
-    }
-
-    /**
-     * @param string $school
-     *
-     * @return  $this
-     */
-    public function setSchool(?string $school)
-    {
-        $this->school = $school;
-
-        return $this;
-    }
 
     /**
      * @return array
@@ -377,6 +338,32 @@ public function setOwner(User $owner): void
         $this->owner = $owner;
     }
 
+    /**
+     * @return array
+     */
+    public function getProfileFields(): array
+    {
+        return is_array($this->profileFields) ? $this->profileFields : array();
+    }
+
+    /**
+     * @param array $profileFields
+     */
+    public function setProfileFields(array $profileFields): void
+    {
+        $this->profileFields = $profileFields;
+    }
+
+
+    /**
+     * @param string $key
+     * @param string $value
+     */
+    public function addProfileField(string $key, string $value) : void
+    {
+        $this->profileFields[$key] = $value;
+    }
+
 
     /**
      * @param string $group
@@ -407,9 +394,8 @@ public function jsonSerialize()
             'isFavorite' => $this->isFavorite(),
             'pictures' => $this->getPictures(),
             'distance' => $this->getDistance(),
-            'jobTitle' => $this->getJobTitle(),
-            'school' => $this->getSchool(),
             'attributes' => $this->getAttributes(),
+            'profileFields' => $this->getProfileFields(),
         );
     }
 }

src/Entity/User.php

@@ -69,11 +69,6 @@ class User extends Entity implements UserInterface, \JsonSerializable
      */
     protected $tinder_token;
 
-    /**
-     * @ORM\Column(type="string", length=128,nullable=true)
-     */
-    protected $bumble_refresh_token;
-
     /**
      * @ORM\Column(type="string", length=128,nullable=true)
      */
@@ -85,6 +80,21 @@ class User extends Entity implements UserInterface, \JsonSerializable
     protected $next_super_like;
 
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=64,nullable=true)
+     */
+    protected $bumble_user_id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(type="string", length=64,nullable=true)
+     */
+    protected $badoo_user_id;
+
+
 
     public function getSalt()
     {
@@ -168,21 +178,6 @@ public function setTinderRefreshToken($tinder_refresh_token): void
         $this->tinder_refresh_token = $tinder_refresh_token;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getBumbleRefreshToken()
-    {
-        return $this->bumble_refresh_token;
-    }
-
-    /**
-     * @param mixed $bumble_refresh_token
-     */
-    public function setBumbleRefreshToken($bumble_refresh_token): void
-    {
-        $this->bumble_refresh_token = $bumble_refresh_token;
-    }
 
     /**
      * @return mixed
@@ -282,6 +277,39 @@ public function setNextSuperLike($next_super_like): void
         $this->next_super_like = $next_super_like;
     }
 
+    /**
+     * @return string
+     */
+    public function getBumbleUserId(): ?string
+    {
+        return $this->bumble_user_id;
+    }
+
+    /**
+     * @param string $bumble_user_id
+     */
+    public function setBumbleUserId(?string $bumble_user_id): void
+    {
+        $this->bumble_user_id = $bumble_user_id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBadooUserId(): ?string
+    {
+        return $this->badoo_user_id;
+    }
+
+    /**
+     * @param string $badoo_user_id
+     */
+    public function setBadooUserId(?string $badoo_user_id): void
+    {
+        $this->badoo_user_id = $badoo_user_id;
+    }
+
+
 
 
 

src/Migrations/Version20200103132841.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20200103132841 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE profile ADD profile_fields LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', DROP job_title, DROP school');
+        $this->addSql('ALTER TABLE users DROP bumble_refresh_token');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE profile ADD job_title VARCHAR(64) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, ADD school VARCHAR(64) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, DROP profile_fields');
+        $this->addSql('ALTER TABLE users ADD bumble_refresh_token VARCHAR(128) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`');
+    }
+}

src/Migrations/Version20200103155423.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20200103155423 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE users ADD bumble_user_id VARCHAR(64) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE users DROP bumble_user_id');
+    }
+}

src/Migrations/Version20200105114304.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20200105114304 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE users ADD badoo_user_id VARCHAR(64) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE users DROP badoo_user_id');
+    }
+}