add fixed export

2023-11-23 16:54:04 +01:00 · 2023-11-23 16:54:04 +01:00 · 6e98fca7ad
commit 6e98fca7ad
parent 231e9390b8
13 changed files with 101 additions and 158 deletions
--- a/.github/workflows/qodana_code_quality.yml
+++ b/.github/workflows/qodana_code_quality.yml
@ -0,0 +1,19 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.2
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@ -8,13 +8,13 @@
      <jdbc-url>jdbc:mysql://127.0.0.1:3306</jdbc-url>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
-    <data-source source="LOCAL" name="DDEV" uuid="5149739e-7c31-440b-a2ab-9c77c78be0cd">
+    <data-source source="LOCAL" name="DDEV" uuid="7b0f1ac1-319c-4672-b16e-eb385d06e6e9">
      <driver-ref>mariadb</driver-ref>
      <synchronize>true</synchronize>
      <configured-by-url>true</configured-by-url>
      <remarks>DDEV generated data source</remarks>
      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mariadb://127.0.0.1:55034/db?user=db&amp;password=db</jdbc-url>
+      <jdbc-url>jdbc:mariadb://127.0.0.1:55000/db?user=db&amp;password=db</jdbc-url>
      <working-dir>$ProjectFileDir$</working-dir>
    </data-source>
  </component>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -17,7 +17,7 @@ services:
    image: adminer
    restart: always
    ports:
-      - 8080:8080
+      - "8080:8080"

  ###> doctrine/doctrine-bundle ###
  database:
--- a/qodana.yaml
+++ b/qodana.yaml
@ -0,0 +1,34 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+php:
+  version: 8.1 #(Applied in CI/CD pipeline)
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:latest
+include:
+  - name: PhpRedundantOptionalArgumentInspection
+  - name: PhpUnhandledExceptionInspection
+  - name: PhpReturnDocTypeMismatchInspection
+  - name: PhpUnusedLocalVariableInspection
+exclude:
+  - name: All
+    paths:
+      - public
--- a/src/Command/HiltesExportCommand.php
+++ b/src/Command/HiltesExportCommand.php
@ -53,12 +53,13 @@ class HiltesExportCommand extends Command
        if (!$l) {
            dd('Login faild' . 'STOP ' . __METHOD__ . ' / ' . __LINE__);
        }
-        $orders = $this->orderRepository->findAll();
-        #dump($orders);
        /**
         * @var Order
         */
