fix Location POST endpoint and saveNewLocation event method in vue_activity Location

This commit is contained in:
Mathieu Jaumotte 2021-10-15 11:22:33 +02:00
parent e6845326d7
commit d0dd99db9a
5 changed files with 68 additions and 16 deletions

View File

@ -71,20 +71,19 @@ export default {
}, },
saveNewLocation(selected) { saveNewLocation(selected) {
console.log('saveNewLocation', selected); console.log('saveNewLocation', selected);
console.log('post location')
let body = { let body = {
type: 'location', type: 'location',
name: selected.name, name: selected.name,
address: { id: selected.addressId }, address: { id: selected.addressId },
locationtype: { id: selected.type }, locationType: { id: selected.type, type: 'location-type' },
email: selected.email, email: selected.email,
phonenumber1: selected.phonenumber1, phonenumber1: selected.phonenumber1,
phonenumber2: selected.phonenumber2, phonenumber2: selected.phonenumber2,
} }
//this.$store.dispatch('addLocationSelected', body);
postLocation(body).then(location => new Promise(resolve => { postLocation(body).then(location => new Promise(resolve => {
console.log('postLocation', location);
this.locations.push(location); this.locations.push(location);
this.location.set(location); this.$store.dispatch('updateLocation', location);
resolve(); resolve();
})); }));
} }

View File

@ -55,7 +55,10 @@
</template> </template>
<template v-slot:footer> <template v-slot:footer>
<button class="btn btn-save" @click.prevent="$emit('saveNewLocation', selected)">Enregistrer</button> <button class="btn btn-save"
@click.prevent="$emit('saveNewLocation', selected); modal.showModal = false;">
Enregistrer
</button>
</template> </template>
</modal> </modal>

View File

@ -31,26 +31,26 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
/** /**
* @ORM\ManyToOne(targetEntity=LocationType::class) * @ORM\ManyToOne(targetEntity=LocationType::class)
* @ORM\JoinColumn(nullable=false) * @ORM\JoinColumn(nullable=false)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
*/ */
private ?LocationType $locationType = null; private ?LocationType $locationType = null;
/** /**
* @ORM\OneToOne(targetEntity=Address::class, cascade={"persist", "remove"}) * @ORM\ManyToOne(targetEntity=Address::class, cascade={"persist"})
* @ORM\JoinColumn(nullable=true) * @ORM\JoinColumn(nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
*/ */
private ?Address $address = null; private ?Address $address = null;
/** /**
* @ORM\Column(type="string", length=255, nullable=true) * @ORM\Column(type="string", length=255, nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
*/ */
private ?string $name = null; private ?string $name = null;
/** /**
* @ORM\Column(type="string", length=64, nullable=true) * @ORM\Column(type="string", length=64, nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
* @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/") * @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/")
* @PhonenumberConstraint(type="any") * @PhonenumberConstraint(type="any")
*/ */
@ -58,7 +58,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
/** /**
* @ORM\Column(type="string", length=64, nullable=true) * @ORM\Column(type="string", length=64, nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
* @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/") * @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/")
* @PhonenumberConstraint(type="any") * @PhonenumberConstraint(type="any")
*/ */
@ -66,7 +66,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
/** /**
* @ORM\Column(type="string", length=255, nullable=true) * @ORM\Column(type="string", length=255, nullable=true)
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read", "write"})
*/ */
private ?string $email = null; private ?string $email = null;

View File

@ -564,21 +564,23 @@ paths:
name: name:
type: string type: string
phonenumber1: phonenumber1:
type: string type: string
phonenumber2: phonenumber2:
type: string type: string
email: email:
type: string type: string
address: address:
type: object type: object
properties: properties:
id: id:
type: integer type: integer
locationtype: locationType:
type: object type: object
properties: properties:
id: id:
type: integer type: integer
type:
type: string
responses: responses:
401: 401:
description: "Unauthorized" description: "Unauthorized"
@ -591,6 +593,26 @@ paths:
400: 400:
description: "transition cannot be applyed" description: "transition cannot be applyed"
/1.0/main/location/{id}.json:
get:
tags:
- location
summary: Return the given location
parameters:
- name: id
in: path
required: true
description: The location id
schema:
type: integer
format: integer
minimum: 1
responses:
200:
description: "ok"
401:
description: "Unauthorized"
/1.0/main/location-type.json: /1.0/main/location-type.json:
get: get:
tags: tags:

View File

@ -0,0 +1,28 @@
<?php
declare(strict_types=1);
namespace Chill\Migrations\Main;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20211015084653 extends AbstractMigration
{
public function getDescription(): string
{
return 'Location entity: change Address to ManyToOne';
}
public function up(Schema $schema): void
{
$this->addSql('DROP INDEX uniq_90e4736af5b7af75');
$this->addSql('CREATE INDEX IDX_90E4736AF5B7AF75 ON chill_main_location (address_id)');
}
public function down(Schema $schema): void
{
$this->addSql('DROP INDEX IDX_90E4736AF5B7AF75');
$this->addSql('CREATE UNIQUE INDEX uniq_90e4736af5b7af75 ON chill_main_location (address_id)');
}
}