Skip to content

Commit cfe9b84

Browse files
kilipkilip
committed
fixed cv upload error, ref #599 
1 parent 3260115 commit cfe9b84

File tree

16 files changed

+164
-47
lines changed

16 files changed

+164
-47
lines changed

‎config/modules.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
'Geo',
2020
'Organizations',
2121
'ReleaseTools',
22-
//'Orders',
22+
'Orders',
2323
'Yawik\\Migration'
2424
];

‎module/Applications/view/applications/manage/detail.phtml

+6-2
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,9 @@ endif;
486486
<tr>
487487
<td><?php echo $this->translate('date of receipt')?>:</td>
488488
<td>
489-
<?=$this->dateFormat($application->getDateCreated()->getTimestamp(), 'short'); ?>
489+
<?php if(!is_null($application->getDateCreated())): ?>
490+
<?=$this->dateFormat($application->getDateCreated()->getTimestamp(), 'short'); ?>
491+
<?php endif; ?>
490492
<?=$application->getSubscriber()? '<br/>' . $this->translate("via"). ': '. $application->getSubscriber()->getName():'';?>
491493
</td>
492494
</tr>
@@ -518,7 +520,8 @@ endif;
518520
</span>
519521
</td>
520522
</tr>
521-
<?php if ($application->getDateCreated()->getTimestamp() != $application->getDateModified()->getTimestamp()):?>
523+
<?php if(!is_null($application->getDateCreated())): ?>
524+
<?php if ($application->getDateCreated()->getTimestamp() != $application->getDateModified()->getTimestamp()):?>
522525
<tr>
523526
<td><?php echo $this->translate('last modification date')?>:</td>
524527
<td>
@@ -538,6 +541,7 @@ endif;
538541
</td>
539542
</tr>
540543
<?php endif;?>
544+
<?php endif; ?>
541545
<tr>
542546
<td><?php echo $this->translate('agent')?>:</td>
543547
<td><?php echo $this->contactLink($job->getUser()->getInfo())?></td>

‎module/Core/src/Entity/Hydrator/Strategy/FileUploadStrategy.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(
4747
}
4848

4949
/**
50-
* @param FileInterface $metadata
50+
* @param FileMetadataInterface $metadata
5151
*
5252
* @return $this
5353
*/