-        $order = false;
+        $orders = $this->orderRepository->findAll();
+        #dump($orders);
+
+
        foreach ($orders as $order) {
            if ($order->getStatus() > 0) continue;
            $tA = $order->getData();#json_decode($order->getData());
--- a/src/Command/HiltesImportCommand.php
+++ b/src/Command/HiltesImportCommand.php
@ -57,7 +57,7 @@ class HiltesImportCommand extends Command
        $hiltesImport = new HiltesImport($this->productRepository, $this->warehouseRepository, $this->stockRepository, $this->logger);


-        $r = $hiltesImport->startImport($input->getOption('delta'));
+        $hiltesImport->startImport($input->getOption('delta'));

        if (isset($r['error'])) {
            $io->error($r['text']);
@ -67,7 +67,9 @@ class HiltesImportCommand extends Command
            $io->info('Start Hiltes Push JTL');

            $jtl = new Jtl($this->productRepository, $this->warehouseRepository, $this->stockRepository, $this->logger);
-            $jtl->createExportFile($jtl->getProducts());
+
+            $jtl->createExportFile($jtl->getProducts(0), 'standard');
+            $jtl->createExportFile($jtl->getProducts(8), 'wms');

            $io->success('Done.');
            return Command::SUCCESS;
--- a/src/Command/JtlExportCommand.php
+++ b/src/Command/JtlExportCommand.php
@ -51,18 +51,6 @@ class JtlExportCommand extends Command
    protected function execute(InputInterface $input, OutputInterface $output): int
    {
        $io = new SymfonyStyle($input, $output);
-//        $arg1 = $input->getArgument('arg1');
-//
-//        if ($arg1) {
-//            $io->note(sprintf('You passed an argument: %s', $arg1));
-//        }
-//
-//        if ($input->getOption('option1')) {
-//            // ...
-//        }
-
-        $io = new SymfonyStyle($input, $output);
-
        $io->success('Start JTL Export');

        /**
--- a/src/Command/JtlImportCommand.php
+++ b/src/Command/JtlImportCommand.php
@ -1,57 +0,0 @@
-<?php
-
-namespace App\Command;
-
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Notifier\Chatter;
-use Symfony\Component\Notifier\Message\ChatMessage;
-use Symfony\Component\Notifier\Transport;
-
-#[AsCommand(
-    name: 'jtl:import',
-    description: 'Add a short description for your command',
-)]
-class JtlImportCommand extends Command
-{
-    protected function configure(): void
-    {
-        $this
-            ->addArgument('arg1', InputArgument::OPTIONAL, 'Argument description')
-            ->addOption('option1', null, InputOption::VALUE_NONE, 'Option description');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-        $arg1 = $input->getArgument('arg1');
-
-        if ($arg1) {
-            $io->note(sprintf('You passed an argument: %s', $arg1));
-        }
-
-        if ($input->getOption('option1')) {
-            // ...
-        }
-
-        $chatter = new Chatter(new Transport('xoxb-1234-56789abcdefghijklmnopqrstuv'));
-
-
-        $message = (new ChatMessage('You got a new invoice for 15 EUR.'))
-            // if not set explicitly, the message is sent to the
-            // default transport (the first one configured)
-            ->transport('slack');
-
-
-        $sentMessage = $chatter->send($message);
-
-        $io->success('You have a new command! Now make it your own! Pass --help to see your options.');
-
-        return Command::SUCCESS;
-    }
-}
--- a/src/Helper/Hiltes.php
+++ b/src/Helper/Hiltes.php
@ -31,19 +31,19 @@ class Hiltes
        $this->hiltesPass = $_ENV['HILTES_API_PASS'];
    }

-    public function import()
-    {
-
-        $finder = new Finder();
-        $finder->files()->in($this->current_dir_path . "/hiltes/h2c/");
-
-        foreach ($finder as $file) {
-            $contents = $file->getContents();
-
-            //var_dump($contents);
-        }
-
-    }
+//    public function import()
+//    {
+//
+//        $finder = new Finder();
+//        $finder->files()->in($this->current_dir_path . "/hiltes/h2c/");
+//
+//        foreach ($finder as $file) {
+//            $contents = $file->getContents();
+//
+//            //var_dump($contents);
+//        }
+//
+//    }

    /**
     * @param string $data
@ -84,13 +84,14 @@ class Hiltes
    public function createRequest($orderData)
    {

-        $data = array();
        $this->loginToHiltes('', '');
-        $order = $this->orderRepository->findOneBy(array('orderId' => $orderData->getOrderId()));

        /**
         * @var Order
         */
+        $order = $this->orderRepository->findOneBy(array('orderId' => $orderData->getOrderId()));
+
+
        if ($order) {
            //foreach ($orders as $order) {
            if ($order->getStatus() != 2) return false;
@ -116,9 +117,12 @@ class Hiltes
                #			"AchievedSalesPrice" => 0, #X Erzielter Verkaufspreis
                $tSalNr = array();
                foreach ($tA['positions'] as $v) {
-                    if ($v['type'] == 'versandposition') {
-                        $SalesNumber = '000001';
-                        $SalesGoodsGroupNumber = 9350;
+                    if ($v['type'] == 'versandposition' || $v['sku'] == '') {
+//                            $SalesNumber = '000001';
+//                            $SalesGoodsGroupNumber = 9350;
+
+                        // Versandkosten werden nicht übermittelt
+                        continue;
                    } else {
                        $SalesNumber = (!empty($v['gtin']) ? $v['gtin'] : $v['sku']);
                        if (preg_match('/^([0-9]+)_/', $SalesNumber, $tP)) {
--- a/src/Helper/HiltesImport.php
+++ b/src/Helper/HiltesImport.php
@ -40,7 +40,7 @@ class HiltesImport


    /**
-     * @return array|void
+     * @return void
     */
    public function startImport($delta = false)
    {
@ -182,10 +182,8 @@ class HiltesImport
                $warehouse->setId((int)$warehouseName);
                $warehouse->setName($warehouseName);
                $this->warehouseRepository->save($warehouse, true);
-                $this->cachedWarehouseIds[$warehouseName] = $warehouse;
-            } else {
-                $this->cachedWarehouseIds[$warehouseName] = $warehouse;
            }
+            $this->cachedWarehouseIds[$warehouseName] = $warehouse;
        }

        if (!empty($this->cachedWarehouseIds[$warehouseName])) {
--- a/src/Helper/Jtl.php
+++ b/src/Helper/Jtl.php
@ -42,15 +42,19 @@ class Jtl
     * Holt alle Produkte und deren Lagerbestände
     * @return array
     */
-    public function getProducts(): array
+    public function getProducts(int $warehouseId): array
    {

        $r = $this->productRepository->findAll();
-
        $data = array();

        foreach ($r as $product) {
+
+            if ($warehouseId != 0) {
+                $stock = $this->stockRepository->findBy(['product_id' => $product->getId(), 'warehouse_id' => $warehouseId]);
+            } else {
                $stock = $this->stockRepository->findBy(['product_id' => $product->getId()]);
+            }

            if ($stock) {
                foreach ($stock as $s) {
@ -83,17 +87,17 @@ class Jtl
     * @param $data
     * @return void
     */
-    public function createExportFile($data): void
+    public function createExportFile($data, $warehouse): void
    {
        try {
-            $writer = Writer::createFromPath(getcwd() . '/www/jtl/cds-export.csv', 'w+');
+            $writer = Writer::createFromPath(getcwd() . '/www/jtl/' . $warehouse . '.csv', 'w+');
            $bytes = $writer->insertAll(new ArrayIterator($data));

            if ($bytes) {
                $this->logger->info('Exported ' . $bytes . ' bytes');

                $FTP = new Ftp();
-                $FTP->uploadFile(getcwd() . '/www/jtl/cds-export.csv');
+                $FTP->uploadFile(getcwd() . '/www/jtl/' . $warehouse . '.csv');
            }

        } catch (Exception $e) {
--- a/src/Helper/Slack.php
+++ b/src/Helper/Slack.php
@ -1,30 +0,0 @@
-<?php
-
-namespace App\Helper;
-
-use Symfony\Component\Notifier\ChatterInterface;
-use Symfony\Component\Notifier\Exception\TransportExceptionInterface;
-use Symfony\Component\Notifier\Message\ChatMessage;
-
-class Slack
-{
-    private $chatter;
-
-    public function __construct(ChatterInterface $chatter)
-    {
-        $this->chatter = $chatter;
-    }
-
-    public function sendMessage(string $message): void
-    {
-        $message = (new ChatMessage($message))
-            ->transport('slack');
-
-        try {
-            $sentMessage = $this->chatter->send($message);
-        } catch (TransportExceptionInterface $e) {
-
-        }
-    }
-
-}
--- a/templates/slack/index.html.twig
+++ b/templates/slack/index.html.twig
@ -1,20 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block title %}Hello SlackController!{% endblock %}
-
-{% block body %}
-<style>
-    .example-wrapper { margin: 1em auto; max-width: 800px; width: 95%; font: 18px/1.5 sans-serif; }
-    .example-wrapper code { background: #F5F5F5; padding: 2px 6px; }
-</style>
-
-<div class="example-wrapper">
-    <h1>Hello {{ controller_name }}! ✅</h1>
-
-    This friendly message is coming from:
-    <ul>
-        <li>Your controller at <code><a href="{{ '/Users/markomoller/code/CdsConnector/src/Controller/SlackController.php'|file_link(0) }}">src/Controller/SlackController.php</a></code></li>
-        <li>Your template at <code><a href="{{ '/Users/markomoller/code/CdsConnector/templates/slack/index.html.twig'|file_link(0) }}">templates/slack/index.html.twig</a></code></li>
-    </ul>
-</div>
-{% endblock %}