Merge branch 'master' of https://git.e-declic.net/talents-tube/website

2019-10-11 14:19:28 +02:00
parent 229893dc95 52d105efb4
commit fd048d5a0e
6 changed files with 44 additions and 11 deletions
@@ -108,22 +108,35 @@ class SecurityController extends FOSRestController
  public function UpdateUser(Request $request)
  {
    $userManager = $this->get('fos_user.user_manager');
+    $companyManager = $this->get('app.company_manager');
    $usr = $this->getUser();
+    $talent = $usr->getCompany();var_dump($talent);
    if ($usr !== null){
      $newLastName = htmlspecialchars($request->request->get('lastname'));
      $newFirstName = htmlspecialchars($request->request->get('firstname'));
+      $phoneTalent = htmlspecialchars($request->request->get('phone'));
+      $titleTalent = htmlspecialchars($request->request->get('currentJob'));
+      $newLinkedin = htmlspecialchars($request->request->get('linkedin'));
+      $newTwitter = htmlspecialchars($request->request->get('twitter'));
+      $newWebsite = htmlspecialchars($request->request->get('website'));
+
      if (!isset($newLastName) || !isset($newFirstName) || $newLastName == null || $newFirstName == null){
        $message = 'Vous devez rentrer votre nom et votre prénom pour continuer';
        throw new ResourceValidationException($message,''); 
      } else { 
-          $file = $request->files->get('file');
+         
          $usr->setLastName($newLastName);
          $usr->setFirstName($newFirstName);
-          $usr->setFile($file);
-          $usr->upload();
-          
-          $userManager->updateUser($usr);
-          $status = array('status' => "success", 'file' => $usr->getFile(), 'id' => $usr->getId());
+        
+          $talent->setWebsite($newWebsite);
+          $talent->setLinkedin($newLinkedin);
+          $talent->setTwitter($newTwitter);
+          $talent->setTitleTalent($titleTalent);
+          $talent->setPhoneTalent($phoneTalent);
+          $companyManager->updateTalent($usr);
+
+
+          $status = array('status' => "success");
      }
    } else {
        $status = array('status' => "failure", 'message' => "Vous n'êtes pas connecté.");
@@ -160,7 +160,7 @@ class Ad
     *
     * @ORM\Column(name="public_tag", type="json_document", nullable=true, options={"jsonb":true})
     * 
-     * 
+     * @Groups({"ad_detail", "answer_detail"}) 
     */
    private $publicTag;

@@ -249,11 +249,14 @@ class Ad

    /**
     * @ORM\OneToMany(targetEntity="AppBundle\Entity\TerritoryAd", mappedBy="ad", cascade={"persist", "remove"})
+     * 
+     * @Groups({"ad_detail" , "answer_detail"})
     */
    private $territories;

    /**
     * @ORM\OneToMany(targetEntity="AppBundle\Entity\BookmarkAd", mappedBy="ad", cascade={"persist", "remove"})
+     * 
     */
    private $bookmarkAds;

@@ -351,7 +351,7 @@ class Company
        if (empty($this->publicTag))
            $empty++;    
        
-        if ($this->presentation_video === null)
+        if ($this->presentationVideo == null)
            $empty++; 

        if (is_array($this->ad) && empty($this->ad))
@@ -24,26 +24,28 @@ class TerritoryAd
     * @ORM\Column(name="id", type="integer")
     * @ORM\Id
     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"company_detail"})
+     * @Groups({"ad_detail" , "company_detail"})
     */
    private $id;

    /**
     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Company", inversedBy="territoryAds")
     * @ORM\JoinColumn(nullable=false)
-     * @Groups({"company_detail"})
+     * @Groups({"ad_detail" , "company_detail"})
     */
    private $territory;

    /**
     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Ad", inversedBy="territories")
     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"ad_detail" , "company_detail"})
     */
    private $ad;

    /**
     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\Company", inversedBy="territoryAds")
     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"ad_detail" , "company_detail"})
     */
    private $company;
    
@@ -91,6 +91,7 @@ class CompanyManager
            'titleTalent' => $talent->getTitleTalent(),
            'situationTalent' => $talent->getSituationTalent(),
            'descriptionTalent' => $talent->getDescriptionTalent(),
+            'phoneTalent' => $talent->getPhoneTalent(),
        );
        $talent->setExtra($extra);

@@ -12,7 +12,7 @@ trait ExtraJsonTrait
     *
     * @ORM\Column(name="extra", type="json_document", nullable=true)
     * 
-     * @Groups({"company_detail", "company_list"})
+     * @Groups({"ad_detail" , "company_detail", "company_list"})
     */
    private $extra;

@@ -24,6 +24,7 @@ trait ExtraJsonTrait
    private $size;
    private $siren;

+    private $phoneTalent;
    private $titleTalent;
    private $situationTalent;
    private $descriptionTalent;
@@ -41,6 +42,7 @@ trait ExtraJsonTrait
        isset($extra['linkedin']) ? $this->linkedin = $extra['linkedin'] : null;
        isset($extra['size']) ? $this->size = $extra['size'] : null;
        isset($extra['siren']) ? $this->siren = $extra['siren'] : null;
+        isset($extra['phoneTalent']) ? $this->phoneTalent = $extra['phoneTalent'] : null;
        isset($extra['titleTalent']) ? $this->titleTalent = $extra['titleTalent'] : null;
        isset($extra['situationTalent']) ? $this->situationTalent = $extra['situationTalent'] : null;
        isset($extra['descriptionTalent']) ? $this->descriptionTalent = $extra['descriptionTalent'] : null;
@@ -115,6 +117,18 @@ trait ExtraJsonTrait
        return $this->siren;
    }

+    public function setPhoneTalent($phoneTalent)
+    {
+        $this->phoneTalent = $phoneTalent;
+
+        return $this;
+    }
+
+    public function getPhoneTalent()
+    {
+        return $this->phoneTalent;
+    }
+
    public function setTitleTalent($titleTalent)
    {
        $this->titleTalent = $titleTalent;