‎module/Core/src/Entity/ModificationDateAwareEntityTrait.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ trait ModificationDateAwareEntityTrait
3535
* @ODM\Field(type="tz_date")
3636
*/
3737
protected $dateCreated;
38-
38+
3939
/**
4040
* Modification date.
4141
*
4242
* @var DateTime
4343
* @ODM\Field(type="tz_date")
4444
*/
4545
protected $dateModified;
46-
46+
4747
public function getDateCreated()
4848
{
4949
return $this->dateCreated;

‎module/Core/src/Repository/RepositoryService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public function flush($entity = null, array $options = array())
6868
{
6969
if(!is_null($entity)){
7070
$this->dm->persist($entity);
71-
$this->dm->flush($options);
7271
}
72+
$this->dm->flush();
7373
$events = $this->dm->getEventManager();
7474
$events->hasListeners('postCommit')
7575
&& $events->dispatchEvent('postCommit', new EventArgs(array('document' => $entity, 'documentManager' => $this->dm)));

‎module/Core/src/Repository/SnapshotRepository.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public function store($entity)
238238
{
239239
$this->checkEntityType($entity);
240240
$this->dm->persist($entity);
241-
$this->dm->flush($entity);
241+
$this->dm->flush();
242242

243243
return $this;
244244
}

‎module/Core/src/Service/FileManager.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ public function uploadFromFile(string $entityClass, FileMetadataInterface $metad
8686
$metadata->getPermissions()->grant($user, PermissionsInterface::PERMISSION_ALL);
8787
}else{
8888
$metadata->setUser($user);
89-
$this->dm->persist($user);
9089
}
90+
$this->dm->persist($user);
91+
$this->dm->flush();
9192
}
9293

9394
$options = new UploadOptions();

‎module/Core/test/CoreTest/Repository/RepositoryServiceTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
use Doctrine\Common\EventManager;
1515
use Doctrine\ODM\MongoDB\DocumentManager;
1616

17+
use PHPUnit\Framework\MockObject\MockObject;
1718
use PHPUnit\Framework\TestCase;
18-
use PHPUnit_Framework_MockObject_MockObject;
1919

2020
class RepositoryServiceTest extends TestCase
2121
{
@@ -27,12 +27,12 @@ class RepositoryServiceTest extends TestCase
2727
protected $rs;
2828

2929
/**
30-
* @var PHPUnit_Framework_MockObject_MockObject
30+
* @var MockObject|DocumentManager
3131
*/
3232
protected $dm;
3333

3434
/**
35-
* @var PHPUnit_Framework_MockObject_MockObject
35+
* @var MockObject|EventManager
3636
*/
3737
protected $eventManager;
3838

‎module/Cv/config/module.config.php

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Cv\Form\InputFilter\Education;
66
use Cv\Form\InputFilter\Employment;
77
use Cv\Form\PreferredJobFieldset;
8+
use Cv\Service\UploadHandler;
89
use Laminas\ServiceManager\Factory\InvokableFactory;
910

1011
return [
@@ -37,8 +38,6 @@
3738
],
3839
],
3940

40-
41-
4241
// Translations
4342
'translator' => [
4443
'translation_file_patterns' => [
@@ -160,7 +159,13 @@
160159
'Cv/Index' => \Cv\Controller\IndexController::class,
161160
]
162161
],
163-
162+
163+
'service_manager' => [
164+
'factories' => [
165+
UploadHandler::class => [UploadHandler::class, 'factory']
166+
]
167+
],
168+
164169
// Navigation
165170
// Disabled until module is fixed
166171
// TODO: Remove comments when module is fixed
@@ -217,7 +222,7 @@
217222
'Cv/PaginationQuery' => 'Cv\Repository\Filter\PaginationQueryFactory',
218223
],
219224
],
220-
225+
221226
'input_filters' => [
222227
'aliases' => [
223228
'Cv/Employment' => Employment::class,

‎module/Cv/src/Controller/ManageController.php

+48-25
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,21 @@
1010
/** ActionController of Core */
1111
namespace Cv\Controller;
1212

13+
use Core\Repository\RepositoryService;
1314
use Cv\Entity\CvInterface;
15+
use Cv\Service\UploadHandler;
1416
use Geo\Form\GeoSelect;
1517
use Geo\Form\GeoText;
1618
use Interop\Container\ContainerInterface;
19+
use Laminas\Form\FormElementManager\FormElementManagerV3Polyfill;
1720
use Laminas\Mvc\Controller\AbstractActionController;
21+
use Laminas\View\HelperPluginManager;
1822
use Laminas\View\Model\JsonModel;
1923
use Core\Form\SummaryFormInterface;
2024
use Auth\Entity\User;
2125
use Cv\Entity\Cv;
2226
use Cv\Entity\Contact;
27+
use PHPUnit\Util\Json;
2328

2429
/**
2530
* Main Action Controller for the application.
@@ -33,21 +38,32 @@ class ManageController extends AbstractActionController
3338
private $formElements;
3439

3540
private $viewHelper;
36-
37-
public static function factory(ContainerInterface $container)
41+
42+
private $uploadHandler;
43+
44+
public function __construct(
45+
RepositoryService $repositories,
46+
FormElementManagerV3Polyfill $formElements,
47+
HelperPluginManager $viewHelper,
48+
UploadHandler $uploadHandler
49+
)
3850
{
39-
$controller = new static();
40-
$controller->init($container);
41-
return $controller;
51+
$this->repositories = $repositories;
52+
$this->formElements = $formElements;
53+
$this->viewHelper = $viewHelper;
54+
$this->uploadHandler = $uploadHandler;
4255
}
43-
44-
public function init(ContainerInterface $container)
56+
57+
public static function factory(ContainerInterface $container)
4558
{
46-
$this->repositories = $container->get('repositories');
47-
$this->formElements = $container->get('FormElementManager');
48-
$this->viewHelper = $container->get('ViewHelperManager');
59+
$repositories = $container->get('repositories');
60+
$formElements = $container->get('FormElementManager');
61+
$viewHelper = $container->get('ViewHelperManager');
62+
$uploadHandler = $container->get(UploadHandler::class);
63+
64+
return new self($repositories, $formElements, $viewHelper, $uploadHandler);
4965
}
50-
66+
5167
public function formAction()
5268
{
5369
$repositories = $this->repositories;
@@ -86,18 +102,25 @@ public function formAction()
86102
$params->fromPost(),
87103
$params->fromFiles()
88104
));
89-
90-
if (!$form->isValid()) {
91-
return new JsonModel([
92-
'valid' => false,
93-
'errors' => $form->getMessages()
94-
]);
95-
}
96-
/*
97-
* @todo This is a workaround for GeoJSON data insertion
98-
* until we figured out, what we really want it to be.
99-
*/
100105
$formId = $params->fromQuery('form');
106+
$viewHelperManager = $this->viewHelper;
107+
108+
if('image' === $formId){
109+
$uploadHandler = $this->uploadHandler;
110+
$uploadHandler->handleUpload($cv, $_FILES['image']);
111+
}else{
112+
if (!$form->isValid()) {
113+
return new JsonModel([
114+
'valid' => false,
115+
'errors' => $form->getMessages()
116+
]);
117+
};
118+
119+
/*
120+
* @todo This is a workaround for GeoJSON data insertion
121+
* until we figured out, what we really want it to be.
122+
*/
123+
101124
// if ('preferredJob' == $formId) {
102125
// $locElem = $form->getBaseFieldset()->get('geo-location');
103126
// if ($locElem instanceof GeoText) {
@@ -110,11 +133,11 @@ public function formAction()
110133
// $cv->getPreferredJob()->setDesiredLocation($locElem->getValue());
111134
// }
112135
// }
136+
$this->validateCv($cv);
137+
$repositories->store($cv);
138+
}
113139

114-
$this->validateCv($cv);
115140

116-
$repositories->store($cv);
117-
$viewHelperManager = $this->viewHelper;
118141

119142
if ('file-uri' === $params->fromPost('return')) {
120143
$content = $viewHelperManager->get('basepath')

‎module/Cv/src/Entity/ContactImage.php

+6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
namespace Cv\Entity;
1111

1212
use Core\Entity\Image;
13+
use Core\Entity\ImageMetadata;
1314
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
1415

1516
/**
1617
* @ODM\File(bucketName="cvs.contact.images")
1718
*/
1819
class ContactImage extends Image
1920
{
21+
/**
22+
* @ODM\File\Metadata(targetDocument="Cv\Entity\ContactImageMetadata")
23+
*/
24+
protected ?ImageMetadata $metadata = null;
25+
2026
/**
2127
* Gets the URI of an image
2228
*

‎module/Cv/src/Entity/ContactImageMetadata.php

+34-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,41 @@
44

55
namespace Cv\Entity;
66

7+
use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
8+
use Core\Entity\ImageMetadata;
79

8-
class ContactImageMetadata
10+
/**
11+
* Class ContactImageMetadata
12+
* @ODM\EmbeddedDocument
13+
* @ODM\HasLifecycleCallbacks()
14+
* @package Cv\Entity
15+
*/
16+
class ContactImageMetadata extends ImageMetadata
917
{
18+
/**
19+
* @var Contact
20+
*/
21+
protected Contact $contact;
1022

23+
/**
24+
* @return Contact
25+
*/
26+
public function getContact(): Contact
27+
{
28+
return $this->contact;
29+
}
30+
31+
public function setContact(Contact $contact)
32+
{
33+
$this->contact = $contact;
34+
return $this;
35+
}
36+
37+
/**
38+
* @ODM\PreRemove
39+
*/
40+
public function preRemove()
41+
{
42+
$this->contact->setImage(null);
43+
}
1144
}

‎module/Cv/src/Repository/Event/InjectContactListener.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function postLoad(LifecycleEventArgs $args)
3939
'contact.image' => new ObjectId($image->getId())
4040
]);
4141
if ($cv) {
42-
$image->setContact($cv->getContact());
42+
$image->getMetadata()->setContact($cv->getContact());
4343
}
4444
}
4545
}

0 commit comments

Comments
 (0)