Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marko
2022-07-19 11:48:11 +02:00
8 changed files with 99 additions and 92 deletions

View File

@@ -25,7 +25,6 @@ use Vin\ShopwareSdk\Data\Filter\EqualsAnyFilter;
use Vin\ShopwareSdk\Data\Filter\EqualsFilter;
use Vin\ShopwareSdk\Factory\RepositoryFactory;
#[AsCommand(
name: 'sw:get-orders',
description: 'Holt alle offenen Bestellungen von SW ab',
@@ -37,7 +36,7 @@ class SwGetOrdersCommand extends Command
private $orderData;
public function __construct(OrdersRepository $ordersRepository, LoggerInterface $logger )
public function __construct(OrdersRepository $ordersRepository, LoggerInterface $logger)
{
$this->ordersRepository = $ordersRepository;
$this->logger = $logger;
@@ -80,7 +79,7 @@ class SwGetOrdersCommand extends Command
*/
private function getOrders():array
{
return $this->ordersRepository->findAll();
return $this->ordersRepository->findAll();
}
/**
@@ -89,57 +88,55 @@ class SwGetOrdersCommand extends Command
public function getOrderDetails(): void
{
//Bestelldetails aus SW holen
$this->getOrdersDataFromSW();
$this->getOrdersDataFromSW();
foreach ($this->orderData as $order) {
$this->saveOrdersData($order);
}
foreach ($this->orderData as $order) {
$this->saveOrdersData($order);
}
}
/**
* @return \Vin\ShopwareSdk\Data\AccessToken|void
*/
private function shopwareAuth(){
private function shopwareAuth()
{
try{
$grantType = new ClientCredentialsGrantType($_ENV['SHOPWARE_API_ID'], $_ENV['SHOPWARE_API_KEY']);
$adminClient = new AdminAuthenticator($grantType, $_ENV['SHOPWARE_API_URL']);
return $adminClient->fetchAccessToken();
}catch (\Exception $e){
$this->logger->error($e->getMessage());
}
try {
$grantType = new ClientCredentialsGrantType($_ENV['SHOPWARE_API_ID'], $_ENV['SHOPWARE_API_KEY']);
$adminClient = new AdminAuthenticator($grantType, $_ENV['SHOPWARE_API_URL']);
return $adminClient->fetchAccessToken();
} catch (\Exception $e) {
$this->logger->error($e->getMessage());
}
}
/**
* holt alle fehlende Bestelldetails aus SW
*/
private function getOrdersDataFromSW(): void
{
foreach ($this->orderData as $value) {
private function getOrdersDataFromSW(): void
{
foreach ($this->orderData as $value) {
// Bei Shopware API anmelden
$context = new Context($_ENV['SHOPWARE_API_URL'], $this->shopwareAuth());
// Bei Shopware API anmelden
$context = new Context($_ENV['SHOPWARE_API_URL'], $this->shopwareAuth());
// Create the repository for the entity
$orderRepository = RepositoryFactory::create(OrderDefinition::ENTITY_NAME);
// Create the repository for the entity
$orderRepository = RepositoryFactory::create(OrderDefinition::ENTITY_NAME);
// Create the criteria
$criteria = new Criteria();
$criteria->addFilter(new EqualsFilter('id', $value->getOrderId()));
// Create the criteria
$criteria = new Criteria();
$criteria->addFilter(new EqualsFilter('id', $value->getOrderId()));
//Beziehungen zu Produkten holen
$criteria->addAssociation('lineItems');
//Beziehungen zu Produkten holen
$criteria->addAssociation('lineItems');
try {
$orders = $orderRepository->search($criteria, $context);
try {
$orders = $orderRepository->search($criteria, $context);
$value->setData((array)$orders->getEntities());
} catch (\Exception $e) {
$this->logger->error($e->getMessage());
$value->setData((array)$orders->getEntities());
} catch (\Exception $e) {
$this->logger->error($e->getMessage());
}
}
}
}
/**
@@ -149,9 +146,6 @@ class SwGetOrdersCommand extends Command
private function saveOrdersData($orderData): void
{
$orderData->setStatus = 1;
$this->ordersRepository->add($orderData,true);
$this->ordersRepository->add($orderData, true);
}
}

View File

@@ -7,12 +7,11 @@ use App\Repository\OrdersRepository;
use Doctrine\ORM\Mapping as ORM;
use ApiPlatform\Core\Annotation\ApiResource;
#[ORM\Entity(repositoryClass: OrdersRepository::class)]
#[ApiResource(
itemOperations: ["GET"],
description: "Manage orders",
normalizationContext: ["groups" => "read"]
itemOperations: ["GET"],
description: "Manage orders",
normalizationContext: ["groups" => "read"]
)]
class Orders
{

View File

@@ -14,37 +14,35 @@ use Symfony\Component\HttpKernel\KernelEvents;
final class OrdersSubscriber implements EventSubscriberInterface
{
private LoggerInterface $logger;
private LoggerInterface $logger;
public function __construct( LoggerInterface $logger )
{
$this->logger = $logger;
}
public function __construct(LoggerInterface $logger)
{
$this->logger = $logger;
}
/**
* @return array[]
*/
public static function getSubscribedEvents()
{
return [
KernelEvents::VIEW => ['getShopwareOrder', EventPriorities::POST_WRITE],
];
}
public static function getSubscribedEvents()
{
return [
KernelEvents::VIEW => ['getShopwareOrder', EventPriorities::POST_WRITE],
];
}
/**
* @param ViewEvent $event
* @return void
*/
public function getShopwareOrder(ViewEvent $event): void
{
$data = $event->getControllerResult();
$method = $event->getRequest()->getMethod();
public function getShopwareOrder(ViewEvent $event): void
{
$data = $event->getControllerResult();
$method = $event->getRequest()->getMethod();
$this->logger->info('hier');
}
$this->logger->info('hier');
}
}

View File

@@ -7,7 +7,6 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Component\Validator\Validator\ValidatorInterface;
/**
* @extends ServiceEntityRepository<Orders>
*
@@ -20,7 +19,7 @@ class OrdersRepository extends ServiceEntityRepository
{
private ValidatorInterface $validator;
public function __construct(ManagerRegistry $registry,ValidatorInterface $validator)
public function __construct(ManagerRegistry $registry, ValidatorInterface $validator)
{
parent::__construct($registry, Orders::class);
$this->validator = $validator;
@@ -30,7 +29,7 @@ class OrdersRepository extends ServiceEntityRepository
$errors = $this->validator->validate($entity);
if (count($errors) > 0) {
var_dump($errors);
var_dump($errors);
}
$this->getEntityManager()->persist($entity);
@@ -44,10 +43,9 @@ class OrdersRepository extends ServiceEntityRepository
{
$order = $this->getEntityManager()->find(Orders::class, $entity->getId());
if(!$order) {
if (!$order) {
throw $this->createNotFoundException('Order not found: '.$entity->getId());
}
}
public function remove(Orders $entity, bool $flush = false): void