Reservation fixes

Reviewed-on: #29

CLI.Dockerfile

@@ -3,7 +3,8 @@ FROM php:8.4-cli
 ENV TZ "${TZ}"
 ENV APP_NAME "${APP_NAME}"
 
-RUN apt-get update && apt-get install -y --no-install-recommends cron rsyslog nano && rm -r /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends cron rsyslog nano beanstalkd \
+    && rm -r /var/lib/apt/lists/*
 
 RUN pecl install xdebug-3.4.2 \
     && docker-php-ext-enable xdebug \

Dockerfile

@@ -3,7 +3,7 @@ FROM php:8.4-fpm
 ENV TZ=America/Santiago
 
 RUN apt-get update && apt-get install -y --no-install-recommends libzip-dev libicu-dev git \
-    libpng-dev unzip tzdata libxml2-dev \
+    libpng-dev unzip tzdata libxml2-dev beanstalkd \
     && rm -r /var/lib/apt/lists/* \
     && docker-php-ext-install pdo pdo_mysql zip intl gd bcmath dom \
     && pecl install xdebug-3.4.2 \

app/common/Ideal/Model.php

@@ -26,7 +26,7 @@ abstract class Model implements Define\Model
     public function jsonSerialize(): mixed
     {
         return [
-            'id' => $this->id,
+            'id' => $this->id ?? '',
             ...$this->jsonComplement()
         ];
     }

app/common/Implement/Repository/Factory.php

@@ -2,7 +2,9 @@
 namespace Incoviba\Common\Implement\Repository;
 
 use Closure;
+use Exception;
 use Incoviba\Common\Define;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 
 class Factory implements Define\Repository\Factory
 {
@@ -20,8 +22,16 @@ class Factory implements Define\Repository\Factory
         return $this;
     }
 
+    /**
+     * @return mixed
+     * @throws EmptyResult
+     */
     public function run(): mixed
     {
-        return call_user_func_array($this->callable, $this->args);
+        try {
+            return call_user_func_array($this->callable, $this->args);
+        } catch (Exception $exception) {
+            throw new EmptyResult($exception->getMessage(), $exception);
+        }
     }
 }

app/composer.json

@@ -8,11 +8,13 @@
         "ext-gd": "*",
         "ext-openssl": "*",
         "ext-pdo": "*",
+        "ext-sockets": "*",
         "berrnd/slim-blade-view": "^1",
         "guzzlehttp/guzzle": "^7",
         "monolog/monolog": "^3",
         "nyholm/psr7": "^1",
         "nyholm/psr7-server": "^1",
+        "pda/pheanstalk": "^7.0",
         "php-di/php-di": "^7",
         "php-di/slim-bridge": "^3",
         "phpoffice/phpspreadsheet": "^3",

app/fcgi.conf

@@ -125,7 +125,7 @@ pm = ondemand
 ; forget to tweak pm.* to fit your needs.
 ; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
 ; Note: This value is mandatory.
-pm.max_children = 5
+pm.max_children = 2
 
 ; The number of child processes created on startup.
 ; Note: Used only when pm is set to 'dynamic'
@@ -152,6 +152,7 @@ pm.max_children = 5
 ; Note: Used only when pm is set to 'ondemand'
 ; Default Value: 10s
 ;pm.process_idle_timeout = 10s;
+pm.process_idle_timeout = 10s
 
 ; The number of requests each child process should execute before respawning.
 ; This can be useful to work around memory leaks in 3rd party libraries. For

app/resources/database/migrations/20250215133437_create_reservations.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
-final class CreateReservation extends AbstractMigration
+final class CreateReservations extends AbstractMigration
 {
     /**
      * Change Method.
@@ -23,9 +23,11 @@ final class CreateReservation extends AbstractMigration
         $this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
         $this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
 
-        $this->table('reservation')
+        $this->table('reservations')
+            ->addColumn('project_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('buyer_rut', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('date', 'date', ['null' => false])
+            ->addForeignKey('project_id', 'proyecto', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
             ->addForeignKey('buyer_rut', 'personas', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
             ->create();
 

app/resources/database/migrations/20250215135457_create_reservation_details.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
-final class CreateReservationDatas extends AbstractMigration
+final class CreateReservationDetails extends AbstractMigration
 {
     /**
      * Change Method.
@@ -23,11 +23,13 @@ final class CreateReservationDatas extends AbstractMigration
         $this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
         $this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
 
-        $this->table('reservation_data')
+        $this->table('reservation_details')
             ->addColumn('reservation_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('type', 'integer', ['length' => 1, 'signed' => false, 'null' => false])
             ->addColumn('reference_id', 'integer', ['signed' => false, 'null' => false])
-            ->addColumn('value', 'decimal', ['precision' => 10, 'scale' => 2, 'signed' => false, 'default' => 0.00, 'null' => true])
+            ->addColumn('value', 'decimal', ['precision' => 10, 'scale' => 2, 'signed' => false, 'default' => null, 'null' => true])
+            ->addForeignKey('reservation_id', 'reservations', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addIndex(['reservation_id', 'type', 'reference_id'], ['unique' => true, 'name' => 'idx_reservation_details'])
             ->create();
 
         $this->execute('SET unique_checks=1; SET foreign_key_checks=1;');

app/resources/database/migrations/20250215135822_create_reservation_states.php

@@ -27,7 +27,7 @@ final class CreateReservationStates extends AbstractMigration
             ->addColumn('reservation_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('date', 'date', ['null' => false])
             ->addColumn('type', 'integer', ['length' => 3, 'null' => false, 'default' => 0])
-            ->addForeignKey('reservation_id', 'reservation', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addForeignKey('reservation_id', 'reservations', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
             ->create();
 
         $this->execute('SET unique_checks=1; SET foreign_key_checks=1;');

app/resources/database/migrations/20250701192525_create_toku_accounts.php

@@ -19,14 +19,18 @@ final class CreateTokuAccounts extends AbstractMigration
      */
     public function change(): void
     {
+        $this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
+
         $this->table('toku_accounts')
             ->addColumn('sociedad_rut', 'integer', ['limit' => 8, 'signed' => false, 'null' => false])
             ->addColumn('toku_id', 'string', ['length' => 255, 'null' => false])
             ->addColumn('account_key', 'string', ['length' => 255, 'null' => false])
             ->addColumn('enabled', 'boolean', ['default' => true])
-            ->addIndex(['toku_id'], ['unique' => true])
-            ->addForeignKey('sociedad_rut', 'inmobiliaria', 'rut', ['delete' => 'CASCADE', 'update' => 'CASCADE'])
             ->addTimestamps()
+            #->addForeignKey('sociedad_rut', 'inmobiliaria', 'rut', ['delete' => 'CASCADE', 'update' => 'CASCADE'])
+            ->addIndex(['toku_id'], ['unique' => true])
             ->create();
+
+        $this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
     }
 }

app/resources/database/migrations/20250805192903_change_telefono_size_in_propietario.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class ChangeTelefonoSizeInPropietario extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('propietario')
+            ->changeColumn('telefono', 'biginteger', ['null' => true, 'signed' => false, 'default' => null])
+            ->update();
+    }
+}

app/resources/database/migrations/20250805212635_add_comments_to_estado_cierre.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddCommentsToEstadoCierre extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('estado_cierre_comentarios')
+            ->addColumn('estado_cierre_id', 'integer', ['signed' => false])
+            ->addColumn('fecha', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
+            ->addColumn('comments', 'text')
+            ->addForeignKey('estado_cierre_id', 'estado_cierre', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->create();
+    }
+}

app/resources/routes/api/personas.php

@@ -0,0 +1,7 @@
+<?php
+use Incoviba\Controller\API\Personas;
+
+//$app->group('/personas', function($app) {});
+$app->group('/persona/{rut}', function($app) {
+    $app->get('[/]', [Personas::class, 'get']);
+});

app/resources/routes/api/proyectos.php

@@ -30,4 +30,5 @@ $app->group('/proyecto/{proyecto_id}', function($app) {
         $app->post('/edit[/]', [Proyectos::class, 'terreno']);
     });
     $app->get('/brokers', [Proyectos::class, 'brokers']);
+    $app->get('/promotions', [Proyectos::class, 'promotions']);
 });

app/resources/routes/api/queue.php

@@ -2,9 +2,9 @@
 use Incoviba\Controller\API\Queues;
 
 $app->group('/queue', function($app) {
-    $app->get('/jobs[/]', [Queues::class, 'jobs']);
+    #$app->get('/jobs[/]', [Queues::class, 'jobs']);
     $app->group('/run', function($app) {
-        $app->get('/{job_id:[0-9]+}[/]', [Queues::class, 'run']);
+        #$app->get('/{job_id:[0-9]+}[/]', [Queues::class, 'run']);
         $app->get('[/]', Queues::class);
     });
 });

app/resources/routes/api/ventas/precios.php

@@ -2,6 +2,7 @@
 use Incoviba\Controller\API\Ventas\Precios;
 
 $app->group('/precios', function($app) {
+    $app->post('/import[/]', [Precios::class, 'import']);
     $app->post('[/]', [Precios::class, 'proyecto']);
 });
 $app->group('/precio', function($app) {

app/resources/routes/api/ventas/reservations.php

@@ -3,8 +3,14 @@ use Incoviba\Controller\API\Ventas\Reservations;
 
 $app->group('/reservations', function($app) {
     $app->post('/add[/]', [Reservations::class, 'add']);
+    $app->group('/project/{project_id}', function($app) {
+        $app->get('/active[/]', [Reservations::class, 'active']);
+        $app->get('/pending[/]', [Reservations::class, 'pending']);
+        $app->get('/rejected[/]', [Reservations::class, 'rejected']);
+    });
     $app->get('[/]', Reservations::class);
 });
+$app->post('/reservation/add[/]', [Reservations::class, 'addOne']);
 $app->group('/reservation/{reservation_id}', function($app) {
     $app->post('/edit[/]', [Reservations::class, 'edit']);
     $app->delete('[/]', [Reservations::class, 'delete']);

app/resources/routes/ventas/cierres.php

@@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\Ventas\Cierres;
+//use Incoviba\Controller\Ventas\Cierres;
+use Incoviba\Controller\Ventas\Reservations as Cierres;
 
 $app->group('/cierres', function($app) {
     $app->get('[/]', Cierres::class);

app/resources/routes/ventas/precios.php

@@ -2,5 +2,5 @@
 use Incoviba\Controller\Ventas\Precios;
 
 $app->group('/precios', function($app) {
-    $app->get('[/]', Precios::class);
+    $app->get('[/{project_id}[/]]', Precios::class);
 });

app/resources/views/layout/body/scripts/rut.blade.php

@@ -24,6 +24,12 @@
                 rut.replace(/\D/g, '')
                 return rut.replace(/^(\d{1,2})(\d{3})(\d{3})$/, '$1.$2.$3')
             }
+            static clean(rut) {
+                if (!(typeof rut === 'string' || rut instanceof String)) {
+                    rut = rut.toString()
+                }
+                return rut.replace(/\D/g, '')
+            }
             static validar(rut, digito) {
                 if (!(typeof digito === 'string' || digito instanceof String)) {
                     digito = digito.toString()

app/resources/views/ventas/add.blade.php

@@ -156,7 +156,7 @@
     <script>
         const regiones = [
             @foreach ($regiones as $region)
-            '<div class="item" data-value="{{$region->id}}">{{$region->descripcion}}</div>',
+            '<div class="item" data-value="{{$region->id}}">{{$region->numeral}} - {{$region->descripcion}}</div>',
             @endforeach
         ]
 

app/resources/views/ventas/desistida.blade.php

@@ -54,22 +54,23 @@
         }
         $(document).ready(() => {
             const url = '{{$urls->api}}/ventas/pago/{{$venta->resciliacion()->id}}'
-            let old = new Date({{$venta->resciliacion()?->fecha->format('Y') ?? date('Y')}},
-                    {{$venta->resciliacion()?->fecha->format('n') ?? date('n')}}-1, {{$venta->resciliacion()?->fecha->format('j') ?? date('j')}})
+            let old = new Date(Date.parse('{{$venta->resciliacion()?->fecha->format('Y-m-d') ?? $venta->currentEstado()->fecha->format('Y-m-d') ?? $venta->fecha->format('Y-m-d')}}') + 24 * 60 * 60 * 1000)
             calendar_date_options['initialDate'] = old
             calendar_date_options['onChange'] = function(date, text, mode) {
                 if (date.getTime() === old.getTime()) {
                     return
                 }
                 const body = new FormData()
-                body.set('fecha', date.toISOString())
+                const fecha = new Date(date.getTime())
+                fecha.setDate(fecha.getDate() - 1)
+                body.set('fecha', fecha.toISOString())
                 $('#loading-spinner-fecha').show()
                 APIClient.fetch(url, {method: 'post', body}).then(response => {
                     $('#loading-spinner-fecha').hide()
                     if (!response) {
                         return
                     }
-                    old = date
+                    old = new Date(date.getTime())
                     alertResponse('Fecha cambiada correctamente.')
                 })
             }

app/resources/views/ventas/desistir.blade.php

@@ -6,15 +6,26 @@
 
 @section('venta_content')
     <div class="ui list">
-        <div class="item">
-            <div class="header">Valor Pagado</div>
-            <div class="content">
-                {{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}}
-                <div class="ui left pointing small label">
-                    {{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta
+        @if (isset($venta->formaPago()->pie))
+            <div class="item">
+                <div class="header">Valor Pagado</div>
+                <div class="content">
+                    {{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}}
+                    <div class="ui left pointing small label">
+                        {{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta
+                    </div>
                 </div>
             </div>
-        </div>
+        @else
+            <div class="item">
+                <div class="ui compact warning message">
+                    <div class="content">
+                        <i class="exclamation triangle icon"></i>
+                        No tiene valor pagado
+                    </div>
+                </div>
+            </div>
+        @endif
         <div class="item">
             <div class="header">
                 Multa Estandar

app/resources/views/ventas/precios/list.blade.php

@@ -24,6 +24,9 @@
                         <button class="ui tiny green icon button" id="add_button">
                             <i class="plus icon"></i>
                         </button>
+                        <button class="ui tiny green icon button" id="import_button">
+                            <i class="upload icon"></i>
+                        </button>
                     </div>
                 </div>
             </h4>
@@ -31,6 +34,7 @@
             <table class="ui table" id="list_data"></table>
         </div>
     </div>
+    @include('ventas.precios.modal.import')
     <div class="ui modal" id="list_modal">
         <div class="header">
             Actualizar <span id="modal_title"></span>
@@ -97,7 +101,8 @@
                 return this.precio / this.superficie
             }
             draw(formatter) {
-                const date = new Date(this.fecha)
+                const dateParts = this.fecha.split('-')
+                const date = new Date(dateParts[0], dateParts[1] - 1, dateParts[2])
                 const dateFormatter = new Intl.DateTimeFormat('es-CL')
                 return $('<tr></tr>').addClass('unidad').attr('data-linea', this.linea).append(
                     $('<td></td>').html(this.nombre)
@@ -317,7 +322,8 @@
                 buttons: {
                     add: '',
                     up: '',
-                    refresh: ''
+                    refresh: '',
+                    import: ''
                 }
             },
             data: {
@@ -330,6 +336,11 @@
             loading: {
                 precios: false
             },
+            components: {
+                modals: {
+                    import: null
+                }
+            },
             get: function() {
                 return {
                     proyectos: () => {
@@ -378,6 +389,24 @@
                     }
                 }
             },
+            url() {
+                return {
+                    proyectos: () => {
+                        const currentUrl = window.location.href
+                        const newUrl = `{{ $urls->base }}/ventas/precios`
+                        if (newUrl !== currentUrl) {
+                            window.history.replaceState(null, null, newUrl)
+                        }
+                    },
+                    precios: proyecto_id => {
+                        const currentUrl = window.location.href
+                        const newUrl = `{{ $urls->base }}/ventas/precios/${proyecto_id}`
+                        if (newUrl !== currentUrl) {
+                            window.history.replaceState(null, null, newUrl)
+                        }
+                    }
+                }
+            },
             add: function() {
                 return {
                     precio: data => {
@@ -400,6 +429,7 @@
             draw: function() {
                 return {
                     proyectos: () => {
+                        this.url().proyectos()
                         const parent = $(this.ids.list)
                         const header = parent.find('#list_title')
                         const list = parent.find('.list')
@@ -408,6 +438,7 @@
                         $(this.ids.buttons.add).hide()
                         $(this.ids.buttons.add).attr('data-id', '')
                         $(this.ids.buttons.add).attr('data-proyecto', '')
+                        $(`#${this.ids.buttons.import}`).hide()
 
                         header.html('Proyectos')
                         table.hide()
@@ -415,7 +446,8 @@
 
                         this.data.proyectos.forEach(proyecto => {
                             list.append(
-                                $('<div></div>').addClass('item proyecto').attr('data-proyecto', proyecto.id).html(proyecto.descripcion).css('cursor', 'pointer')
+                                $('<div></div>').addClass('item proyecto').attr('data-proyecto', proyecto.id)
+                                    .html(proyecto.descripcion).css('cursor', 'pointer')
                             )
                         })
                         list.show()
@@ -431,6 +463,7 @@
                         })
                     },
                     precios: () => {
+                        this.url().precios(this.data.id)
                         const parent = $(this.ids.list)
                         const header = parent.find('#list_title')
                         const list = parent.find('.list')
@@ -440,6 +473,8 @@
                         $(this.ids.buttons.add).attr('data-proyecto', this.data.proyecto)
                         $(this.ids.buttons.add).show()
 
+                        $(`#${this.ids.buttons.import}`).show()
+
                         header.html('Precios de ' + this.data.proyecto)
                         list.hide()
                         table.html('')
@@ -581,18 +616,27 @@
                             }
                         }
                     },
+                    import: event => {
+                        event.preventDefault()
+                        precios.components.modals.import.show(this.data.id)
+                        return false
+                    }
                 }
             },
-            setup: function({list, proyectos, buttons_up, buttons_refresh, buttons_add}) {
+            setup: function({list, proyectos, buttons_up, buttons_refresh, buttons_add, buttons_import}) {
                 this.ids.list = list
                 this.ids.proyectos = proyectos
                 this.ids.buttons.up = buttons_up
                 this.ids.buttons.refresh = buttons_refresh
                 this.ids.buttons.add = buttons_add
+                this.ids.buttons.import = buttons_import
 
                 $(this.ids.buttons.up).click(this.actions().up)
                 $(this.ids.buttons.refresh).click(this.actions().refresh)
                 $(this.ids.buttons.add).click(this.actions().add().list)
+                document.getElementById(this.ids.buttons.import).addEventListener('click', this.actions().import)
+
+                this.components.modals.import = new ImportModal()
 
                 this.draw().proyectos()
             }
@@ -674,6 +718,10 @@
                 $(this.ids.button).click(this.actions().send)
             }
         }
+        function selectProject(projectId) {
+            const $project = $(`.item.proyecto[data-proyecto="${projectId}"]`)
+            $project.click()
+        }
 
         $(document).ready(() => {
             precios.setup({
@@ -681,7 +729,8 @@
                 proyectos: '#proyectos',
                 buttons_up: '#up_button',
                 buttons_refresh: '#refresh_button',
-                buttons_add: '#add_button'
+                buttons_add: '#add_button',
+                buttons_import: 'import_button'
             })
             list_modal.setup({
                 modal: '#list_modal',
@@ -692,6 +741,10 @@
                 fields_valor: '#valor',
                 button: '#send'
             })
+
+        @if (isset($project_id))
+            selectProject({{$project_id}})
+        @endif
         })
     </script>
 @endpush

app/resources/views/ventas/precios/modal/import.blade.php

@@ -0,0 +1,120 @@
+<div class="ui modal" id="import_modal">
+    <div class="header">
+        Importar Precios
+    </div>
+    <div class="content">
+        <div class="ui form">
+            <input type="hidden" id="import_project_id" name="import_project_id" value="" />
+            <div class="three wide field">
+                <div class="ui calendar" id="import_date">
+                    <div class="ui left icon input">
+                        <i class="calendar icon"></i>
+                        <input type="text" name="fecha" />
+                    </div>
+                </div>
+            </div>
+            <input class="ui invisible file input" type="file" id="import_file" name="file" />
+            <label class="ui placeholder segment" for="import_file">
+                <div class="ui icon header">
+                    <i class="upload icon"></i>
+                    Archivo de Precios
+                </div>
+            </label>
+        </div>
+    </div>
+    <div class="actions">
+        <div class="ui red cancel icon button">
+            <i class="remove icon"></i>
+        </div>
+        <div class="ui green ok icon button">
+            <i class="checkmark icon"></i>
+            Importar
+        </div>
+</div>
+
+@push('page_scripts')
+    <script>
+        class ImportModal {
+            ids = {
+                modal: '',
+                project: '',
+                calendar: '',
+                file: ''
+            }
+            components = {
+                $modal: null,
+                form: null,
+                project: null,
+                $calendar: null,
+                file: null,
+                $file: null
+            }
+            constructor() {
+                this.ids.modal = 'import_modal'
+                this.ids.project = 'import_project_id'
+                this.ids.calendar = 'import_date'
+                this.ids.file = 'import_file'
+
+                this.setup()
+            }
+            show(project_id) {
+                this.components.project.value = project_id
+                this.components.$modal.modal('show')
+            }
+            dragDrop(event) {
+                event.preventDefault()
+
+                if (event.originalEvent.dataTransfer && event.originalEvent.dataTransfer.files.length > 0) {
+                    this.components.file.files = event.originalEvent.dataTransfer.files
+                }
+            }
+            import() {
+                const url = '{{ $urls->api }}/ventas/precios/import'
+                const method = 'post'
+                const body = new FormData()
+                body.set('project_id', this.components.project.value)
+                const date = this.components.$calendar.calendar('get date')
+                body.set('date', [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-'))
+                body.set('file', this.components.file.files[0])
+                APIClient.fetch(url, {method, body}).then(response => response.json()).then(json => {
+                    if (json.status === true) {
+                        window.location.reload()
+                        return
+                    }
+                    console.debug(json)
+                })
+            }
+            setup() {
+                this.components.$modal = $(`#${this.ids.modal}`)
+                this.components.$modal.modal({
+                    onApprove: () => {
+                        this.import()
+                    }
+                })
+                this.components.form = this.components.$modal.find('form')
+                this.components.form.submit(event => {
+                    event.preventDefault()
+                    this.import()
+                    return false
+                })
+                this.components.project = document.getElementById(this.ids.project)
+                this.components.$calendar = $(`#${this.ids.calendar}`)
+                const cdo = structuredClone(calendar_date_options)
+                cdo['maxDate'] = new Date()
+                this.components.$calendar.calendar(cdo)
+                this.components.file = document.getElementById(this.ids.file)
+                this.components.$file = $(this.components.file.parentNode.querySelector('label'))
+                this.components.$file.css('cursor', 'pointer')
+                this.components.$file.on('dragover', event => {
+                    event.preventDefault()
+                    event.stopPropagation()
+                })
+                this.components.$file.on('dragenter', event => {
+                    event.preventDefault()
+                    event.stopPropagation()
+                })
+                this.components.$file.on('drop', this.dragDrop.bind(this))
+            }
+        }
+    </script>
+@endpush

app/resources/views/ventas/reservations.blade.php

@@ -0,0 +1,565 @@
+@extends('layout.base')
+
+@section('page_title')
+    Cierres -Reservas
+@endsection
+
+@section('page_content')
+    <div class="ui container">
+        <h2 class="ui header">Cierres - Reservas</h2>
+
+        <div class="ui compact segment" id="projects">
+            <div class="ui header">Proyectos</div>
+            @if (count($projects) == 0)
+                <div class="ui message">
+                    No hay proyectos en venta.
+                </div>
+            @else
+                <div class="ui link list">
+                    @foreach ($projects as $project)
+                        <div class="item link" data-id="{{ $project->id }}">
+                            {{ $project->descripcion }}
+                        </div>
+                    @endforeach
+                </div>
+            @endif
+        </div>
+        <div class="ui two column grid">
+            <div class="column">
+                <h3 class="ui header" id="project"></h3>
+            </div>
+            <div class="column">
+                <div class="ui active inline loader" id="loader"></div>
+            </div>
+        </div>
+        <div id="results">
+            <div class="ui right aligned top attached basic segment" id="controls">
+                <div class="ui tiny icon buttons">
+                    <button class="ui button" id="up_button">
+                        <i class="up arrow icon"></i>
+                    </button>
+                    <button class="ui button" id="refresh_button">
+                        <i class="refresh icon"></i>
+                    </button>
+                    <button class="ui green icon button" id="add_button">
+                        <i class="plus icon"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="ui top attached tabular menu" id="tabs">
+                <div class="yellow active item" data-tab="pending">Pendientes</div>
+                <div class="green item" data-tab="active">Activas</div>
+                <div class="red item" data-tab="rejected">Rechazadas</div>
+            </div>
+            <div class="ui bottom attached tab fitted segment active" data-tab="pending">
+                <table class="ui yellow striped table" id="pending_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>¿Valida?</th>
+                        <th>Operador</th>
+                        <th></th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+            <div class="ui bottom attached tab fitted segment" data-tab="active">
+                <table class="ui green striped table" id="active_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>Operador</th>
+                        <th></th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+            <div class="ui bottom attached tab fitted segment" data-tab="rejected">
+                <table class="ui red striped table" id="rejected_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>Estado</th>
+                        <th>Operador</th>
+                        <th>Comentarios</th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    @include('ventas.reservations.modal.add')
+@endsection
+
+@push('page_styles')
+    <style>
+        .item.link {
+            cursor: pointer;
+            text-decoration: underline;
+        }
+    </style>
+@endpush
+
+@push('page_scripts')
+    <script>
+        class Projects {
+            display = {
+                projects: '',
+                project: ''
+            }
+            component_id = ''
+            component = null
+            current_project = null;
+            title_id = ''
+            title_component = null
+
+            constructor({component_id, title_id}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                this.display.projects = this.component.style.display
+                this.title_id = title_id
+                this.title_component = document.getElementById(this.title_id)
+                this.display.project = this.title_component.style.display
+
+                this.show()
+                this.watch()
+            }
+
+            select(event) {
+                event.preventDefault()
+
+                const project_id = event.currentTarget.dataset.id
+                reservations.show.results()
+
+                if (project_id === this.current_project) {
+                    this.hide()
+                    this.title_component.innerHTML = event.currentTarget.innerHTML
+
+                    reservations.action.reservations()
+
+                    return
+                }
+                this.current_project = project_id
+
+                reservations.get.reservations(project_id)
+                reservations.components.modals.add.load(project_id)
+                this.hide()
+
+                this.title_component.innerHTML = event.currentTarget.innerHTML
+            }
+
+            watch() {
+                this.component.querySelectorAll('.item.link').forEach(item => {
+                    item.addEventListener('click', this.select.bind(this))
+                })
+            }
+
+            show() {
+                this.component.style.display = this.display.projects
+                this.title_component.style.display = 'none'
+            }
+
+            hide() {
+                this.component.style.display = 'none'
+                this.title_component.style.display = this.display.project
+            }
+        }
+
+        class Controls {
+            display = {
+                up: '',
+                reset: '',
+            }
+            component_id = ''
+            component = null
+
+            buttons = {
+                up: null,
+                reset: null,
+                add: null
+            }
+
+            constructor({component_id}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                const buttons = this.component.querySelectorAll('button')
+                this.buttons.up = buttons[0]
+                this.buttons.reset = buttons[1]
+                this.buttons.add = buttons[2]
+                this.display.up = buttons[0].style.display
+                this.display.reset = buttons[1].style.display
+
+                this.watch()
+                this.hide()
+            }
+
+            watch() {
+                Object.entries(this.buttons).forEach(([key, value]) => {
+                    const name = key.replace('_button', '')
+                    value.addEventListener('click', this.action[name].bind(this))
+                })
+            }
+
+            hide() {
+                this.buttons.up.style.display = this.display.up
+                this.buttons.reset.style.display = this.display.reset
+            }
+
+            show() {
+                this.buttons.up.style.display = 'none'
+                this.buttons.reset.style.display = 'none'
+            }
+
+            action = {
+                reset: event => {
+                    event.preventDefault()
+                    reservations.action.reset(event)
+                    return false
+                },
+                up: event => {
+                    event.preventDefault()
+                    reservations.action.up(event)
+                    return false
+                },
+                add: event => {
+                    event.preventDefault()
+                    reservations.action.add(event)
+                    return false
+                }
+            }
+        }
+
+        class Reservations {
+            display = {
+                reservations: '',
+            }
+            component_id = ''
+            component = null
+            formatters = {
+                date: null,
+                ufs: null
+            }
+
+            columnNames = []
+            reservations = []
+
+            constructor({component_id, formatters = {date, ufs}}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                this.display.reservations = this.component.style.display
+
+                this.formatters = formatters
+
+                this.set.columnNames()
+
+                this.hide()
+            }
+
+            set = {
+                reservations: reservations => {
+                    this.reservations = reservations
+                    return this
+                },
+                columnNames: () => {
+                    const tds = this.component.querySelector('thead tr').querySelectorAll('th')
+                    this.columnNames = []
+                    tds.forEach(td => {
+                        let name = td.innerHTML.toLowerCase()
+                        if (name === '') {
+                            return
+                        }
+                        if (name.includes('?')) {
+                            name = name.replaceAll(/[¿?]/g, '')
+                        }
+                        this.columnNames.push(name)
+                    })
+                    return this
+                }
+            }
+
+            columnsData() {
+                return this.reservations.map(reservation => {
+                    const date = new Date(Date.parse(reservation.fecha) + 24 * 60 * 60 * 1000)
+                    return {
+                        id: reservation.id,
+                        unidades: reservation.summary,
+                        cliente: reservation.buyer.nombreCompleto,
+                        fecha: this.formatters.date.format(date),
+                        oferta: `${this.formatters.ufs.format(reservation.offer)} UF`,
+                        valida: reservation.valid ? '<span class="ui green text">Si</span>' : '<span class="ui red text">No</span>',
+                        operador: reservation.broker?.name ?? '',
+                    }
+                })
+            }
+
+            draw() {
+                if (this.reservations.length === 0) {
+                    this.empty()
+                    return
+                }
+                const tbody = this.component.querySelector('tbody')
+                tbody.innerHTML = ''
+                this.columnsData().forEach(column => {
+                    const tr = document.createElement('tr')
+                    const contents = []
+                    const id = column.id
+                    this.columnNames.forEach(name => {
+                        contents.push(`<td>${column[name]}</td>`)
+                    })
+                    const actions = this.drawActions(id)
+                    if (actions !== '') {
+                        contents.push(actions)
+                    }
+                    tr.innerHTML = contents.join("\n")
+                    tbody.appendChild(tr)
+                })
+                this.show()
+            }
+
+            drawActions(id) {
+                return `
+                    <td class="right aligned">
+                        <button class="ui green mini icon button approve" data-id="${id}" title="Aprobar">
+                            <i class="check icon"></i>
+                        </button>
+                        <button class="ui red mini icon button reject" data-id="${id}" title="Rechazar">
+                            <i class="trash icon"></i>
+                        </button>
+                    </td>`
+            }
+
+            empty() {
+                const tbody = this.component.querySelector('tbody')
+                tbody.innerHTML = ''
+                const col_span = this.columnNames.length + 1
+                const tr = document.createElement('tr')
+                tr.innerHTML = `<td colspan="${col_span}">No hay cierres</td>`
+                tbody.appendChild(tr)
+
+                this.show()
+            }
+
+            show() {
+                this.component.style.display = this.display.reservations
+            }
+
+            hide() {
+                this.component.style.display = 'none'
+            }
+        }
+
+        class ActiveReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+
+            columnsData() {
+                const data = super.columnsData();
+                return data.map(row => {
+                    delete (row['valida'])
+                    return row
+                })
+            }
+
+            drawActions(id) {
+                return `
+                    <td class="right aligned">
+                        <button class="ui green mini icon button edit" data-id="${id}" title="Promesar">
+                            <i class="right chevron icon"></i>
+                        </button>
+                        <button class="ui red mini icon button remove" data-id="${id}" title="Abandonar">
+                            <i class="trash icon"></i>
+                        </button>
+                    </td>`
+            }
+        }
+
+        class PendingReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+        }
+
+        class RejectedReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+
+            columnsData() {
+                const data = super.columnsData()
+                return this.reservations.map((reservation, idx) => {
+                    data[idx]['estado'] = reservation.state.charAt(0).toUpperCase() + reservation.state.slice(1)
+                    data[idx]['comentarios'] = reservation.comments?.join('<br />\n') ?? ''
+                    return data[idx]
+                })
+            }
+
+            drawActions(id) {
+                return ''
+            }
+        }
+
+        const reservations = {
+            components: {
+                projects: null,
+                loader: null,
+                results: null,
+                controls: null,
+                reservations: {
+                    active: null,
+                    pending: null,
+                    rejected: null
+                },
+                modals: {
+                    add: null
+                }
+            },
+            display: {
+                loader: '',
+                results: '',
+            },
+            get: {
+                send: (project_id, url_segment, component) => {
+                    const url = `/api/ventas/reservations/project/${project_id}/${url_segment}`
+                    return APIClient.fetch(url).then(response => response.json()).then(json => {
+                        if (json.reservations.length > 0) {
+                            component.set.reservations(json.reservations)
+                        }
+                        component.draw()
+                    })
+                },
+                active: project_id => {
+                    return reservations.get.send(project_id, 'active', reservations.components.reservations.active)
+                },
+                pending: project_id => {
+                    return reservations.get.send(project_id, 'pending', reservations.components.reservations.pending)
+                },
+                rejected: project_id => {
+                    return reservations.get.send(project_id, 'rejected', reservations.components.reservations.rejected)
+                },
+                reservations: project_id => {
+                    reservations.loading.show()
+
+                    const promises = []
+
+                    promises.push(reservations.get.active(project_id))
+                    promises.push(reservations.get.pending(project_id))
+                    promises.push(reservations.get.rejected(project_id))
+
+                    return Promise.any(promises).then(() => {
+                        reservations.loading.hide()
+                    })
+                }
+            },
+            loading: {
+                show: () => {
+                    reservations.components.loader.style.display = reservations.display.loader
+                },
+                hide: () => {
+                    reservations.components.loader.style.display = 'none'
+                }
+            },
+            action: {
+                reset: event => {
+                    event.preventDefault()
+                    reservations.components.projects.current_project = null
+                    Object.entries(reservations.components.reservations).forEach(([key, value]) => {
+                        reservations.components.reservations[key].reservations = []
+                        reservations.components.reservations[key].hide()
+                    })
+                    reservations.show.projects()
+                    return false
+                },
+                up: event => {
+                    event.preventDefault()
+                    Object.values(reservations.components.reservations).forEach(reservations => reservations.hide())
+                    reservations.show.projects()
+                    return false
+                },
+                add: event => {
+                    event.preventDefault()
+                    reservations.components.modals.add.show()
+                    return false
+                },
+                reservations: () => {
+                    Object.values(reservations.components.reservations).forEach(reservations => {
+                        reservations.draw()
+                    })
+                }
+            },
+            show: {
+                projects: () => {
+                    reservations.components.projects.show()
+                    reservations.components.results.style.display = 'none'
+                },
+                results: () => {
+                    reservations.components.projects.hide()
+                    reservations.components.results.style.display = reservations.display.results
+                    Object.values(reservations.components.reservations).forEach(reservations => reservations.draw())
+                }
+            },
+            setup(configuration) {
+                const formatters = {
+                    date: new Intl.DateTimeFormat('es-CL', {year: 'numeric', month: 'long', day: 'numeric'}),
+                    ufs: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2})
+                }
+                this.components.loader = document.getElementById(configuration.ids.loader)
+                this.components.projects = new Projects({
+                    component_id: configuration.ids.projects,
+                    title_id: configuration.ids.project
+                })
+                this.components.controls = new Controls({component_id: configuration.ids.controls})
+                this.components.reservations.active = new ActiveReservations({
+                    component_id: configuration.ids.active,
+                    formatters
+                })
+                this.components.reservations.pending = new PendingReservations({
+                    component_id: configuration.ids.pending,
+                    formatters
+                })
+                this.components.reservations.rejected = new RejectedReservations({
+                    component_id: configuration.ids.rejected,
+                    formatters
+                })
+
+                this.display.loader = this.components.loader.style.display
+                this.loading.hide()
+
+                $(`#${configuration.ids.tabs} .item`).tab()
+                this.components.results = document.getElementById(configuration.ids.results)
+                this.display.results = this.components.results.style.display
+                this.show.projects()
+
+                this.components.modals.add = new AddReservationModal(configuration.ids.projects)
+            }
+        }
+        $(document).ready(() => {
+            reservations.setup({
+                ids: {
+                    projects: 'projects',
+                    project: 'project',
+                    results: 'results',
+                    loader: 'loader',
+                    controls: 'controls',
+                    tabs: 'tabs',
+                    active: 'active_reservations',
+                    pending: 'pending_reservations',
+                    rejected: 'rejected_reservations',
+                }
+            })
+        })
+    </script>
+@endpush

app/resources/views/ventas/reservations/modal/add.blade.php

@@ -0,0 +1,758 @@
+<div class="ui modal" id="add_reservation_modal">
+    <div class="header">
+        Agregar Cierre
+    </div>
+    <div class="content">
+        <form class="ui form" id="add_reservation_form">
+            <input type="hidden" name="add_project_id" />
+            <div class="three wide required field">
+                <label>Fecha</label>
+                <div class="ui calendar" id="add_date">
+                    <div class="ui icon input">
+                        <i class="calendar icon"></i>
+                        <input type="text" name="add_date" />
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide required field">
+                    <label>RUT</label>
+                    <div class="ui right labeled input" id="add_rut">
+                        <input type="text" name="add_buyer_rut" placeholder="RUT" />
+                        <div class="ui basic label">-<span id="add_digit"></span></div>
+                    </div>
+                </div>
+                <div class="field">
+                    <label></label>
+                    <div class="ui inline loader" id="add_rut_loader"></div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide required field">
+                    <label>Nombre</label>
+                    <input type="text" name="add_buyer_name" placeholder="Nombre" />
+                </div>
+                <div class="six wide required field">
+                    <label>Apellidos</label>
+                    <input type="text" name="add_buyer_last_name" placeholder="Apellido Paterno" />
+                </div>
+                <div class="six wide field">
+                    <label></label>
+                    <input type="text" name="add_buyer_last_name2" placeholder="Apellido Materno" />
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide field">
+                    <label>Dirección</label>
+                    <input type="text" name="add_buyer_address_street" placeholder="Calle" />
+                </div>
+                <div class="field">
+                    <label></label>
+                    <input type="text" name="add_buyer_address_number" placeholder="N°" />
+                </div>
+                <div class="three wide field">
+                    <label></label>
+                    <input type="text" name="add_buyer_address_extra" placeholder="Otros Detalles" />
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide field">
+                    <label>Comuna</label>
+                    <div class="ui search selection dropdown" id="add_comuna">
+                        <input type="hidden" name="comuna" />
+                        <i class="dropdown icon"></i>
+                        <div class="default text">Comuna</div>
+                        <div class="menu"></div>
+                    </div>
+                </div>
+                <div class="seven wide field">
+                    <label>Región</label>
+                    <div class="ui search selection dropdown" id="add_region">
+                        <input type="hidden" name="region" />
+                        <i class="dropdown icon"></i>
+                        <div class="default text">Región</div>
+                        <div class="menu">
+                            @foreach($regions as $region)
+                                <div class="item" data-value="{{$region->id}}">{{$region->numeral}} - {{$region->descripcion}}</div>
+                            @endforeach
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="field">
+                    <label>Telefono</label>
+                    <input type="text" name="add_buyer_phone" placeholder="Telefono" />
+                </div>
+                <div class="field">
+                    <label>Correo</label>
+                    <div class="ui labeled input">
+                        <input type="text" name="add_buyer_email_name" placeholder="Correo" />
+                        <div class="ui basic label">@</div>
+                        <input type="text" name="add_buyer_email_domain" placeholder="Dominio" />
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="field">
+                    <label>Estado Civil</label>
+                    <input type="text" name="add_buyer_marital_status" placeholder="Estado Civil" />
+                </div>
+                <div class="field">
+                    <label>Profesión</label>
+                    <input type="text" name="add_buyer_profession" placeholder="Profesión" />
+                </div>
+                <div class="field">
+                    <label>Fecha de Nacimiento</label>
+                    <div class="ui calendar" id="add_birthdate">
+                        <div class="ui icon input">
+                            <i class="calendar icon"></i>
+                            <input type="text" name="birthdate" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="six wide field">
+                <label>Operador *</label>
+                <div class="ui clearable search selection dropdown" id="add_broker">
+                    <input type="hidden" name="add_broker" />
+                    <i class="dropdown icon"></i>
+                    <div class="default text">Operador</div>
+                    <div class="menu"></div>
+                </div>
+            </div>
+            <div class="field">
+                <label>Agregar Promoción</label>
+                <button type="button" class="ui icon button" id="add_promotion">
+                    <i class="plus icon"></i>
+                </button>
+            </div>
+            <div id="add_promotions"></div>
+            <h4 class="ui dividing header">Unidades <span id="add_project_name"></span></h4>
+            <div class="fields" id="add_unit_buttons"></div>
+            <div id="add_units"></div>
+        </form>
+    </div>
+    <div class="actions">
+        <div class="ui cancel button">
+            Cancelar
+        </div>
+        <div class="ui green ok button">
+            Agregar
+        </div>
+    </div>
+</div>
+
+@include('layout.body.scripts.rut')
+
+@push('page_scripts')
+    <script>
+        class AddModalPromotions {
+            ids = {
+                button: '',
+                elements: ''
+            }
+            data = {
+                promotions: []
+            }
+            components = {
+                button: null,
+                promotions: null,
+            }
+            display = {
+                button: ''
+            }
+
+            constructor() {
+                this.ids = {
+                    button: 'add_promotion',
+                    elements: 'add_promotions'
+                }
+                this.setup()
+            }
+            add() {
+                const idx = Math.max(this.data.promotions.length, 0, Math.max(...this.data.promotions) + 1)
+                this.data.promotions.push(idx)
+                this.draw.promotions()
+            }
+            reset() {
+                this.data.promotions = []
+                this.draw.promotions()
+            }
+            remove(idx) {
+                this.data.promotions = this.data.promotions.filter(promotion => promotion !== idx)
+                this.draw.promotions()
+            }
+            draw = {
+                promotion: idx => {
+                    const promotions = this.data.promotions.map(promotion => {
+                        return `<div class="item" data-value="${promotion.id}">${promotion.name}</div>`
+                    })
+                    return [
+                        `<div class="fields promotion" data-id="${idx}">`,
+                            '<div class="three wide field">',
+                                '<label>Promoción</label>',
+                                `<div class="ui search selection dropdown">`,
+                                    '<input type="hidden" name="add_promotions[]" />',
+                                    '<i class="dropdown icon"></i>',
+                                    '<div class="default text">Promoción</div>',
+                                    `<div class="menu">${promotions.join('')}</div>`,
+                                '</div>',
+                            '</div>',
+                            '<div class="two wide field">',
+                                '<label></label>',
+                                `<button class="ui red tiny icon button remove_promotion" type="button" data-id="${idx}"><i class="trash icon"></i></button>`,
+                            '</div>',
+                        '</div>'
+                    ].join('')
+                },
+                promotions: () => {
+                    if (this.data.promotions.length === 0) {
+                        this.components.button.parentElement.style.display = 'none'
+                        this.components.promotions.innerHTML = ''
+                        return
+                    }
+                    this.components.button.parentElement.style.display = this.display.button
+                    this.components.promotions.innerHTML = this.data.promotions.map((promotion, idx) => {
+                        return this.draw.promotion(idx)
+                    }).join('')
+                    this.components.promotions.querySelectorAll('.dropdown').forEach(dropdown => {
+                        $(dropdown).dropdown()
+                    })
+                    this.components.promotions.querySelectorAll('.remove_promotion').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const idx = Number(button.dataset.id)
+                            this.remove(idx)
+                        })
+                    })
+                }
+            }
+            setup() {
+                this.components.button = document.getElementById(this.ids.button)
+                this.components.promotions = document.getElementById(this.ids.elements)
+                this.components.button.addEventListener('click', () => {
+                    this.add()
+                })
+                this.display.button = this.components.button.parentElement.style.display
+                this.draw.promotions()
+            }
+        }
+        class AddModalUnits {
+            ids = {
+                buttons_holder: '',
+                units: ''
+            }
+            data = {
+                button_map: {},
+                types: {},
+                units: [],
+            }
+            components = {
+                buttons_holder: null,
+                units: null,
+            }
+
+            constructor() {
+                this.ids = {
+                    buttons_holder: 'add_unit_buttons',
+                    units: 'add_units'
+                }
+                this.data.button_map = {
+                    'departamento': 'building',
+                    'estacionamiento': 'car',
+                    'bodega': 'warehouse',
+                    'terraza': 'vector square'
+                }
+                this.setup()
+            }
+            draw = {
+                button: type => {
+                    return [
+                        '<div class="field">',
+                            `<button class="ui icon button" type="button" data-type="${type}" title="${type.charAt(0).toUpperCase() + type.slice(1)}">`,
+                                '<i class="plus icon"></i>',
+                                `<i class="${this.data.button_map[type]} icon"></i>`,
+                            '</button>',
+                        '</div>'
+                    ].join('')
+                },
+                buttons: () => {
+                    this.components.buttons_holder.innerHTML = Object.keys(this.data.types).map(type => {
+                        return this.draw.button(type)
+                    }).join('')
+                    this.components.buttons_holder.querySelectorAll('.button').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const type = button.dataset.type
+                            this.add(type)
+                        })
+                    })
+                },
+                units: () => {
+                    if (this.data.units.length === 0) {
+                        this.components.units.innerHTML = ''
+                        return
+                    }
+                    this.components.units.innerHTML = this.data.units.map(unit => {
+                        return [
+                            '<div class="fields">',
+                                '<div class="four wide field">',
+                                    `<label>${unit.type.charAt(0).toUpperCase() + unit.type.slice(1)}</label>`,
+                                    `<div class="ui search selection dropdown">`,
+                                        '<input type="hidden" name="add_units[]" />',
+                                        '<i class="dropdown icon"></i>',
+                                        `<div class="default text">${unit.type.charAt(0).toUpperCase() + unit.type.slice(1)}</div>`,
+                                        '<div class="menu">',
+                                        this.data.types[unit.type].map(unit => {
+                                            return `<div class="item" data-value="${unit.value}">${unit.name}</div>`
+                                        }).join(''),
+                                        '</div>',
+                                    '</div>',
+                                '</div>',
+                                '<div class="three wide field">',
+                                    '<label>Valor</label>',
+                                    '<div class="ui right labeled input">',
+                                        '<input type="number" name="add_units_value[]" placeholder="Valor" />',
+                                        '<div class="ui basic label">UF</div>',
+                                    '</div>',
+                                '</div>',
+                                '<div class="field">',
+                                    '<label></label>',
+                                    `<button class="ui red tiny icon button remove_unit" type="button" data-id="${unit.idx}"><i class="trash icon"></i></button>`,
+                                '</div>',
+                            '</div>',
+                        ].join('')
+                    }).join('')
+                    this.components.units.querySelectorAll('.dropdown').forEach(dropdown => {
+                        $(dropdown).dropdown()
+                    })
+                    this.components.units.querySelectorAll('.remove_unit').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const idx = Number(button.dataset.id)
+                            this.remove(idx)
+                        })
+                    })
+                }
+            }
+            reset() {
+                this.data.units = []
+                this.draw.units()
+            }
+            add(type) {
+                const idx = Math.max(this.data.units.length, 0, Math.max(...this.data.units.map(unit => unit.idx)) + 1)
+                this.data.units.push({idx, type})
+                this.draw.units()
+            }
+            remove(idx) {
+                this.data.units = this.data.units.filter(unit => unit.idx !== idx)
+                this.draw.units()
+            }
+            setup() {
+                this.components.buttons_holder = document.getElementById(this.ids.buttons_holder)
+                this.components.units = document.getElementById(this.ids.units)
+                this.draw.buttons()
+            }
+        }
+        class AddReservationModal {
+            ids = {
+                modal: '',
+                form: '',
+                date: '',
+                rut: '',
+                digit: '',
+                birthdate: '',
+                comuna: '',
+                region: '',
+                broker: '',
+                promotion_button: '',
+                promotions: '',
+                projects: '',
+                project_name: '',
+                unit_buttons: '',
+                units: ''
+            }
+            components = {
+                $modal: null,
+                form: null,
+                $date: null,
+                $rut: null,
+                rut: null,
+                digit: null,
+                $birthdate: null,
+                $comuna: null,
+                $region: null,
+                $broker: null,
+                promotion_button: null,
+                promotions: null,
+                projects: null,
+                project_name: null,
+                unit_buttons: null,
+                units: null,
+                $loader: null
+            }
+            data = {
+                current_project: null,
+                comunas: {},
+                brokers: {},
+                promotions: {},
+                unit_buttons: [],
+                units: {},
+                added_units: {},
+                current_user: null
+            }
+            maps = {
+                unit_types: {
+                    departamento: 'building',
+                    estacionamiento: 'car',
+                    bodega: 'warehouse',
+                    terraza: 'tree',
+                }
+            }
+            constructor(projects_id) {
+                this.ids = {
+                    modal: 'add_reservation_modal',
+                    form: 'add_reservation_form',
+                    date: 'add_date',
+                    rut: 'add_rut',
+                    digit: 'add_digit',
+                    birthdate: 'add_birthdate',
+                    comuna: 'add_comuna',
+                    region: 'add_region',
+                    broker: 'add_broker',
+                    promotion_button: 'add_promotion',
+                    promotions: 'add_promotions',
+                    projects: projects_id,
+                    project_name: 'add_project_name',
+                    unit_buttons: 'add_unit_buttons',
+                    units: 'add_units',
+                    loader: 'add_rut_loader'
+                }
+                this.setup()
+            }
+            load(project_id) {
+                this.reset()
+                this.data.current_project = project_id
+                this.components.project_name.textContent = this.components.projects.querySelector(`.item[data-id="${project_id}"]`).textContent
+                this.components.form.querySelector('input[name="add_project_id"]').value = project_id
+
+                this.get.brokers(project_id)
+                this.get.promotions(project_id).then(promotions => {
+                    this.components.promotions.data.promotions = promotions
+                    this.components.promotions.draw.promotions()
+                })
+                this.get.units(project_id).then(units => {
+                    this.components.units.data.types = units
+                    this.components.units.draw.buttons()
+                })
+            }
+            reset() {
+                this.components.form.reset()
+                this.components.promotions.reset()
+                this.components.units.reset()
+            }
+            add() {
+                const url = '/api/ventas/reservation/add'
+                const form = document.getElementById(this.ids.form)
+                const body = new FormData(form)
+                const date = this.components.$date.calendar('get date')
+                body.set('add_date', [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-'))
+                body.set('add_buyer_rut', Rut.clean(this.components.rut.querySelector('input').value))
+                body.set('add_buyer_digit', this.components.digit.textContent)
+                body.set('add_buyer_address_comuna_id', this.components.$comuna.dropdown('get value'))
+                body.set('add_broker_rut', Rut.clean(this.components.$broker.dropdown('get value')))
+                body.set('add_buyer_email', form.querySelector("input[name='add_buyer_email_name']").value + '@' + form.querySelector("input[name='add_buyer_email_domain']").value)
+                const birthdate = this.components.$birthdate.calendar('get date')
+                body.set('add_buyer_birthdate', [birthdate.getFullYear(), birthdate.getMonth() + 1, birthdate.getDate()].join('-'))
+
+                body.delete('comuna')
+                body.delete('region')
+                body.delete('broker')
+                body.delete('add_broker')
+                body.delete('birthdate')
+                body.delete('add_buyer_email_name')
+                body.delete('add_buyer_email_domain')
+
+                const method = 'post'
+                return APIClient.fetch(url, {method, body}).then(response => response.json()).then(json => {
+                    if (json.success) {
+                        window.location.reload()
+                    }
+                })
+            }
+            get = {
+                comunas: region_id => {
+                    if (region_id in this.data.comunas) {
+                        this.components.$comuna.dropdown('change values', this.data.comunas[region_id])
+                        if (this.data.current_user !== null && this.data.current_user?.direccion?.comuna !== null) {
+                            this.components.$comuna.dropdown('set selected', this.data.current_user.direccion.comuna.id)
+                        }
+                        return
+                    }
+                    const uri = `/api/region/${region_id}/comunas`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.comunas.length === 0) {
+                            return
+                        }
+                        this.data.comunas[region_id] = json.comunas.map(comuna => {
+                            return {
+                                text: comuna.descripcion,
+                                name: comuna.descripcion,
+                                value: comuna.id
+                            }
+                        })
+                        this.components.$comuna.dropdown('change values', this.data.comunas[region_id])
+
+                        if (this.data.current_user !== null && this.data.current_user?.direccion?.comuna !== null) {
+                            this.components.$comuna.dropdown('set selected', this.data.current_user.direccion.comuna.id)
+                        }
+                    })
+                },
+                brokers: project_id => {
+                    if (project_id in this.data.brokers) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.brokers[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/brokers`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.contracts.length === 0) {
+                            return
+                        }
+                        const formatter = new Intl.NumberFormat('es-CL', { style: 'percent', minimumFractionDigits: 2 })
+                        this.data.brokers[project_id] = json.contracts.map(contract => {
+                            return {
+                                id: contract.id,
+                                broker_rut: contract.broker_rut,
+                                commission: formatter.format(contract.commission),
+                                name: '',
+                                text: '',
+                            }
+                        })
+                        const promises = []
+                        json.contracts.forEach(contract => {
+                            promises.push(this.get.broker(contract.broker_rut))
+                        })
+
+                        return Promise.all(promises).then(data => {
+                            data.forEach(broker => {
+                                if (!('rut' in broker)) {
+                                    return
+                                }
+                                const idx = this.data.brokers[project_id].findIndex(contract => contract.broker_rut === broker.rut)
+                                this.data.brokers[project_id][idx].name = this.data.brokers[project_id][idx].text = `${broker.name} - ${this.data.brokers[project_id][idx].commission}`
+                            })
+                            this.fill.brokers()
+                        })
+                    })
+                },
+                broker: (broker_rut) => {
+                    const uri = `/api/proyectos/broker/${broker_rut}`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (!('broker' in json)) {
+                            return []
+                        }
+                        return json.broker
+                    })
+                },
+                promotions: project_id => {
+                    if (project_id in this.data.promotions) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.promotions[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/promotions`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.promotions.length === 0) {
+                            return this.data.promotions[project_id] = []
+                        }
+                        return this.data.promotions[project_id] = json.promotions.map(promotion => {
+                            return {
+                                text: promotion.name,
+                                name: promotion.name,
+                                value: promotion.id
+                            }
+                        })
+                    })
+                },
+                units: project_id => {
+                    if (project_id in this.data.units) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.units[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/unidades/disponibles`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.unidades.length === 0) {
+                            this.data.units[project_id] = {}
+                            return this.data.units[project_id]
+                        }
+                        if (!(project_id in this.data.units)) {
+                            this.data.units[project_id] = {}
+                        }
+                        json.unidades.forEach(unit => {
+                            const type = unit.proyecto_tipo_unidad.tipo_unidad.descripcion
+                            if (!(type in this.data.units[project_id])) {
+                                this.data.units[project_id][type] = []
+                            }
+                            this.data.units[project_id][type].push({
+                                text: unit.descripcion,
+                                name: unit.descripcion,
+                                value: unit.id
+                            })
+                        })
+                        Object.entries(this.data.units[project_id]).forEach(([type, units]) => {
+                            units.sort((a, b) => {
+                                return parseInt(a.text) - parseInt(b.text)
+                            })
+                            this.data.units[project_id][type] = units
+                        })
+                        return this.data.units[project_id]
+                    })
+                },
+                user: rut => {
+                    if (this.data.current_user !== null && this.data.current_user?.rut === rut) {
+                        return this.data.current_user
+                    }
+                    this.loader.show()
+                    const uri = `/api/persona/${rut}`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        this.loader.hide()
+                        if (!json.success) {
+                            return
+                        }
+                        this.data.current_user = json.persona
+                        return json.persona
+                    })
+                }
+            }
+            fill = {
+                user: user => {
+                    const form = this.components.form
+                    form.querySelector('input[name="add_buyer_name"]').value = user.nombres || ''
+                    form.querySelector('input[name="add_buyer_last_name"]').value = user.apellidoPaterno || ''
+                    form.querySelector('input[name="add_buyer_last_name2"]').value = user.apellidoMaterno || ''
+                    form.querySelector('input[name="add_buyer_address_street"]').value = user.datos?.direccion?.calle || ''
+                    form.querySelector('input[name="add_buyer_address_number"]').value = user.datos?.direccion?.numero || ''
+                    form.querySelector('input[name="add_buyer_address_extra"]').value = user.datos?.direccion?.extra || ''
+                    if (parseInt(this.components.$region.dropdown('get value')) !== user.datos?.direccion?.comuna?.provincia?.region?.id) {
+                        this.components.$region.dropdown('set selected', user.datos?.direccion?.comuna?.provincia?.region?.id)
+                    } else {
+                        this.components.$comuna.dropdown('set selected', user.datos?.direccion?.comuna?.id)
+                    }
+                    form.querySelector('input[name="add_buyer_phone"]').value = user.datos?.telefono || ''
+                    const email_parts = user.datos?.email?.split('@') || []
+                    form.querySelector('input[name="add_buyer_email_name"]').value = email_parts[0] || ''
+                    form.querySelector('input[name="add_buyer_email_domain"]').value = email_parts[1] || ''
+                    if (user.datos !== null && 'estadoCivil' in user.datos) {
+                        form.querySelector('input[name="add_buyer_marital_status"]').value = user.datos?.estadoCivil.charAt(0).toUpperCase() + user.datos?.estadoCivil.slice(1)
+                    } else {
+                        form.querySelector('input[name="add_buyer_marital_status"]').value = ''
+                    }
+                    if (user.datos !== null &&'ocupacion' in user.datos) {
+                        form.querySelector('input[name="add_buyer_profession"]').value = user.datos?.ocupacion.charAt(0).toUpperCase() + user.datos?.ocupacion.slice(1).toLowerCase()
+                    } else {
+                        form.querySelector('input[name="add_buyer_profession"]').value = ''
+                    }
+                    if (user.datos !== null &&'fechaNacimiento' in user.datos) {
+                        this.components.$birthdate.calendar('set date', user.datos?.fechaNacimiento)
+                    }
+                },
+                brokers: () => {
+                    this.components.$broker.dropdown('change values', this.data.brokers[this.data.current_project])
+                },
+                units: () => {
+                    const buttons = []
+                    Object.entries(this.maps.unit_types).forEach(([type, map]) => {
+                        if (!(type in this.data.units[this.data.current_project])) {
+                            return
+                        }
+                        buttons.push(`<div class="field"><div class="ui icon button" data-type="${type}" title="${type.charAt(0).toUpperCase() + type.slice(1)}"><i class="plus icon"></i><i class="${map} icon"></i></div></div>`)
+                    })
+
+                    this.components.unit_buttons.innerHTML = buttons.join('')
+                    this.components.unit_buttons.querySelectorAll('.ui.icon.button').forEach(button => {
+                        button.addEventListener('click', () => {
+                            this.units.add(button.dataset.type)
+                        })
+                    })
+                }
+            }
+            watch = {
+                region: (value, text, $choice) => {
+                    this.get.comunas(value)
+                },
+            }
+            loader = {
+                show: () => {
+                    this.components.$loader.show()
+                },
+                hide: () => {
+                    this.components.$loader.hide()
+                }
+            }
+            show() {
+                this.reset()
+                this.components.$modal.modal('show')
+            }
+            setup() {
+                this.components.$modal = $(`#${this.ids.modal}`)
+                this.components.form = document.getElementById(this.ids.form)
+                this.components.$date = $(`#${this.ids.date}`)
+                this.components.rut = document.getElementById(this.ids.rut)
+                this.components.digit = document.getElementById(this.ids.digit)
+                this.components.$birthdate = $(`#${this.ids.birthdate}`)
+                this.components.$comuna = $(`#${this.ids.comuna}`)
+                this.components.$region = $(`#${this.ids.region}`)
+                this.components.$broker = $(`#${this.ids.broker}`)
+                this.components.promotions = new AddModalPromotions()
+                this.components.projects = document.getElementById(this.ids.projects)
+                this.components.project_name = document.getElementById(this.ids.project_name)
+                this.components.units = new AddModalUnits()
+
+                this.components.$modal.modal({
+                    onApprove: () => {
+                        this.add()
+                    }
+                })
+                this.components.form.addEventListener('submit', event => {
+                    event.preventDefault()
+                    this.add()
+                    return false
+                })
+                const cdo = structuredClone(calendar_date_options)
+                cdo['initialDate'] = new Date()
+                cdo['maxDate'] = new Date()
+                this.components.$date.calendar(cdo)
+                const rutInput = this.components.rut.querySelector('input')
+                rutInput.addEventListener('input', event => {
+                    const value = event.currentTarget.value.replace(/\D/g, '')
+                    if (value.length <= 3) {
+                        return
+                    }
+                    this.components.digit.textContent = Rut.digitoVerificador(value)
+                })
+                rutInput.addEventListener('blur', event => {
+                    const value = event.currentTarget.value.replace(/\D/g, '')
+                    if (value.length <= 3) {
+                        return
+                    }
+                    event.currentTarget.value = Rut.format(value)
+                    this.get.user(value).then(user => {
+                        this.fill.user(user)
+                    })
+                })
+                const cdo2 = structuredClone(cdo)
+                cdo2['initialDate'].setFullYear(cdo2['initialDate'].getFullYear() - 18)
+                cdo2['maxDate'].setFullYear(cdo2['maxDate'].getFullYear() - 18)
+                this.components.$birthdate.calendar(cdo2)
+                this.components.$region.dropdown({
+                    fireOnInit: true,
+                    onChange: this.watch.region
+                })
+                this.components.$region.dropdown('set selected', 13)
+                this.components.$comuna.dropdown()
+                this.components.$broker.dropdown()
+                this.components.$loader = $(`#${this.ids.loader}`)
+            }
+        }
+    </script>
+@endpush

app/setup/setups/services.php

@@ -116,7 +116,18 @@ return [
             ->registerSub($container->get(Incoviba\Service\Contabilidad\Cartola\BCI\Mes::class));
     },
     'TokuClient' => function(ContainerInterface $container) {
+        $logger = $container->get('externalLogger');
+        $stack = GuzzleHttp\HandlerStack::create();
+        $stack->push(GuzzleHttp\Middleware::mapRequest(function(Psr\Http\Message\RequestInterface $request) use ($logger) {
+            $logger->info('Toku Request', [
+                'method' => $request->getMethod(),
+                'uri' => (string) $request->getUri(),
+                'headers' => $request->getHeaders(),
+                'body' => $request->getBody()->getContents(),
+            ]);
+        }));
         return new GuzzleHttp\Client([
+            'handler' => $stack,
             'base_uri' => $container->get('TOKU_URL'),
             'headers' => [
                 'x-api-key' => $container->get('TOKU_TOKEN'),
@@ -162,6 +173,16 @@ return [
             ->register('subscription', $container->get(Incoviba\Service\Venta\MediosPago\Toku\Subscription::class))
             ->register('invoice', $container->get(Incoviba\Service\Venta\MediosPago\Toku\Invoice::class));
     },
+    Pheanstalk\Pheanstalk::class => function(ContainerInterface $container) {
+        return Pheanstalk\Pheanstalk::create(
+            $container->get('BEANSTALKD_HOST'),
+            $container->has('BEANSTALKD_PORT') ? $container->get('BEANSTALKD_PORT') : 11300
+        );
+    },
+    Incoviba\Service\MQTT::class => function(ContainerInterface $container) {
+        return new Incoviba\Service\MQTT()
+            ->register('default', $container->get(Incoviba\Service\MQTT\Pheanstalk::class));
+    },
     Incoviba\Service\Queue::class => function(ContainerInterface $container) {
         return new Incoviba\Service\Queue(
             $container->get(Psr\Log\LoggerInterface::class),
@@ -203,5 +224,9 @@ return [
             $container->get(Incoviba\Service\Queue::class)
         )
             ->register($container->get(Incoviba\Service\Venta\MediosPago\Toku::class));
+    },
+    Incoviba\Service\FileUpload::class => function(ContainerInterface $container) {
+        return new Incoviba\Service\FileUpload($container->get(Psr\Log\LoggerInterface::class))
+            ->register($container->get(Incoviba\Service\FileUpload\ExcelBase::class));
     }
 ];

app/src/Controller/API/Personas.php

@@ -0,0 +1,34 @@
+<?php
+namespace Incoviba\Controller\API;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Personas extends Ideal\Controller
+{
+    use withJson;
+
+    public function get(ServerRequestInterface $request, ResponseInterface $response,
+                        Service\Persona $personaService, int $rut): ResponseInterface
+    {
+        $output = [
+            'rut' => $rut,
+            'persona' => null,
+            'success' => false
+        ];
+        try {
+            $persona = $personaService->getById($rut);
+            $output['persona'] = $persona;
+            $output['success'] = true;
+        } catch (ServiceAction\Read $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+        }
+
+        return $this->withJson($response, $output);
+    }
+}

app/src/Controller/API/Proyectos.php

@@ -187,5 +187,18 @@ class Proyectos
         }
         return $this->withJson($response, $output);
     }
-
+    public function promotions(ServerRequestInterface  $request, ResponseInterface $response,
+                               Service\Venta\Promotion $promotionService, int $proyecto_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $proyecto_id,
+            'promotions' => []
+        ];
+        try {
+            $output['promotions'] = $promotionService->getByProject($proyecto_id);
+        } catch (Read $exception) {
+            return $this->withError($response, $exception);
+        }
+        return $this->withJson($response, $output);
+    }
 }

app/src/Controller/API/Queues.php

@@ -22,20 +22,4 @@ class Queues extends Ideal\Controller
         }
         return $this->withJson($response, $output);
     }
-    public function jobs(ServerRequestInterface $request, ResponseInterface $response,
-                         Service\Queue $queueService): ResponseInterface
-    {
-        $output = [
-            'jobs' => array_column($queueService->getPendingJobs(), 'id')
-        ];
-        return $this->withJson($response, $output);
-    }
-    public function run(ServerRequestInterface $request, ResponseInterface $response, Service\Queue $queueService,
-                        int $job_id): ResponseInterface
-    {
-        if ($queueService->runJob($job_id, $request)) {
-            return $response->withStatus(200);
-        }
-        return $response->withStatus(422);
-    }
 }

app/src/Controller/API/Ventas/MediosPago/Toku.php

@@ -155,10 +155,11 @@ class Toku extends Controller
         $output = [
             'type' => $type,
             'input' => $input,
+            'output' => [],
             'success' => false
         ];
         try {
-            $tokuService->update($input, $type);
+            $output['output'] = $tokuService->update($input, $type);
             $output['success'] = true;
         } catch (Exception $exception) {
             $this->logger->error($exception);

app/src/Controller/API/Ventas/Precios.php

@@ -1,13 +1,16 @@
 <?php
 namespace Incoviba\Controller\API\Ventas;
 
+use DateTime;
+use Exception;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\EmptyRedis;
-use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Common\Implement\Exception\{EmptyRedis,EmptyResult};
+use Psr\Log\LoggerInterface;
 use Incoviba\Controller\API\{withJson,emptyBody};
-use Incoviba\Service;
 use Incoviba\Controller\withRedis;
+use Incoviba\Exception\ServiceAction\Create;
+use Incoviba\Service;
 
 class Precios
 {
@@ -51,4 +54,29 @@ class Precios
             }
         }
     }
+
+    public function import(ServerRequestInterface $request, ResponseInterface $response,
+                           LoggerInterface $logger,
+                           Service\Venta\Precio $precioService): ResponseInterface
+    {
+        $body = $request->getParsedBody();
+        $projectId = $body['project_id'];
+        $date = $body['date'];
+        $file = $request->getUploadedFiles()['file'];
+        $output = [
+            'input' => $body,
+            'total' => 0,
+            'precios' => [],
+            'status' => false
+        ];
+        $date = DateTime::createFromFormat('Y-m-d', $date);
+        try {
+            $output['precios'] = $precioService->import($projectId, $date, $file);
+            $output['total'] = count($output['precios']);
+            $output['status'] = true;
+        } catch (Create | Exception $exception) {
+            $logger->warning($exception);
+        }
+        return $this->withJson($response, $output);
+    }
 }

app/src/Controller/API/Ventas/Reservations.php

@@ -11,7 +11,8 @@ class Reservations
 {
     use withJson;
 
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService): ResponseInterface
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Venta\Reservation $reservationService): ResponseInterface
     {
         $reservations = [];
         try {
@@ -22,6 +23,18 @@ class Reservations
 
         return $this->withJson($response, compact('reservations'));
     }
+    public function getByProject(ServerRequestInterface $request, ResponseInterface $response,
+                                 Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $reservations = [];
+        try {
+            $reservations = $reservationService->getByProject($project_id);
+        } catch (ServiceAction\Read $exception) {
+            return $this->withError($response, $exception);
+        }
+
+        return $this->withJson($response, compact('reservations'));
+    }
     public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService, int $reservation_id): ResponseInterface
     {
         $output = [
@@ -47,8 +60,8 @@ class Reservations
             'partial' => false,
             'errors' => [],
         ];
-
-        try {
+        var_dump($input);
+        /*try {
             $output['reservations'] []= [
                 'reservation' => $reservationService->add($input),
                 'success' => true
@@ -56,7 +69,7 @@ class Reservations
             $output['partial'] = true;
         } catch (ServiceAction\Create $exception) {
             $output['errors'] []= $this->parseError($exception);
-        }
+        }*/
 
         if (count($input['reservations']) === count($output['reservations'])) {
             $output['success'] = true;
@@ -64,6 +77,31 @@ class Reservations
 
         return $this->withJson($response, $output);
     }
+    public function addOne(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService): ResponseInterface
+    {
+        $input = $request->getParsedBody();
+        $output = [
+            'input' => $input,
+            'reservation' => null,
+            'success' => false,
+            'errors' => [],
+        ];
+        $data = [];
+        foreach ($input as $key => $value) {
+            if (!str_starts_with($key, 'add_')) {
+                continue;
+            }
+            $data[substr($key, 4)] = $value;
+        }
+        try {
+            $output['reservation'] = $reservationService->add($data);
+            $output['success'] = true;
+        } catch (ServiceAction\Create $exception) {
+            $output['errors'] []= $this->parseError($exception);
+        }
+
+        return $this->withJson($response, $output);
+    }
     public function edit(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService, int $reservation_id): ResponseInterface
     {
         $input = $request->getParsedBody();
@@ -100,4 +138,47 @@ class Reservations
 
         return $this->withJson($response, $output);
     }
+
+    public function active(ServerRequestInterface $request, ResponseInterface $response,
+                           Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getActive($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
+    public function pending(ServerRequestInterface $request, ResponseInterface $response,
+                            Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getPending($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
+    public function rejected(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getRejected($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
 }

app/src/Controller/Ventas.php

@@ -4,6 +4,9 @@ namespace Incoviba\Controller;
 use Incoviba\Common\Alias\View;
 use Incoviba\Common\Implement\Exception\EmptyRedis;
 use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Exception\ServiceAction\Create;
+use Incoviba\Exception\ServiceAction\Read;
+use Incoviba\Exception\ServiceAction\Update;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
@@ -142,9 +145,24 @@ class Ventas
         return $view->render($response, 'ventas.desistir', compact('venta'));
     }
     public function desistida(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService,
+                              Service\Venta\Pago $pagoService,
                               View $view, int $venta_id): ResponseInterface
     {
-        $venta = $ventaService->getById($venta_id);
+        try {
+            $venta = $ventaService->getById($venta_id);
+        } catch (Read) {
+            return $view->render($response->withStatus(404), 'not_found');
+        }
+        if ($venta->resciliacion() === null) {
+            $pagoData = [
+                'fecha' => $venta->currentEstado()->fecha->format('Y-m-d'),
+                'valor' => 0
+            ];
+            try {
+                $pago = $pagoService->add($pagoData);
+                $venta = $ventaService->edit($venta, ['resciliacion' => $pago->id]);
+            } catch (Create | Update) {}
+        }
         return $view->render($response, 'ventas.desistida', compact('venta'));
     }
 }

app/src/Controller/Ventas/Precios.php

@@ -9,9 +9,9 @@ use Incoviba\Model;
 
 class Precios
 {
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Proyecto $proyectoService): ResponseInterface
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Proyecto $proyectoService, ?int $project_id = null): ResponseInterface
     {
         $proyectos = array_map(function(Model\Proyecto $proyecto) {return ['id' => $proyecto->id, 'descripcion' => $proyecto->descripcion];}, $proyectoService->getVendibles());
-        return $view->render($response, 'ventas.precios.list', compact('proyectos'));
+        return $view->render($response, 'ventas.precios.list', compact('proyectos', 'project_id'));
     }
 }

app/src/Controller/Ventas/Reservations.php

@@ -0,0 +1,28 @@
+<?php
+namespace Incoviba\Controller\Ventas;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Alias\View;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Exception\ServiceAction\Read;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Reservations
+{
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Proyecto $proyectoService, Repository\Region $regionRepository,
+                             View $view): ResponseInterface
+    {
+        $projects = [];
+        try {
+            $projects = $proyectoService->getVendibles('descripcion');
+        } catch (Read) {}
+        $regions = [];
+        try {
+            $regions = $regionRepository->fetchAll();
+        } catch (EmptyResult) {}
+        return $view->render($response, 'ventas.reservations', compact('projects', 'regions'));
+    }
+}

app/src/Exception/MQTT.php

@@ -0,0 +1,18 @@
+<?php
+namespace Incoviba\Exception;
+
+use Throwable;
+use Exception;
+
+abstract class MQTT extends Exception
+{
+    public function __construct($message = "", $code = 0, ?Throwable $previous = null)
+    {
+        $baseCode = 700;
+        $code = $baseCode + $code;
+        if ($message == "") {
+            $message = "MQTT Exception";
+        }
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Exception/MQTT/MissingClient.php

@@ -0,0 +1,18 @@
+<?php
+namespace Incoviba\Exception\MQTT;
+
+use Throwable;
+use Incoviba\Exception\MQTT;
+
+class MissingClient extends MQTT
+{
+    public function __construct(string $host = '', ?Throwable $previous = null)
+    {
+        $message = 'Missing MQTT client';
+        if ($host !== '') {
+            $message = "{$message} for host {$host}";
+        }
+        $code = 1;
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Exception/MQTT/MissingJob.php

@@ -0,0 +1,15 @@
+<?php
+namespace Incoviba\Exception\MQTT;
+
+use Throwable;
+use Incoviba\Exception\MQTT;
+
+class MissingJob extends MQTT
+{
+    public function __construct(?Throwable $previous = null)
+    {
+        $message = 'Missing MQTT job';
+        $code = 10;
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Exception/MQTT/RemoveJob.php

@@ -0,0 +1,15 @@
+<?php
+namespace Incoviba\Exception\MQTT;
+
+use Throwable;
+use Incoviba\Exception\MQTT;
+
+class RemoveJob extends MQTT
+{
+    public function __construct(int $jobId, ?Throwable $previous = null)
+    {
+        $message = "Could not remove job {$jobId}";
+        $code = 13;
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Exception/MQTT/SetJob.php

@@ -0,0 +1,15 @@
+<?php
+namespace Incoviba\Exception\MQTT;
+
+use Throwable;
+use Incoviba\Exception\MQTT;
+
+class SetJob extends MQTT
+{
+    public function __construct(string $payload, ?Throwable $previous = null)
+    {
+        $message = "Could not set job with {$payload}";
+        $code = 11;
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Exception/Model/InvalidState.php

@@ -0,0 +1,13 @@
+<?php
+namespace Incoviba\Exception\Model;
+
+use Throwable;
+use Exception;
+
+class InvalidState extends Exception
+{
+    public function __construct(string $message = "Invalid state", int $code = 505, ?Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}

app/src/Model/Persona.php

@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model;
 
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use InvalidArgumentException;
 use Incoviba\Common\Ideal;
 use Incoviba\Model\Persona\Datos;
@@ -27,22 +28,26 @@ class Persona extends Ideal\Model
     public function datos(): ?Datos
     {
         if (!isset($this->datos)) {
-            $this->datos = $this->runFactory('datos');
+            try {
+                $this->datos = $this->runFactory('datos');
+            } catch (EmptyResult) {
+                $this->datos = null;
+            }
         }
         return $this->datos;
     }
 
     public function __get(string $name): mixed
     {
-        if (property_exists($this, $name)) {
-            return $this->{$name};
-        }
         if ($name === 'datos') {
             return $this->datos();
         }
         if ($name === 'dv') {
             return $this->digito;
         }
+        if (property_exists($this, $name)) {
+            return $this->{$name};
+        }
         throw new InvalidArgumentException("Property {$name} is not found in " . __CLASS__);
     }
 

app/src/Model/Persona/Datos.php

@@ -21,10 +21,11 @@ class Datos extends Ideal\Model
     public function jsonSerialize(): mixed
     {
         return [
+            'persona_rut' => $this->persona->rut,
             'direccion' => $this->direccion ?? null,
             'telefono' => $this->telefono ?? null,
             'email' => $this->email ?? null,
-            'fechaNacimiento' => $this->fechaNacimiento ?? null,
+            'fechaNacimiento' => $this->fechaNacimiento?->format('Y-m-d') ?? null,
             'sexo' => $this->sexo ?? null,
             'estadoCivil' => $this->estadoCivil ?? null,
             'nacionalidad' => $this->nacionalidad ?? null,

app/src/Model/Proyecto/Broker.php

@@ -1,7 +1,10 @@
 <?php
 namespace Incoviba\Model\Proyecto;
 
+use DateTimeImmutable;
+use DateTimeInterface;
 use Incoviba\Common;
+use Incoviba\Model\Proyecto;
 
 class Broker extends Common\Ideal\Model
 {
@@ -26,6 +29,36 @@ class Broker extends Common\Ideal\Model
         }
         return $this->contracts;
     }
+    public function getContract(Proyecto $proyecto, ?DateTimeInterface $date = null): ?Proyecto\Broker\Contract
+    {
+        if ($date === null) {
+            $date = new DateTimeImmutable();
+        }
+        $contracts = $this->contracts();
+        $valid = array_filter($contracts, fn(Proyecto\Broker\Contract $contract) => $contract->project->id === $proyecto->id);
+        $valid = array_filter($valid, fn(Proyecto\Broker\Contract $contract) => $contract->wasActive($date));
+        if (count($valid) === 0) {
+            return null;
+        }
+        return last($valid);
+    }
+
+    public function applyCommission(Proyecto $proyecto, float $price, ?DateTimeInterface $date = null): float
+    {
+        $contract = $this->getContract($proyecto, $date);
+        if ($contract === null) {
+            return $price;
+        }
+        return $contract->activate()->apply($proyecto, $price);
+    }
+    public function reverseCommission(Proyecto $proyecto, float $price, ?DateTimeInterface $date = null): float
+    {
+        $contract = $this->getContract($proyecto, $date);
+        if ($contract === null) {
+            return $price;
+        }
+        return $contract->activate()->reverse($proyecto, $price);
+    }
 
     public function rutFull(): string
     {

app/src/Model/Proyecto/Broker/Contract.php

@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model\Proyecto\Broker;
 
+use DateTimeInterface;
 use Incoviba\Common;
 use Incoviba\Model;
 
@@ -41,6 +42,51 @@ class Contract extends Common\Ideal\Model
         return $this->promotions;
     }
 
+    public function isActive(): bool
+    {
+        $state = $this->current();
+        return $state !== null and $state->isActive();
+    }
+    public function activate(): self
+    {
+        $this->current()->activate();
+        return $this;
+    }
+    public function wasActive(DateTimeInterface $date): bool
+    {
+        $states = $this->states();
+        return array_any($states, fn($state) => $state->date <= $date);
+    }
+
+    public function value(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        return $price * (1 + $this->commission);
+    }
+    public function inverse(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        return $price / (1 + $this->commission);
+    }
+    public function apply(Model\Proyecto $project, float $price): float
+    {
+        if (!$this->isActive() or $this->project->id !== $project->id) {
+            return $price;
+        }
+        return $this->value($price);
+    }
+    public function reverse(Model\Proyecto $project, float $price): float
+    {
+        if (!$this->isActive() or $this->project->id !== $project->id) {
+            return $price;
+        }
+        return $this->inverse($price);
+    }
+
     protected function jsonComplement(): array
     {
         return [

app/src/Model/Proyecto/Broker/Contract/State.php

@@ -11,6 +11,16 @@ class State extends Common\Ideal\Model
     public DateTimeInterface $date;
     public State\Type $type;
 
+    public function isActive(): bool
+    {
+        return $this->type === State\Type::ACTIVE;
+    }
+    public function activate(): self
+    {
+        $this->type = State\Type::ACTIVE;
+        return $this;
+    }
+
     protected function jsonComplement(): array
     {
         return [

app/src/Model/Venta/Datos.php

@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model\Venta;
 
+use DateTimeInterface;
 use JsonSerializable;
 use Incoviba\Model\Direccion;
 
@@ -12,6 +13,7 @@ class Datos
     public ?Direccion $direccion = null;
     public ?int $telefono = null;
     public ?string $email = null;
+    public ?DateTimeInterface $fecha_nacimiento = null;
 
     public function jsonSerialize(): mixed
     {
@@ -21,7 +23,8 @@ class Datos
             'profesion' => $this->profesion ?? '',
             'direccion' => $this->direccion ?? '',
             'telefono' => $this->telefono ?? '',
-            'email' => $this->email ?? ''
+            'email' => $this->email ?? '',
+            'fecha_nacimiento' => $this->fecha_nacimiento?->format('Y-m-d') ?? '',
         ];
     }
 }

app/src/Model/Venta/Promotion.php

@@ -3,6 +3,7 @@ namespace Incoviba\Model\Venta;
 
 use DateTimeInterface;
 use Incoviba\Common;
+use Incoviba\Model\Proyecto;
 use Incoviba\Model\Proyecto\Broker;
 use Incoviba\Model\Venta\Promotion\State;
 use Incoviba\Model\Venta\Promotion\Type;
@@ -61,13 +62,95 @@ class Promotion extends Common\Ideal\Model
         return $this->units;
     }
 
+    public function isActive(): bool
+    {
+        return $this->state === State::ACTIVE;
+    }
+    public function activate(): self
+    {
+        $this->state = State::ACTIVE;
+        return $this;
+    }
+
     public function value(float $price): float
     {
+        if (!$this->isActive()) {
+            return $price;
+        }
         if ($this->type === Type::FIXED) {
             return $price + $this->amount;
         }
         return $price / (1 - $this->amount);
     }
+    public function inverse(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        if ($this->type === Type::FIXED) {
+            return $price - $this->amount;
+        }
+        return $price * (1 - $this->amount);
+    }
+
+    public function apply(Unidad $unit, float $price, ?Broker $broker = null): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        $projectIds = array_map(fn(Proyecto $proyecto) => $proyecto->id, $this->projects());
+        if (in_array($unit->proyectoTipoUnidad->proyecto->id, $projectIds)) {
+            return $this->value($price);
+        }
+        if ($broker !== null) {
+            $brokerIds = array_map(fn(Broker $broker) => $broker->id, $this->brokers());
+            if (in_array($broker->id, $brokerIds)) {
+                return $this->value($price);
+            }
+        }
+        $typeIds = array_map(fn(Proyecto\TipoUnidad $type) => $type->id, $this->unitTypes());
+        if (in_array($unit->proyectoTipoUnidad->tipoUnidad->id, $typeIds)) {
+            return $this->value($price);
+        }
+        $lineIds = array_map(fn(Proyecto\ProyectoTipoUnidad $line) => $line->id, $this->unitLines());
+        if (in_array($unit->proyectoTipoUnidad->id, $lineIds)) {
+            return $this->value($price);
+        }
+        $unitIds = array_map(fn(Unidad $unit) => $unit->id, $this->units());
+        if (in_array($unit->id, $unitIds)) {
+            return $this->value($price);
+        }
+        return $price;
+    }
+    public function reverse(Unidad $unit, float $price, ?Broker $broker = null): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        $projectIds = array_map(fn(Proyecto $proyecto) => $proyecto->id, $this->projects());
+        if (in_array($unit->proyectoTipoUnidad->proyecto->id, $projectIds)) {
+            return $this->inverse($price);
+        }
+        if ($broker !== null) {
+            $brokerIds = array_map(fn(Broker $broker) => $broker->id, $this->brokers());
+            if (in_array($broker->id, $brokerIds)) {
+                return $this->inverse($price);
+            }
+        }
+        $typeIds = array_map(fn(Proyecto\TipoUnidad $type) => $type->id, $this->unitTypes());
+        if (in_array($unit->proyectoTipoUnidad->tipoUnidad->id, $typeIds)) {
+            return $this->inverse($price);
+        }
+        $lineIds = array_map(fn(Proyecto\ProyectoTipoUnidad $line) => $line->id, $this->unitLines());
+        if (in_array($unit->proyectoTipoUnidad->id, $lineIds)) {
+            return $this->inverse($price);
+        }
+        $unitIds = array_map(fn(Unidad $unit) => $unit->id, $this->units());
+        if (in_array($unit->id, $unitIds)) {
+            return $this->inverse($price);
+        }
+        return $price;
+    }
 
     protected function jsonComplement(): array
     {

app/src/Model/Venta/Reservation.php

@@ -4,19 +4,53 @@ namespace Incoviba\Model\Venta;
 use DateTimeInterface;
 use Incoviba\Common;
 use Incoviba\Model;
+use InvalidArgumentException;
 
 class Reservation extends Common\Ideal\Model
 {
+    public Model\Proyecto $project;
     public Model\Persona $buyer;
     public DateTimeInterface $date;
     public array $units = [];
     public array $promotions = [];
     public ?Model\Proyecto\Broker $broker = null;
+
+    public function offer(): float
+    {
+        return array_sum(array_column($this->units, 'value'));
+    }
+    public function withCommission(): float
+    {
+        $base = 0;
+        foreach ($this->units as $unit) {
+            foreach ($this->promotions as $promotion) {
+                $base += $promotion->activate()->reverse($unit['unit'], $unit['value'], $this->broker);
+            }
+        }
+        return $base;
+    }
+    public function base(): float
+    {
+        $base = $this->withCommission();
+        if ($this->broker !== null) {
+            $base = $this->broker->reverseCommission($this->project, $base, $this->date);
+        }
+        return $base;
+    }
+    public function price(): float
+    {
+        $price = 0;
+        foreach ($this->units as $unit) {
+            $price += $unit->unit->precio($this->date)?->valor ?? 0;
+        }
+        return $price;
+    }
+
     protected array $states = [];
 
     public function states(): array
     {
-        if (!isset($this->states)) {
+        if (count($this->states) === 0) {
             $this->states = $this->runFactory('states');
         }
         return $this->states;
@@ -27,7 +61,11 @@ class Reservation extends Common\Ideal\Model
     public function currentState(): Model\Venta\Reservation\State
     {
         if (!isset($this->currentState)) {
-            $this->currentState = last($this->states());
+            $states = $this->states();
+            if (count($states) === 0) {
+                throw new InvalidArgumentException('States must not be empty');
+            }
+            $this->currentState = last($states);
         }
         return $this->currentState;
     }
@@ -35,16 +73,15 @@ class Reservation extends Common\Ideal\Model
     public function addUnit(Model\Venta\Unidad $unit, float $value): self
     {
         if (($i = $this->findUnit($unit->id)) !== null) {
-            $this->units[$i]['value'] = $value;
+            $this->units[$i]->value = $value;
             return $this;
         }
-        $this->units[] = [
+        $this->units[] = (object) [
             'unit' => $unit,
             'value' => $value,
         ];
         return $this;
     }
-
     public function removeUnit(int $unit_id): self
     {
         if (($i = $this->findUnit($unit_id)) === null) {
@@ -54,30 +91,47 @@ class Reservation extends Common\Ideal\Model
         $this->units = array_values($this->units);
         return $this;
     }
-
     public function findUnit(int $unit_id): ?int
     {
-        foreach ($this->units as $idx => $unit) {
-            if ($unit['unit']->id == $unit_id) {
-                return $idx;
-            }
-        }
-        return null;
+        return array_find_key($this->units, fn($unit) => $unit->unit->id == $unit_id);
     }
-
     public function hasUnit(int $unit_id): bool
     {
         return $this->findUnit($unit_id) !== null;
     }
 
+    public function summary(): string
+    {
+        $unitSummary = array_map(function($unit) {
+            $type = $unit->unit->proyectoTipoUnidad->tipoUnidad->descripcion;
+            $cap = strtoupper(strstr($type, 0, 1));
+            return "{$cap}{$unit->unit->descripcion}";
+        }, $this->units);
+        return implode('', $unitSummary);
+    }
+
+    public function valid(): bool
+    {
+        $base = $this->base();
+        $price = $this->price();
+        return $base >= $price;
+    }
+
     protected function jsonComplement(): array
     {
         return [
-            'buyer_rut' => $this->buyer->rut,
+            'project_id' => $this->project->id,
+            'buyer' => $this->buyer,
             'date' => $this->date->format('Y-m-d'),
             'units' => $this->units,
             'promotions' => $this->promotions,
-            'broker_rut' => $this->broker?->rut,
+            'broker' => $this->broker,
+            'offer' => $this->offer(),
+            'with_commission' => $this->withCommission(),
+            'base' => $this->base(),
+            'price' => $this->price(),
+            'valid' => $this->valid(),
+            'summary' => $this->summary()
         ];
     }
 }

app/src/Model/Venta/Reservation/Detail/Type.php

@@ -0,0 +1,17 @@
+<?php
+namespace Incoviba\Model\Venta\Reservation\Detail;
+
+enum Type: int
+{
+    case Unit = 1;
+    case Promotion = 2;
+    case Broker = 3;
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'id' => $this->value,
+            'description' => $this->name
+        ];
+    }
+}

app/src/Model/Venta/Reservation/State.php

@@ -9,17 +9,14 @@ class State extends Common\Ideal\Model
 {
     public Model\Venta\Reservation $reservation;
     public DateTimeInterface $date;
-    public int $type;
+    public Model\Venta\Reservation\State\Type $type;
 
     protected function jsonComplement(): array
     {
         return [
             'reservation_id' => $this->reservation->id,
             'date' => $this->date->format('Y-m-d'),
-            'type' => [
-                'id' => $this->type,
-                'description' => State\Type::name($this->type)
-            ]
+            'type' => $this->type
         ];
     }
 }

app/src/Model/Venta/Reservation/State/Type.php

@@ -3,17 +3,20 @@ namespace Incoviba\Model\Venta\Reservation\State;
 
 enum Type: int
 {
-    case ACTIVE = 1;
     case INACTIVE = 0;
+    case ACTIVE = 1;
+    case PROMISED = 2;
     case REJECTED = -1;
 
-    public static function name(int $type): string
+    public function jsonSerialize(): array
     {
-        return match ($type) {
-            self::ACTIVE => 'active',
-            self::INACTIVE => 'inactive',
-            self::REJECTED => 'rejected',
-            default => throw new \InvalidArgumentException('Unexpected match value')
-        };
+        return [
+            'id' => $this->value,
+            'description' => $this->name
+        ];
+    }
+    public static function getTypes(): array
+    {
+        return [self::ACTIVE->value, self::INACTIVE->value, self::REJECTED->value];
     }
 }

app/src/Repository/Inmobiliaria.php

@@ -43,6 +43,11 @@ class Inmobiliaria extends Ideal\Repository
         return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data);
     }
 
+    /**
+     * @param string|array|null $sorting
+     * @return array
+     * @throws Implement\Exception\EmptyResult
+     */
     public function fetchAllActive(null|string|array $sorting = null): array
     {
         $query = $this->connection->getQueryBuilder()
@@ -58,4 +63,18 @@ class Inmobiliaria extends Ideal\Repository
         }
         return $this->fetchMany($query, [1, 8]);
     }
+
+    /**
+     * @param string $name
+     * @return Model\Inmobiliaria
+     * @throws Implement\Exception\EmptyResult
+     */
+    public function fetchByName(string $name): Model\Inmobiliaria
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('razon LIKE :name OR abreviacion LIKE :name');
+        return $this->fetchOne($query, ['name' => "%{$name}%"]);
+    }
 }

app/src/Repository/Persona/Datos.php

@@ -29,6 +29,9 @@ class Datos extends Ideal\Repository
             ->register('direccion_id', (new Implement\Repository\Mapper())
                 ->setProperty('direccion')
                 ->setFunction(function($data) {
+                    if ($data['direccion_id'] === null) {
+                        return null;
+                    }
                     return $this->direccionRepository->fetchById($data['direccion_id']);
                 })->setDefault(null))
             ->register('telefono', (new Implement\Repository\Mapper())->setFunction(function($data) {
@@ -56,7 +59,7 @@ class Datos extends Ideal\Repository
     }
     public function save(Define\Model $model): Model\Persona\Datos
     {
-        $this->saveNew([
+        $model->id = $this->saveNew([
             'persona_rut', 'direccion_id', 'telefono', 'email', 'fecha_nacimiento', 'sexo', 'estado_civil',
             'nacionalidad', 'ocupacion'
         ], [
@@ -113,4 +116,11 @@ class Datos extends Ideal\Repository
         }
         $this->connection->execute($query, $flattened);
     }
+
+    public function filterData(array $data): array
+    {
+        $fields = ['persona_rut', 'direccion_id', 'telefono', 'email', 'fecha_nacimiento', 'sexo', 'estado_civil',
+            'nacionalidad', 'ocupacion'];
+        return array_intersect_key($data, array_flip($fields));
+    }
 }

app/src/Repository/Proyecto.php

@@ -85,6 +85,11 @@ class Proyecto extends Ideal\Repository
         return $this->fetchOne($query, [$id]);
     }
 
+    /**
+     * @param string $name
+     * @return Model\Proyecto
+     * @throws Implement\Exception\EmptyResult
+     */
     public function fetchByName(string $name): Model\Proyecto
     {
         $query = $this->connection->getQueryBuilder()

app/src/Repository/Proyecto/Broker/Contract.php

@@ -93,7 +93,7 @@ class Contract extends Common\Ideal\Repository
             ->select('a.*')
             ->from("{$this->getTable()} a")
             ->joined($this->statusJoin())
-            ->where('a.broker_rut = :broker_rut AND bcs.state = :state');
+            ->where('a.broker_rut = :broker_rut AND bcs.type = :state');
         return $this->fetchMany($query, ['broker_rut' => $brokerRut, 'state' => Model\Proyecto\Broker\Contract\Type::ACTIVE]);
     }
 
@@ -108,8 +108,8 @@ class Contract extends Common\Ideal\Repository
             ->select('a.*')
             ->from("{$this->getTable()} a")
             ->joined($this->statusJoin())
-            ->where('a.proyecto_id = :proyecto_id AND bcs.state = :state');
-        return $this->fetchMany($query, ['proyecto_id' => $projectId, 'state' => Model\Proyecto\Broker\Contract\State\Type::ACTIVE->value]);
+            ->where('a.project_id = :project_id AND bcs.type = :state');
+        return $this->fetchMany($query, ['project_id' => $projectId, 'state' => Model\Proyecto\Broker\Contract\State\Type::ACTIVE->value]);
     }
 
     /**

app/src/Repository/Venta/EstadoPrecio.php

@@ -7,6 +7,8 @@ use Incoviba\Common\Define;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
 use Incoviba\Repository;
+use PDO;
+use PDOException;
 
 class EstadoPrecio extends Ideal\Repository
 {
@@ -44,11 +46,22 @@ class EstadoPrecio extends Ideal\Repository
         return $this->update($model, ['precio', 'estado', 'fecha'], $new_data);
     }
 
+    /**
+     * @param int $precio_id
+     * @return array
+     * @throws Implement\Exception\EmptyResult
+     */
     public function fetchByPrecio(int $precio_id): array
     {
         $query = "SELECT * FROM `{$this->getTable()}` WHERE `precio` = ?";
         return $this->fetchMany($query, [$precio_id]);
     }
+
+    /**
+     * @param int $precio_id
+     * @return Define\Model
+     * @throws Implement\Exception\EmptyResult
+     */
     public function fetchCurrentByPrecio(int $precio_id): Define\Model
     {
         $query = "SELECT e1.* 

app/src/Repository/Venta/Precio.php

@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Repository\Venta;
 
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use PDO;
 use PDOException;
 use Incoviba\Common\Ideal;

app/src/Repository/Venta/Promotion.php

@@ -212,7 +212,7 @@ class Promotion extends Common\Ideal\Repository
             ->joined('LEFT OUTER JOIN proyecto_tipo_unidad ptu1 ON ptu.id = unidad.pt')
             ->where('(pp.project_id = :project_id OR put.project_id = :project_id OR ptu.proyecto = :project_id OR ptu1.proyecto = :project_id) AND a.state = :state')
             ->group('a.id');
-        return $this->fetchMany($query, ['project_id' => $project_id, 'state' => Model\Venta\Promotion\State::ACTIVE]);
+        return $this->fetchMany($query, ['project_id' => $project_id, 'state' => Model\Venta\Promotion\State::ACTIVE->value]);
     }
 
     /**

app/src/Repository/Venta/Reservation.php

@@ -3,14 +3,19 @@ namespace Incoviba\Repository\Venta;
 
 use DateTimeInterface;
 use DateInterval;
+use Incoviba\Common\Define;
+use Incoviba\Exception\Model\InvalidState;
 use PDO;
 use Incoviba\Common;
 use Incoviba\Model;
 use Incoviba\Repository;
+use PDOException;
 
 class Reservation extends Common\Ideal\Repository
 {
-    public function __construct(Common\Define\Connection $connection, protected Repository\Persona $personaRepository,
+    public function __construct(Common\Define\Connection $connection,
+                                protected Repository\Proyecto $proyectoRepository,
+                                protected Repository\Persona $personaRepository,
                                 protected Repository\Proyecto\Broker $brokerRepository,
                                 protected Unidad $unitRepository, protected Promotion $promotionRepository)
     {
@@ -25,37 +30,35 @@ class Reservation extends Common\Ideal\Repository
     public function create(?array $data = null): Model\Venta\Reservation
     {
         $map = (new Common\Implement\Repository\MapperParser())
+            ->register('project_id', (new Common\Implement\Repository\Mapper())
+                ->setProperty('project')
+                ->setFunction(function($data) {
+                    return $this->proyectoRepository->fetchById($data['project_id']);
+                }))
             ->register('buyer_rut', (new Common\Implement\Repository\Mapper())
                 ->setProperty('buyer')
-                ->setFunction(function($data) use ($data) {
+                ->setFunction(function($data) {
                     return $this->personaRepository->fetchById($data['buyer_rut']);
                 }))
-            ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'))
-            ->register('broker_rut', (new Common\Implement\Repository\Mapper())
-                ->setProperty('broker')
-                ->setDefault(null)
-                ->setFunction(function($data) use ($data) {
-                    try {
-                        return $this->brokerRepository->fetchById($data['broker_rut']);
-                    } catch (Common\Implement\Exception\EmptyResult) {
-                        return null;
-                    }
-                }));
+            ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'));
         return $this->parseData(new Model\Venta\Reservation(), $data, $map);
     }
     public function save(Common\Define\Model $model): Model\Venta\Reservation
     {
-        $model->id = $this->saveNew([
-            'buyer_rut',
-            'date',
-            'broker_rut'
-        ], [
-            $model->buyer->rut,
-            $model->date->format('Y-m-d'),
-            $model->broker?->rut
-        ]);
+        if (!isset($model->id)) {
+            $model->id = $this->saveNew([
+                'project_id',
+                'buyer_rut',
+                'date'
+            ], [
+                $model->project->id,
+                $model->buyer->rut,
+                $model->date->format('Y-m-d')
+            ]);
+        }
         $this->saveUnits($model);
         $this->savePromotions($model);
+        $this->saveBroker($model);
         return $model;
     }
 
@@ -67,15 +70,22 @@ class Reservation extends Common\Ideal\Repository
      */
     public function edit(Common\Define\Model $model, array $new_data): Model\Venta\Reservation
     {
-        return $this->update($model, ['buyer_rut', 'date', 'broker_rut'], $new_data);
+        $model = $this->update($model, ['project_id', 'buyer_rut', 'date'], $new_data);
+        $this->editUnits($model, $new_data);
+        $this->editPromotions($model, $new_data);
+        $this->editBroker($model, $new_data);
+        return $model;
     }
 
     public function load(array $data_row): Model\Venta\Reservation
     {
         $model = parent::load($data_row);
 
-        $this->fetchUnits($model);
-        $this->fetchPromotions($model);
+        $this->fetchUnits($model, $data_row);
+        try {
+            $this->fetchBroker($model, $data_row);
+        } catch (Common\Implement\Exception\EmptyResult) {}
+        $this->fetchPromotions($model, $data_row);
         return $model;
     }
 
@@ -93,6 +103,86 @@ class Reservation extends Common\Ideal\Repository
             ->where('buyer_rut = :buyer_rut AND date >= :date');
         return $this->fetchOne($query, ['buyer_rut' => $buyer_rut, 'date' => $date->sub(new DateInterval('P10D'))->format('Y-m-d')]);
     }
+    public function fetchByProject(int $project_id): array
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from('reservations')
+            ->where('project_id = :project_id');
+        return $this->fetchMany($query, ['project_id' => $project_id]);
+    }
+
+    /**
+     * @param int $project_id
+     * @param int $state
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     * @throws InvalidState
+     */
+    public function fetchState(int $project_id, int $state): array
+    {
+        if (!in_array($state, Model\Venta\Reservation\State\Type::getTypes())) {
+            throw new InvalidState();
+        }
+        $sub1 = $this->connection->getQueryBuilder()
+            ->select('MAX(id) AS id, reservation_id')
+            ->from('reservation_states')
+            ->group('reservation_id');
+        $sub2 = $this->connection->getQueryBuilder()
+            ->select('er1.*')
+            ->from('reservation_states er1')
+            ->joined("INNER JOIN ({$sub1}) er0 ON er0.id = er1.id");
+
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from('reservations')
+            ->joined("INNER JOIN ({$sub2}) er ON er.reservation_id = reservations.id")
+            ->where('project_id = :project_id AND er.type = :state');
+
+        return $this->fetchMany($query, ['project_id' => $project_id,
+            'state' => $state]);
+    }
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchActive(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::ACTIVE->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select active reservations', $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchPending(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::INACTIVE->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select pending reservations', $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchRejected(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::REJECTED->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select rejected reservations', $exception);
+        }
+    }
 
     protected function saveUnits(Model\Venta\Reservation $reservation): void
     {
@@ -101,22 +191,74 @@ class Reservation extends Common\Ideal\Repository
         }
         $queryCheck = $this->connection->getQueryBuilder()
             ->select('COUNT(id) AS cnt')
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementCheck = $this->connection->prepare($queryCheck);
         $queryInsert = $this->connection->getQueryBuilder()
             ->insert()
-            ->into('reservation_data')
+            ->into('reservation_details')
             ->columns(['reservation_id', 'type', 'reference_id', 'value'])
             ->values([':reservation_id', ':type', ':reference_id', ':value']);
         $statementInsert = $this->connection->prepare($queryInsert);
         foreach ($reservation->units as $unit) {
-            $statementCheck->execute(['id' => $reservation->id, 'unit_id' => $unit['unit']->id]);
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit->unit->id
+            ]);
             $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
             if ($result['cnt'] > 0) {
                 continue;
             }
-            $statementInsert->execute(['reservation_id' => $reservation->id, 'type' => 'Unit', 'reference_id' => $unit['unit']->id, 'value' => $unit['value']]);
+            $statementInsert->execute([
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'reference_id' => $unit->unit->id,
+                'value' => $unit->value
+            ]);
+        }
+
+        $this->cleanUpUnits($reservation);
+    }
+    protected function cleanUpUnits(Model\Venta\Reservation $reservation): void
+    {
+        $this->cleanUpDetails($reservation,
+            Model\Venta\Reservation\Detail\Type::Unit->value,
+            array_map(fn($unit) => $unit->unit->id, $reservation->units));
+    }
+    protected function saveBroker(Model\Venta\Reservation &$reservation): void
+    {
+        if ($reservation->broker === null) {
+            $this->removeBroker($reservation);
+            return;
+        }
+        try {
+            $queryCheck = $this->connection->getQueryBuilder()
+                ->select('reference_id')
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            $statementCheck = $this->connection->execute($queryCheck, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result === false) {
+                throw new PDOException();
+            }
+            $new_id = $reservation->broker->rut;
+            $reservation->broker = $this->brokerRepository->fetchById($result['reference_id']);
+            $this->editBroker($reservation, ['broker_rut' => $new_id]);
+        } catch (PDOException) {
+            $queryInsert = $this->connection->getQueryBuilder()
+                ->insert()
+                ->into('reservation_details')
+                ->columns(['reservation_id', 'type', 'reference_id'])
+                ->values([':reservation_id', ':type', ':reference_id']);
+            $this->connection->execute($queryInsert, [
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value,
+                'reference_id' => $reservation->broker->rut
+            ]);
         }
     }
     protected function savePromotions(Model\Venta\Reservation $reservation): void
@@ -126,60 +268,152 @@ class Reservation extends Common\Ideal\Repository
         }
         $queryCheck = $this->connection->getQueryBuilder()
             ->select('COUNT(id) AS cnt')
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :promotion_id');
         $statementCheck = $this->connection->prepare($queryCheck);
         $queryInsert = $this->connection->getQueryBuilder()
             ->insert()
-            ->into('reservation_data')
+            ->into('reservation_details')
             ->columns(['reservation_id', 'type', 'reference_id'])
             ->values([':reservation_id', ':type', ':reference_id']);
         $statementInsert = $this->connection->prepare($queryInsert);
         foreach ($reservation->promotions as $promotion) {
-            $statementCheck->execute(['id' => $reservation->id, 'promotion_id' => $promotion->id]);
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Promotion->value,
+                'promotion_id' => $promotion->id
+            ]);
             $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
             if ($result['cnt'] > 0) {
                 continue;
             }
-            $statementInsert->execute(['reservation_id' => $reservation->id, 'type' => 'Promotion', 'reference_id' => $promotion->id]);
+            $statementInsert->execute([
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Promotion->value,
+                'reference_id' => $promotion->id
+            ]);
         }
+
+        $this->cleanUpPromotions($reservation);
     }
-    protected function editUnits(Model\Venta\Reservation $reservation, array $new_data): void
+    protected function cleanUpPromotions(Model\Venta\Reservation $reservation): void
+    {
+        $this->cleanUpDetails($reservation,
+            Model\Venta\Reservation\Detail\Type::Promotion->value,
+            array_map(fn($promotion) => $promotion->id, $reservation->promotions));
+    }
+    protected function cleanUpDetails(Model\Venta\Reservation $reservation, int $type_id, array $currentIds): void
+    {
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        $deleteParam = implode(', ', array_map(fn($id) => ":id$id", $currentIds));
+        $queryDelete = $this->connection->getQueryBuilder()
+            ->delete()
+            ->from('reservation_details')
+            ->where("reservation_id = :id AND type = :type AND reference_id NOT IN ({$deleteParam})");
+        $statementDelete = $this->connection->prepare($queryDelete);
+
+        try {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => $type_id
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] <= count($currentIds)) {
+                return;
+            }
+            $deleteIdValues = array_combine(array_map(fn($id) => "id$id", $currentIds), $currentIds);
+            $statementDelete->execute(array_merge(
+                ['id' => $reservation->id, 'type' => $type_id],
+                $deleteIdValues));
+        } catch (PDOException) {}
+    }
+
+    protected function editUnits(Model\Venta\Reservation &$reservation, array $new_data): void
     {
         $querySelect = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementSelect = $this->connection->prepare($querySelect);
         $queryUpdate = $this->connection->getQueryBuilder()
-            ->update('reservation_data')
+            ->update('reservation_details')
             ->set('value = :value')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementUpdate = $this->connection->prepare($queryUpdate);
-        foreach ($new_data as $unit_id => $value) {
-            $idx = $reservation->findUnit($unit_id);
+        $queryInsert = $this->connection->getQueryBuilder()
+            ->insert()
+            ->into('reservation_details')
+            ->columns(['reservation_id', 'type', 'reference_id', 'value'])
+            ->values([':reservation_id', ':type', ':reference_id', ':value']);
+        $statementInsert = $this->connection->prepare($queryInsert);
+        foreach ($new_data['units'] as $unit) {
+            $idx = $reservation->findUnit($unit['unit_id']);
             if ($idx === null) {
-                $reservation->addUnit($this->unitRepository->fetchById($unit_id), $value);
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+                $statementInsert->execute([
+                    'reservation_id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                    'reference_id' => $unit['unit_id'],
+                    'value' => $unit['value']
+                ]);
                 continue;
             }
-            $statementSelect->execute(['id' => $reservation->id, 'unit_id' => $unit_id]);
+            $statementSelect->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id']
+            ]);
             $result = $statementSelect->fetch(PDO::FETCH_ASSOC);
             if (!$result) {
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+                $statementInsert->execute([
+                    'reservation_id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                    'reference_id' => $unit['unit_id'],
+                    'value' => $unit['value']
+                ]);
                 continue;
             }
-            $statementUpdate->execute(['id' => $reservation->id, 'unit_id' => $unit_id, 'value' => $value]);
-            $reservation->units[$idx]['value'] = $value;
+            $statementUpdate->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id'],
+                'value' => $unit['value']
+            ]);
+            $reservation->units[$idx]['value'] = $unit['value'];
         }
     }
-    protected function editPromotions(Model\Venta\Reservation $reservation, array $new_data): void
+    protected function editBroker(Model\Venta\Reservation &$reservation, array $new_data): void
+    {
+        if (!array_key_exists('broker_rut', $new_data) or $new_data['broker_rut'] === $reservation->broker->rut) {
+            return;
+        }
+        try {
+            $query = $this->connection->getQueryBuilder()
+                ->update('reservation_details')
+                ->set('reference_id = :broker_rut')
+                ->where('reservation_id = :id AND type = :type');
+            $this->connection->execute($query, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value,
+                'broker_rut' => $new_data['broker_rut']
+            ]);
+            $reservation->broker = $this->brokerRepository->fetchById($new_data['broker_rut']);
+        } catch (PDOException) {}
+    }
+    protected function editPromotions(Model\Venta\Reservation &$reservation, array $new_data): void
     {
         $querySelect = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
+            ->from('reservation_details')
             ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
         $statementSelect = $this->connection->prepare($querySelect);
         $queryUpdate = $this->connection->getQueryBuilder()
-            ->update('reservation_data')
+            ->update('reservation_details')
             ->set('value = :value')
             ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
         $statementUpdate = $this->connection->prepare($queryUpdate);
@@ -198,13 +432,26 @@ class Reservation extends Common\Ideal\Repository
             $reservation->promotions[$idx] = $this->promotionRepository->fetchById($promotion_id);
         }
     }
-    protected function fetchUnits(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
+
+    protected function fetchUnits(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        $this->fetchSavedUnits($reservation);
+
+        if (array_key_exists('units', $new_data) and count($new_data['units']) > 0) {
+            $this->fetchUnsavedUnits($reservation, $new_data);
+        }
+        return $reservation;
+    }
+    protected function fetchSavedUnits(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit"');
-        $statement = $this->connection->execute($query, ['id' => $reservation->id]);
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type');
+        $statement = $this->connection->execute($query, [
+            'id' => $reservation->id,
+            'type' =>Model\Venta\Reservation\Detail\Type::Unit->value
+        ]);
 
         while ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
             try {
@@ -213,13 +460,79 @@ class Reservation extends Common\Ideal\Repository
         }
         return $reservation;
     }
-    protected function fetchPromotions(Model\Venta\Reservation $reservation): Model\Venta\Reservation
+    protected function fetchUnsavedUnits(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('units', $new_data) or count($new_data['units']) > 0) {
+            return $reservation;
+        }
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        foreach ($new_data['units'] as $unit) {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id']
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] > 0) {
+                continue;
+            }
+            try {
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+            } catch (Common\Implement\Exception\EmptyResult) {}
+        }
+        return $reservation;
+    }
+
+    /**
+     * @param Model\Venta\Reservation $reservation
+     * @param array $new_data
+     * @return Model\Venta\Reservation
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    protected function fetchBroker(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('broker_id', $new_data)) {
+            $query = $this->connection->getQueryBuilder()
+                ->select('reference_id')
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            try {
+                $statement =$this->connection->execute($query, [
+                    'id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+                ]);
+                $result = $statement->fetch(PDO::FETCH_ASSOC);
+                if ($result === false) {
+                    throw new Common\Implement\Exception\EmptyResult($query);
+                }
+                $reservation->broker = $this->brokerRepository->fetchById($result['reference_id']);
+            } catch (PDOException) {}
+
+            return $reservation;
+        }
+        try {
+            $reservation->broker = $this->brokerRepository->fetchById($new_data['broker_id']);
+        } catch (Common\Implement\Exception\EmptyResult) {}
+        return $reservation;
+    }
+    protected function fetchPromotions(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        $this->fetchSavedPromotions($reservation);
+        $this->fetchUnsavedPromotions($reservation, $new_data);
+        return $reservation;
+    }
+    protected function fetchSavedPromotions(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('type = "Promotion" AND reservation_id = :id');
-        $statement = $this->connection->execute($query, ['id' => $reservation->id]);
+            ->from('reservation_details')
+            ->where('type = :type AND reservation_id = :id');
+        $statement = $this->connection->execute($query,
+            ['id' => $reservation->id, 'type' => Model\Venta\Reservation\Detail\Type::Promotion->value]);
         while ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
             try {
                 $reservation->promotions []= $this->promotionRepository->fetchById($result['reference_id']);
@@ -227,4 +540,43 @@ class Reservation extends Common\Ideal\Repository
         }
         return $reservation;
     }
+    protected function fetchUnsavedPromotions(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('promotions', $new_data) or count($new_data['promotions']) > 0) {
+            return $reservation;
+        }
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('type = :type AND reservation_id = :id AND reference_id = :promotion_id');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        foreach ($new_data['promotions'] as $promotion) {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'promotion_id' => $promotion
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] > 0) {
+                continue;
+            }
+            try {
+                $reservation->promotions []= $this->promotionRepository->fetchById($promotion);
+            } catch (Common\Implement\Exception\EmptyResult) {}
+        }
+        return $reservation;
+    }
+    protected function removeBroker(Model\Venta\Reservation &$reservation): void
+    {
+        try {
+            $query = $this->connection->getQueryBuilder()
+                ->delete()
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            $this->connection->execute($query, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+            ]);
+            $reservation->broker = null;
+        } catch (PDOException) {}
+    }
 }

app/src/Repository/Venta/Reservation/State.php

@@ -7,7 +7,8 @@ use Incoviba\Repository;
 
 class State extends Common\Ideal\Repository
 {
-    public function __construct(Common\Define\Connection $connection, protected Repository\Venta\Reservation $reservationRepository)
+    public function __construct(Common\Define\Connection $connection,
+                                protected Repository\Venta\Reservation $reservationRepository)
     {
         parent::__construct($connection);
     }
@@ -19,12 +20,16 @@ class State extends Common\Ideal\Repository
 
     public function create(?array $data = null): Model\Venta\Reservation\State
     {
-        $map = (new Common\Implement\Repository\MapperParser(['type']))
+        $map = (new Common\Implement\Repository\MapperParser())
             ->register('reservation_id', (new Common\Implement\Repository\Mapper())
                 ->setProperty('reservation')
-                ->setFunction(function($data) use ($data) {
+                ->setFunction(function($data) {
                     return $this->reservationRepository->fetchById($data['reservation_id']);
                 }))
+            ->register('type', (new Common\Implement\Repository\Mapper())
+                ->setFunction(function($data) {
+                    return Model\Venta\Reservation\State\Type::from($data['type']);
+                }))
             ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'));
         return $this->parseData(new Model\Venta\Reservation\State(), $data, $map);
     }
@@ -32,7 +37,7 @@ class State extends Common\Ideal\Repository
     {
         $model->id = $this->saveNew(
             ['reservation_id', 'date', 'type'],
-            [$model->reservation->id, $model->date->format('Y-m-d'), $model->type]
+            [$model->reservation->id, $model->date->format('Y-m-d'), $model->type->value]
         );
         return $model;
     }

app/src/Repository/Venta/TipoEstadoPrecio.php

@@ -4,6 +4,7 @@ namespace Incoviba\Repository\Venta;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Define;
 use Incoviba\Common\Implement;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
 
 class TipoEstadoPrecio extends Ideal\Repository
@@ -31,4 +32,18 @@ class TipoEstadoPrecio extends Ideal\Repository
     {
         return $this->update($model, ['descripcion'], $new_data);
     }
+
+    /**
+     * @param string $descripcion
+     * @return Model\Venta\TipoEstadoPrecio
+     * @throws EmptyResult
+     */
+    public function fetchByDescripcion(string $descripcion): Model\Venta\TipoEstadoPrecio
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('descripcion = ?');
+        return $this->fetchOne($query, [$descripcion]);
+    }
 }

app/src/Service/Direccion.php

@@ -0,0 +1,49 @@
+<?php
+namespace Incoviba\Service;
+
+use PDOException;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Model;
+use Incoviba\Repository;
+
+class Direccion extends Ideal\Service
+{
+    public function __construct(LoggerInterface $logger, protected Repository\Direccion $direccionRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    /**
+     * @param array $data
+     * @return Model\Direccion
+     * @throws ServiceAction\Create
+     */
+    public function add(array $data): Model\Direccion
+    {
+        $dataMap = [
+            'street' => 'calle',
+            'number' => 'numero',
+            'comuna_id' => 'comuna',
+        ];
+        foreach ($data as $key => $value) {
+            if (array_key_exists($key, $dataMap)) {
+                $data[$dataMap[$key]] = $value;
+                unset($data[$key]);
+            }
+        }
+        try {
+            return $this->direccionRepository->fetchByCalleAndNumeroAndExtraAndComuna($data['calle'], $data['numero'], $data['extra'], $data['comuna']);
+        } catch (Implement\Exception\EmptyResult) {
+            $filteredData = $this->direccionRepository->filterData($data);
+            $direccion = $this->direccionRepository->create($filteredData);
+            try {
+                return $this->direccionRepository->save($direccion);
+            } catch (PDOException $exception) {
+                throw new ServiceAction\Create(__CLASS__, $exception);
+            }
+        }
+    }
+}

app/src/Service/FileUpload.php

@@ -0,0 +1,59 @@
+<?php
+namespace Incoviba\Service;
+
+use InvalidArgumentException;
+use Psr\Http\Message\UploadedFileInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Service\FileUpload\FileUploadInterface;
+
+class FileUpload extends Ideal\Service implements FileUploadInterface
+{
+    protected array $uploads = [];
+    public function register(FileUploadInterface $fileUpload, string $filetype = 'default'): self
+    {
+        $this->uploads [$filetype]= $fileUpload;
+        return $this;
+    }
+    /**
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getData(UploadedFileInterface $uploadedFile): array
+    {
+        try {
+            $type = $this->getFileType($uploadedFile);
+        } catch (InvalidArgumentException $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+
+        $uploader = $this->getUploader($type);
+        return $uploader->getData($uploadedFile);
+    }
+
+    /**
+     * @param UploadedFileInterface $uploadedFile
+     * @return string|null
+     */
+    protected function getFileType(UploadedFileInterface $uploadedFile): ?string
+    {
+        $fileType = $uploadedFile->getClientMediaType();
+        $typesMap = [
+            'text/csv' => 'csv',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
+            'application/vnd.ms-excel' => 'xls',
+        ];
+        if (!array_key_exists($fileType, $typesMap)) {
+            throw new InvalidArgumentException("File type {$fileType} not supported.");
+        }
+        return $typesMap[$fileType];
+    }
+    protected function getUploader(string $type): FileUploadInterface
+    {
+        if (!array_key_exists($type, $this->uploads)) {
+            return $this->uploads['default'];
+        }
+        return $this->uploads[$type];
+    }
+}

app/src/Service/FileUpload/ExcelBase.php

@@ -0,0 +1,147 @@
+<?php
+namespace Incoviba\Service\FileUpload;
+
+use InvalidArgumentException;
+use OutOfBoundsException;
+use Psr\Http\Message\UploadedFileInterface;
+use PhpOffice\PhpSpreadsheet;
+use Incoviba\Common\Ideal;
+use Incoviba\Exception\ServiceAction\Read;
+
+class ExcelBase extends Ideal\Service implements FileUploadInterface
+{
+    /**
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     * @throws Read
+     */
+    public function getData(UploadedFileInterface $uploadedFile): array
+    {
+        $tempFilename = $this->createTempFile($uploadedFile);
+
+        $reader = PhpSpreadsheet\IOFactory::createReaderForFile($tempFilename);
+        $reader->setReadDataOnly(true);
+        $workbook = $reader->load($tempFilename);
+
+        try {
+            $sheet = $this->findSheet($workbook);
+        } catch (OutOfBoundsException $exception) {
+            throw new Read(__CLASS__, $exception);
+        }
+        $titles = $this->extractTitles($sheet);
+        $data = $this->extractData($sheet, $titles);
+
+        unlink($tempFilename);
+
+        return $data;
+    }
+
+    /**
+     * @param PhpSpreadsheet\Spreadsheet $workbook
+     * @return PhpSpreadsheet\Worksheet\Worksheet
+     * @throws OutOfBoundsException
+     */
+    protected function findSheet(PhpSpreadsheet\Spreadsheet $workbook): PhpSpreadsheet\Worksheet\Worksheet
+    {
+        $sheet = $workbook->getActiveSheet();
+        if ($this->findTable($sheet)) {
+            return $sheet;
+        }
+        $sheets = $workbook->getAllSheets();
+        foreach ($sheets as $sheet) {
+            if ($this->findTable($sheet)) {
+                return $sheet;
+            }
+        }
+        throw new OutOfBoundsException('No table found in the workbook.');
+    }
+    protected function findTable(PhpSpreadsheet\Worksheet\Worksheet $sheet): bool
+    {
+        $rowIterator = $sheet->getRowIterator();
+        foreach ($rowIterator as $row) {
+            if ($row->isEmpty()) {
+                continue;
+            }
+
+            $cellIterator = $row->getCellIterator();
+            $cellIterator->setIterateOnlyExistingCells(true);
+            if ($cellIterator->valid()) {
+                return true;
+            }
+            foreach ($cellIterator as $cell) {
+                if ($cell->getCalculatedValue() !== '') {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    protected function createTempFile(UploadedFileInterface $uploadedFile): string
+    {
+        $filename = $uploadedFile->getClientFilename();
+        $extension = pathinfo($filename, PATHINFO_EXTENSION);
+        $tempFilename = tempnam(sys_get_temp_dir(), $extension);
+        $uploadedFile->moveTo($tempFilename);
+
+        return $tempFilename;
+    }
+    protected function extractTitles(PhpSpreadsheet\Worksheet\Worksheet $sheet): array
+    {
+        $titles = [];
+        $iterator = $sheet->getRowIterator();
+        foreach ($iterator as $row) {
+            if ($row->isEmpty()) {
+                continue;
+            }
+            $titles = $this->getRowData($row);
+            break;
+        }
+        return $titles;
+    }
+    protected function extractData(PhpSpreadsheet\Worksheet\Worksheet $sheet, array $titles): array
+    {
+        $data = [];
+        $rowIterator = $sheet->getRowIterator();
+        foreach ($rowIterator as $row) {
+            if ($row->isEmpty()) {
+                continue;
+            }
+            $cellIterator = $row->getCellIterator();
+            $cellIterator->setIterateOnlyExistingCells(true);
+            if ($cellIterator->current() === $titles[0]) {
+                continue;
+            }
+            try {
+                $rowData = $this->getRowData($row, $titles);
+            } catch (InvalidArgumentException $exception) {
+                if ($exception->getCode() === 1000) {
+                    continue;
+                }
+                throw $exception;
+            }
+            $data []= array_combine($titles, $rowData);
+        }
+        return $data;
+    }
+    protected function getRowData(PhpSpreadsheet\Worksheet\Row $row, ?array $titles = null): array
+    {
+        $data = [];
+        $cellIterator = $row->getCellIterator();
+        $cellIterator->setIterateOnlyExistingCells(true);
+        foreach ($cellIterator as $cell) {
+            if ($cell->getCalculatedValue() === null) {
+                continue;
+            }
+            $value = $cell->getCalculatedValue();
+            if ($value === null) {
+                continue;
+            }
+            $value = mb_strtolower($value);
+            if ($titles !== null and in_array($value, $titles)) {
+                throw new InvalidArgumentException('Row matches title', 1000);
+            }
+            $data []= $value;
+        }
+        return $data;
+    }
+}

app/src/Service/FileUpload/FileUploadInterface.php

@@ -0,0 +1,9 @@
+<?php
+namespace Incoviba\Service\FileUpload;
+
+use Psr\Http\Message\UploadedFileInterface;
+
+interface FileUploadInterface
+{
+    public function getData(UploadedFileInterface $uploadedFile): array;
+}

app/src/Service/Job.php

@@ -5,60 +5,43 @@ use DateInvalidTimeZoneException;
 use DateMalformedStringException;
 use DateTimeImmutable;
 use DateTimeZone;
-use InvalidArgumentException;
-use OutOfRangeException;
 use Psr\Log\LoggerInterface;
-use Predis\Connection\ConnectionException;
 use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement\Exception\EmptyRedis;
-use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Exception\MQTT as MQTTException;
 use Incoviba\Exception\ServiceAction\{Create, Delete, Read, Update};
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository;
 
 class Job extends Ideal\Service
 {
-    public function __construct(LoggerInterface $logger, protected Redis $redisService,
+    public function __construct(LoggerInterface $logger, protected MQTT $mqttService,
                                 protected Repository\Job $jobRepository)
     {
         parent::__construct($logger);
     }
-    protected string $redisKey = 'jobs';
 
-    public function getPending(null|string|array $orderBy = null): array
+    public function isPending(): bool
     {
         try {
-            $jobs = $this->redisService->get($this->redisKey);
-            if ($jobs === null) {
-                return [];
-            }
-            $jobs = json_decode($jobs, true);
-            if ($orderBy !== null) {
-                uksort($jobs, function($a, $b) use ($orderBy) {
-                    return $a[$orderBy] <=> $b[$orderBy];
-                });
-            }
-            return array_map([$this, 'load'], $jobs);
-        } catch (ConnectionException | EmptyRedis) {
-            return [];
+            return $this->mqttService->exists();
+        } catch (MQTTException $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+            return false;
         }
     }
 
     /**
-     * @param int $id
      * @return Model\Job
      * @throws Read
      */
-    public function getPendingById(int $id): Model\Job
+    public function get(): Model\Job
     {
-        $jobs = $this->getJobs();
         try {
-            $idx = $this->findJob($jobs, $id);
-        } catch (EmptyResult $exception) {
-            $exception = new OutOfRangeException('Job not found', count($jobs), $exception);
+            return $this->load(json_decode($this->mqttService->get(), true));
+        } catch (MQTTException $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
             throw new Read(__CLASS__, $exception);
         }
-        return $this->load($jobs[$idx]);
     }
 
     /**
@@ -71,6 +54,7 @@ class Job extends Ideal\Service
         try {
             $now = (new DateTimeImmutable('now', new DateTimeZone($_ENV['TZ'] ?? 'America/Santiago')));
         } catch (DateMalformedStringException | DateInvalidTimeZoneException $exception) {
+            $this->logger->warning($exception->getMessage(), ['exception' => $exception]);
             $now = new DateTimeImmutable();
         }
         $data = [
@@ -81,17 +65,9 @@ class Job extends Ideal\Service
             'updated_at' => null,
             'retries' => 0
         ];
-        $jobs = [];
         try {
-            $jobs = $this->redisService->get($this->redisKey);
-            if ($jobs !== null) {
-                $jobs = json_decode($jobs, true);
-            }
-        } catch (EmptyRedis) {}
-        $jobs []= $data;
-        try {
-            $this->redisService->set($this->redisKey, json_encode($jobs), -1);
-        } catch (ConnectionException $exception) {
+            $this->mqttService->set(json_encode($data));
+        } catch (MQTTException $exception) {
             throw new Create(__CLASS__, $exception);
         }
         return $this->load($data);
@@ -99,50 +75,35 @@ class Job extends Ideal\Service
 
     /**
      * @param Model\Job $job
-     * @return Model\Job
+     * @return void
      * @throws Update
-     * @throws Read
      */
-    public function update(Model\Job $job): Model\Job
+    public function update(Model\Job $job): void
     {
         try {
             $now = (new DateTimeImmutable('now', new DateTimeZone($_ENV['TZ'] ?? 'America/Santiago')));
         } catch (DateMalformedStringException | DateInvalidTimeZoneException) {
             $now = new DateTimeImmutable();
         }
-        $jobs = $this->getJobs();
+        $data = json_decode(json_encode($job), true);
+        $data['updated_at'] = $now->format('Y-m-d H:i:s');
+
         try {
-            $idx = $this->findJob($jobs, $job->id);
-        } catch (EmptyResult $exception) {
-            throw new Read(__CLASS__, $exception);
-        }
-        $jobs[$idx]['updated_at'] = $now->format('Y-m-d H:i:s');
-        $jobs[$idx]['retries'] = $job->retries;
-        try {
-            $this->redisService->set($this->redisKey, json_encode($jobs), -1);
-        } catch (ConnectionException $exception) {
+            $this->mqttService->update(json_encode($data));
+        } catch (MQTTException $exception) {
             throw new Update(__CLASS__, $exception);
         }
-        return $this->load($jobs[$idx]);
     }
 
     /**
      * @param Model\Job $job
-     * @throws Read
      * @throws Delete
      */
     public function remove(Model\Job $job): void
     {
-        $jobs = $this->getJobs();
         try {
-            $idx = $this->findJob($jobs, $job->id);
-        } catch (EmptyResult $exception) {
-            throw new Read(__CLASS__, $exception);
-        }
-        unset($jobs[$idx]);
-        try {
-            $this->redisService->set($this->redisKey, json_encode(array_values($jobs)), -1);
-        } catch (ConnectionException $exception) {
+            $this->mqttService->remove();
+        } catch (MQTTException $exception) {
             throw new Delete(__CLASS__, $exception);
         }
     }
@@ -150,59 +111,18 @@ class Job extends Ideal\Service
     /**
      * @param Model\Job $job
      * @return bool
-     * @throws Read | Create
      */
     public function execute(Model\Job $job): bool
     {
-        $jobs = $this->getJobs();
         try {
-            $idx = $this->findJob($jobs, $job->id);
-        } catch (EmptyResult $exception) {
-            $exception = new OutOfRangeException('Job not found', count($jobs), $exception);
-            throw new Read(__CLASS__, $exception);
+            $this->mqttService->remove();
+            return true;
+        } catch (MQTTException $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+            return false;
         }
-        unset($jobs[$idx]);
-        try {
-            $this->redisService->set($this->redisKey, json_encode(array_values($jobs)), -1);
-        } catch (ConnectionException $exception) {
-            throw new Create(__CLASS__, $exception);
-        }
-        return true;
     }
 
-    /**
-     * @return array
-     * @throws Read
-     */
-    protected function getJobs(): array
-    {
-        try {
-            $jobs = $this->redisService->get($this->redisKey);
-        } catch (EmptyRedis $exception) {
-            throw new Read(__CLASS__, $exception);
-        }
-        if ($jobs === null) {
-            $exception = new InvalidArgumentException("Redis Key {$this->redisKey} not found");
-            throw new Read(__CLASS__, $exception);
-        }
-        return json_decode($jobs, true);
-    }
-    /**
-     * @param array $jobs
-     * @param int $id
-     * @return int
-     * @throws EmptyResult
-     */
-    protected function findJob(array $jobs, int $id): int
-    {
-        $idx = array_find_key($jobs, function($job) use ($id) {
-            return (int) $job['id'] === $id;
-        });
-        if ($idx === null) {
-            throw new EmptyResult("SELECT * FROM jobs WHERE id = ?");
-        }
-        return $idx;
-    }
     protected function load(array $data, ?int $id = null): Model\Job
     {
         $job = new Model\Job();

app/src/Service/MQTT.php

@@ -0,0 +1,102 @@
+<?php
+namespace Incoviba\Service;
+
+use Incoviba\Exception\MQTT as MQTTException;
+use Incoviba\Service\MQTT\MQTTInterface;
+
+class MQTT implements MQTTInterface
+{
+    protected array $clients = [];
+    public function register(string $name, MQTTInterface $client): self
+    {
+        $this->clients[$name] = $client;
+        return $this;
+    }
+    public function clientExists(string $name): bool
+    {
+        return isset($this->clients[$name]);
+    }
+
+    /**
+     * @param string|null $name
+     * @return MQTTInterface
+     * @throws MQTTException/MissingClient
+     */
+    public function getClient(?string $name = null): MQTTInterface
+    {
+        if ($name === null) {
+            $name = array_keys($this->clients)[0];
+        }
+        if (!$this->clientExists($name)) {
+            throw new MQTTException\MissingClient($name);
+        }
+        return $this->clients[$name];
+    }
+
+    /**
+     * @param string|null $host
+     * @return bool
+     * @throws MQTTException/MissingClient
+     * @throws MQTTException/MissingJob
+     */
+    public function exists(?string $host = null): bool
+    {
+        $client = $this->getClient($host);
+        return $client->exists();
+    }
+
+    /**
+     * @param string|null $host
+     * @return string
+     * @throws MQTTException/MissingClient
+     * @throws MQTTException/MissingJob
+     */
+    public function get(?string $host = null): string
+    {
+        $client = $this->getClient($host);
+        return $client->get();
+    }
+
+    /**
+     * @param string $value
+     * @param int $delay
+     * @param string|null $host
+     * @return $this
+     * @throws MQTTException/MissingClient
+     * @throws MQTTException/SetJob
+     */
+    public function set(string $value, int $delay = 0, ?string $host = null): self
+    {
+        $client = $this->getClient($host);
+        $client->set($value, $delay);
+        return $this;
+    }
+
+    /**
+     * @param int|null $jobId
+     * @param string|null $host
+     * @return $this
+     * @throws MQTTException/MissingJob
+     * @throws MQTTException/RemoveJob
+     */
+    public function remove(?int $jobId = null, ?string $host = null): self
+    {
+        $this->getClient($host)->remove($jobId);
+        return $this;
+    }
+
+    /**
+     * @param string $newPayload
+     * @param int|null $jobId
+     * @param string|null $host
+     * @return $this
+     * @throws MQTTException/MissingJob
+     * @throws MQTTException/RemoveJob
+     * @throws MQTTException/SetJob
+     */
+    public function update(string $newPayload, ?int $jobId = null, ?string $host = null): self
+    {
+        $this->getClient($host)->update($newPayload, $jobId);
+        return $this;
+    }
+}

app/src/Service/MQTT/Beanstalkd.php

@@ -0,0 +1,111 @@
+<?php
+namespace Incoviba\Service\MQTT;
+
+use Exception;
+use Incoviba\Exception\MQTT\MissingJob;
+use Incoviba\Exception\MQTT\RemoveJob;
+use Incoviba\Exception\MQTT\SetJob;
+use Psr\Log\LoggerInterface;
+use xobotyi\beansclient;
+use xobotyi\beansclient\Exception\ClientException;
+use xobotyi\beansclient\Exception\CommandException;
+use xobotyi\beansclient\Exception\JobException;
+
+class Beanstalkd implements MQTTInterface
+{
+    /**
+     * @throws JobException
+     * @throws ClientException
+     * @throws CommandException
+     */
+    public function __construct(protected LoggerInterface $logger, protected beansclient\BeansClient $client,
+                                protected string          $tube = 'default', protected int $ttr = beansclient\BeansClient::DEFAULT_TTR,
+                                protected int             $priority = 1)
+    {
+        $this->client->watchTube($this->tube);
+    }
+
+    public function exists(): bool
+    {
+        try {
+            $stats = $this->client->statsTube($this->tube);
+            return $stats['current-jobs-ready'] > 0;
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+            return false;
+        }
+    }
+
+    protected ?beansclient\Job $currentJob = null;
+    public function get(): string
+    {
+        if (!$this->exists()) {
+            throw new MissingJob();
+        }
+        try {
+            $job = $this->client->watchTube($this->tube)->reserve();
+            $this->currentJob = $job;
+            return $job->payload;
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+            throw new MissingJob($exception);
+        }
+    }
+
+    /**
+     * @param string $value
+     * @param int $delay
+     * @return $this
+     * @throws SetJob
+     */
+    public function set(string $value, int $delay = 0): self
+    {
+        try {
+            $this->client->useTube($this->tube)->put($value, $this->priority, $delay, $this->ttr ?? 0);
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage(), ['payload' => $value, 'delay' => $delay, 'exception' => $exception]);
+            throw new SetJob($value, $exception);
+        }
+        return $this;
+    }
+
+    /**
+     * @param string $newPayload
+     * @param int|null $jobId
+     * @return self
+     * @throws RemoveJob
+     * @throws SetJob
+     */
+    public function update(string $newPayload, ?int $jobId = null): self
+    {
+        if ($jobId === null) {
+            $jobId = $this->currentJob->id;
+        }
+        return $this->remove($jobId)
+            ->set($newPayload);
+    }
+
+    /**
+     * @param int|null $jobId
+     * @return $this
+     * @throws RemoveJob
+     */
+    public function remove(?int $jobId = null): self
+    {
+        if ($jobId === null) {
+            $jobId = $this->currentJob->id;
+        }
+        try {
+            if (!$this->client->useTube($this->tube)->delete($jobId)) {
+                throw new JobException("Failed to delete job {$jobId}");
+            }
+            if ($this->currentJob !== null && $this->currentJob->id === $jobId) {
+                $this->currentJob = null;
+            }
+        } catch (Exception $exception) {
+            $this->logger->error($exception->getMessage(), ['jobId' => $jobId, 'exception' => $exception]);
+            throw new RemoveJob($jobId, $exception);
+        }
+        return $this;
+    }
+}

app/src/Service/MQTT/MQTTInterface.php

@@ -0,0 +1,25 @@
+<?php
+namespace Incoviba\Service\MQTT;
+
+use Incoviba\Exception\MQTT\MissingJob;
+
+interface MQTTInterface {
+    /**
+     * @return bool
+     */
+    public function exists(): bool;
+
+    /**
+     * @return string
+     * @throws MissingJob
+     */
+    public function get(): string;
+
+    /**
+     * @param string $value
+     * @param int $delay
+     * @return self
+     */
+    public function set(string $value, int $delay = 0): self;
+    public function remove(?int $jobId = null): self;
+}

app/src/Service/MQTT/Pheanstalk.php

@@ -0,0 +1,59 @@
+<?php
+namespace Incoviba\Service\MQTT;
+
+use Incoviba\Common\Ideal\Service;
+use Psr\Log\LoggerInterface;
+use Pheanstalk as PBA;
+
+class Pheanstalk extends Service implements MQTTInterface
+{
+    const string DEFAULT_TUBE = 'default';
+    const int DEFAULT_TTR = 60;
+    const int DEFAULT_PRIORITY = 1_024;
+
+    public function __construct(LoggerInterface $logger, protected PBA\Pheanstalk $client, string $tubeName = self::DEFAULT_TUBE)
+    {
+        parent::__construct($logger);
+        $this->tube = new PBA\Values\TubeName($tubeName);
+    }
+
+    protected PBA\Values\TubeName $tube;
+
+    public function set(string $value, int $delay = 0): self
+    {
+        $this->client->useTube($this->tube);
+        $this->client->put($value, self::DEFAULT_PRIORITY, $delay, self::DEFAULT_TTR);
+        return $this;
+    }
+    public function exists(): bool
+    {
+        $stats = $this->client->statsTube($this->tube);
+        return $stats->currentJobsReady > 0;
+    }
+    protected int $currentJobId;
+    public function get(): string
+    {
+        $this->client->useTube($this->tube);
+        $job = $this->client->reserve();
+        $this->currentJobId = $job->getId();
+        return $job->getData();
+    }
+    public function update(string $newPayload, ?int $jobId = null): self
+    {
+        if ($jobId === null) {
+            $jobId = $this->currentJobId;
+        }
+        $this->remove($jobId);
+        $this->set($newPayload);
+        return $this;
+    }
+    public function remove(?int $jobId = null): self
+    {
+        if ($jobId === null) {
+            $jobId = $this->currentJobId;
+        }
+        $this->client->useTube($this->tube);
+        $this->client->delete(new PBA\Values\JobId($jobId));
+        return $this;
+    }
+}

app/src/Service/Persona.php

@@ -15,7 +15,8 @@ class Persona extends Ideal\Service
     public function __construct(LoggerInterface $logger,
                                 protected Repository\Persona $personaRepository,
                                 protected Repository\Persona\Datos $datosPersonaRepository,
-                                protected Repository\Venta\Propietario $propietarioRepository)
+                                protected Repository\Venta\Propietario $propietarioRepository,
+                                protected Direccion $direccionService)
     {
         parent::__construct($logger);
     }
@@ -35,7 +36,7 @@ class Persona extends Ideal\Service
     /**
      * @param int $rut
      * @return Model\Persona
-     * @throws Read|Create
+     * @throws Read
      */
     public function getById(int $rut): Model\Persona
     {
@@ -44,7 +45,11 @@ class Persona extends Ideal\Service
         } catch (Implement\Exception\EmptyResult) {
             try {
                 $this->propietarioRepository->fetchById($rut);
-                return $this->add(compact('rut'));
+                try {
+                    return $this->add(compact('rut'));
+                } catch (Create $exception) {
+                    throw new Read(__CLASS__, $exception);
+                }
             } catch (Implement\Exception\EmptyResult $exception) {
                 throw new Read(__CLASS__, $exception);
             }
@@ -63,44 +68,34 @@ class Persona extends Ideal\Service
         } catch (Implement\Exception\EmptyResult) {
             try {
                 $propietario = $this->propietarioRepository->fetchById($data['rut']);
-            } catch (Implement\Exception\EmptyResult $exception) {
-                throw new Create(__CLASS__, $exception);
-            }
-            $data['rut'] = $propietario->rut;
-            $data['digito'] = $propietario->dv;
-            $data['nombres'] = $propietario->nombres;
-            $data['apellido_paterno'] = $propietario->apellidos['paterno'];
-            $data['apellido_materno'] = $propietario->apellidos['materno'] ?? '';
-            $persona = $this->personaRepository->create($data);
-            try {
-                $persona = $this->personaRepository->save($persona);
-            } catch (PDOException $exception) {
-                throw new Create(__CLASS__, $exception);
-            }
-        }
-        if (isset($data['direccion_id']) or isset($data['email']) or isset($data['telefono'])) {
-            $datosData = ['persona_rut' => $persona->rut];
-            if (isset($data['direccion_id'])) {
-                $datosData['direccion_id'] = $data['direccion_id'];
-            }
-            if (isset($data['email'])) {
-                $datosData['email'] = $data['email'];
-            }
-            if (isset($data['telefono'])) {
-                $datosData['telefono'] = $data['telefono'];
-            }
-            try {
-                $datos = $this->datosPersonaRepository->fetchByPersona($persona->rut);
-                $this->datosPersonaRepository->edit($datos, $data);
+                $persona = $this->addFromPropietario($propietario);
             } catch (Implement\Exception\EmptyResult) {
-                $datos = $this->datosPersonaRepository->create($datosData);
+                $dataMap = [
+                    'digit' => 'digito',
+                    'name' => 'nombres',
+                    'names' => 'nombres',
+                    'last_name' => 'apellido_paterno',
+                    'last_name2' => 'apellido_materno',
+                ];
+                foreach ($data as $key => $value) {
+                    if (array_key_exists($key, $dataMap)) {
+                        $data[$dataMap[$key]] = $value;
+                        unset($data[$key]);
+                    }
+                }
+
+                $filteredData = $this->personaRepository->filterData($data);
                 try {
-                    $this->datosPersonaRepository->save($datos);
+                    $persona = $this->personaRepository->create($filteredData);
+                    $persona = $this->personaRepository->save($persona);
                 } catch (PDOException $exception) {
                     throw new Create(__CLASS__, $exception);
                 }
             }
+
         }
+        $this->addDatos($persona, $data);
+
         return $this->process($persona);
     }
 
@@ -176,4 +171,113 @@ class Persona extends Ideal\Service
             ->setArgs(['persona_rut' => $persona->rut]));
         return $persona;
     }
+    /**
+     * @param Model\Venta\Propietario $propietario
+     * @return Model\Persona
+     * @throws Create
+     */
+    protected function addFromPropietario(Model\Venta\Propietario $propietario): Model\Persona
+    {
+        $data = [
+            'rut' => $propietario->rut,
+            'digito' => $propietario->dv,
+            'nombres' => $propietario->nombres,
+            'apellido_paterno' => $propietario->apellidos['paterno'],
+            'apellido_materno' => $propietario->apellidos['materno'] ?? '',
+        ];
+        try {
+            $persona = $this->personaRepository->create($data);
+            $persona = $this->personaRepository->save($persona);
+        } catch (PDOException $exception) {
+            throw new Create(__CLASS__, $exception);
+        }
+
+        $datosData = [];
+        if ($propietario->datos->direccion) {
+            $datosData['direccion_id'] = $propietario->datos?->direccion->id;
+        }
+        if ($propietario->datos->email) {
+            $datosData['email'] = $propietario->datos->email;
+        }
+        if ($propietario->datos->telefono) {
+            $datosData['telefono'] = $propietario->datos->telefono;
+        }
+        if ($propietario->datos->estado_civil) {
+            $datosData['estado_civil'] = $propietario->datos->estado_civil;
+        }
+        if ($propietario->datos->fecha_nacimiento) {
+            $datosData['fecha_nacimiento'] = $propietario->datos->fecha_nacimiento;
+        }
+        if ($propietario->datos->profesion) {
+            $datosData['ocupacion'] = $propietario->datos->profesion;
+        }
+        if ($propietario->datos->sexo) {
+            $datosData['sexo'] = $propietario->datos->sexo;
+        }
+
+        $this->addDatos($persona, $datosData);
+        return $persona;
+    }
+
+    /**
+     * @param Model\Persona $persona
+     * @param array $data
+     * @return Model\Persona
+     * @throws Create
+     */
+    protected function addDatos(Model\Persona $persona, array $data): Model\Persona
+    {
+        $addressData = [];
+        foreach ($data as $key => $value) {
+            if (!str_starts_with($key, 'address_') and !str_starts_with($key, 'direccion_')) {
+                continue;
+            }
+            if (str_starts_with($key, 'direccion_')) {
+                $newKey = substr($key, strlen('direccion_'));
+            } else {
+                $newKey = substr($key, strlen('address_'));
+            }
+            $addressData[$newKey] = $value;
+        }
+        if (!empty($addressData)) {
+            $address = $this->direccionService->add($addressData);
+            foreach ($data as $key => $value) {
+                if (str_starts_with($key, 'address_') or str_starts_with($key, 'direccion_')) {
+                    unset($data[$key]);
+                }
+            }
+            $data['direccion_id'] = $address->id;
+        }
+
+        $dataMap = [
+            'phone' => 'telefono',
+            'profession' => 'ocupacion',
+            'profesion' => 'ocupacion',
+            'sex' => 'sexo',
+            'marital_status' => 'estado_civil',
+            'birth_date' => 'fecha_nacimiento',
+            'birthdate' => 'fecha_nacimiento',
+        ];
+        foreach ($data as $key => $value) {
+            if (array_key_exists($key, $dataMap)) {
+                $data[$dataMap[$key]] = $value;
+                unset($data[$key]);
+            }
+        }
+        try {
+            $datos = $this->datosPersonaRepository->fetchByPersona($persona->rut);
+            $this->datosPersonaRepository->edit($datos, $data);
+        } catch (Implement\Exception\EmptyResult $exception) {
+            $datosData = ['persona_rut' => $persona->rut, ...$data];
+            $datosData = $this->datosPersonaRepository->filterData($datosData);
+            $datos = $this->datosPersonaRepository->create($datosData);
+            try {
+                $this->datosPersonaRepository->save($datos);
+            } catch (PDOException $exception) {
+                throw new Create(__CLASS__, $exception);
+            }
+        }
+
+        return $persona;
+    }
 }

app/src/Service/Queue.php

@@ -7,6 +7,7 @@ use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Exception\ServiceAction\{Create, Delete, Read, Update};
 use Incoviba\Service;
+use Incoviba\Model;
 
 class Queue extends Ideal\Service
 {
@@ -29,7 +30,7 @@ class Queue extends Ideal\Service
         try {
             $this->jobService->add($configuration);
             return true;
-        } catch (Read $exception) {
+        } catch (Create $exception) {
             $final = new Exception("Could not enqueue job", 0, $exception);
             $this->logger->warning($final);
             return false;
@@ -40,22 +41,8 @@ class Queue extends Ideal\Service
         return $this->enqueue($configuration);
     }
 
-    /**
-     * @return array
-     */
-    public function getPendingJobs(): array
+    public function runJob(Model\Job $job, ?RequestInterface $request = null): bool
     {
-        return $this->jobService->getPending();
-    }
-    public function runJob(int $job_id, ?RequestInterface $request = null): bool
-    {
-        try {
-            $job = $this->jobService->getPendingById($job_id);
-        } catch (Read $exception) {
-            $this->logger->debug($exception);
-            return false;
-        }
-
         $type = 'default';
         if (isset($job->configuration['type'])) {
             $type = strtolower($job->configuration['type']);
@@ -71,50 +58,57 @@ class Queue extends Ideal\Service
 
         try {
             if (!$worker->execute($job)) {
-                $this->logger->debug("Could not execute job {$job_id}");
+                $this->logger->debug("Could not execute job {$job->id}");
+                $job->retries++;
+                $this->jobService->update($job);
                 return false;
             }
             if (!$this->jobService->execute($job)) {
-                $this->logger->debug("Could not remove job {$job_id}");
+                $this->logger->debug("Could not remove job {$job->id}");
                 return false;
             }
         } catch (Exception $exception) {
-            $final = new Exception("Could not run job", 0, $exception);
-            $this->logger->warning($final);
+            $this->logger->warning("Could not run job {$job->id}", ['exception' => $exception]);
+            $job->retries++;
+            try {
+                $this->jobService->update($job);
+            } catch (Update $exception) {
+                $this->logger->error($exception->getMessage(), ['job' => $job, 'exception' => $exception]);
+            }
             return false;
         }
         return true;
     }
     public function run(?RequestInterface $request = null): bool
     {
-        $jobs = $this->jobService->getPending();
-        if (count($jobs) === 0) {
-            $this->logger->debug("No pending jobs");
+        if (!$this->jobService->isPending()) {
             return true;
         }
-
-        $errors = [];
-        foreach ($jobs as $job) {
-            if ($job->retries >= $this->maxRetries) {
-                try {
-                    $this->jobService->remove($job);
-                } catch (Read | Delete $exception) {
-                    $this->logger->error($exception->getMessage(), ['exception' => $exception]);
-                }
-                continue;
-            }
-            try {
-                $this->runJob($job->id, $request);
-            } catch (Exception) {
-                $job->retries ++;
-                try {
-                    $this->jobService->update($job);
-                } catch (Read | Update $exception) {
-                    $this->logger->error($exception->getMessage(), ['exception' => $exception]);
-                }
-                $errors []= $job->id;
-            }
+        try {
+            $job = $this->jobService->get();
+        } catch (Read $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+            return false;
         }
-        return count($errors) === 0;
+        if ($job->retries >= $this->maxRetries) {
+            try {
+                $this->jobService->remove($job);
+            } catch (Delete $exception) {
+                $this->logger->error($exception->getMessage(), ['job' => $job, 'exception' => $exception]);
+            }
+            return true;
+        }
+        try {
+            $this->runJob($job, $request);
+        } catch (Exception) {
+            $job->retries ++;
+            try {
+                $this->jobService->update($job);
+            } catch (Update $exception) {
+                $this->logger->error($exception->getMessage(), ['job' => $job, 'exception' => $exception]);
+            }
+            return false;
+        }
+        return true;
     }
 }

app/src/Service/Valor.php

@@ -4,7 +4,7 @@ namespace Incoviba\Service;
 use DateTimeInterface;
 use DateTimeImmutable;
 use DateMalformedStringException;
-use function PHPUnit\Framework\countOf;
+use Incoviba\Service\Valor\Phone;
 
 class Valor
 {
@@ -40,6 +40,14 @@ class Valor
         }
         return $value / $this->ufService->get($date);
     }
+    public function phone(): Phone
+    {
+        return new Phone();
+    }
+    public function telefono(): Phone
+    {
+        return $this->phone();
+    }
 
     protected function getDateTime(null|string|DateTimeInterface $date): DateTimeInterface
     {

app/src/Service/Valor/Phone.php

@@ -0,0 +1,28 @@
+<?php
+namespace Incoviba\Service\Valor;
+
+class Phone
+{
+    public function toDatabase(?string $phone): ?int
+    {
+        if ($phone === null) {
+            return null;
+        }
+        return (int) str_replace([' ', '+'], '', $phone) ?? null;
+    }
+    public function toDisplay(?int $phone): ?string
+    {
+        if ($phone === null) {
+            return null;
+        }
+        $parts = preg_split('/(?=<country>\d{2})?(?=<area>\d)(?=<first>\d{4})(?=<last>\d{4})/', $phone);
+        $output = [];
+        if (array_key_exists('country', $parts)) {
+            $output [] = "+{$parts[0]}";
+        }
+        $output [] = $parts[1] ?? '';
+        $output [] = $parts[2] ?? '';
+        $output [] = $parts[3] ?? '';
+        return implode(' ', $output);
+    }
+}

app/src/Service/Venta/MediosPago/Toku/Subscription.php

@@ -137,7 +137,11 @@ class Subscription extends AbstractEndPoint
             $statement = $this->ventaService->getRepository()->getConnection()->execute($query, $values);
             $results = $statement->fetchAll(PDO::FETCH_ASSOC);
         } catch (PDOException $exception) {
-            $this->logger->error($exception);
+            $this->logger->error($exception->getMessage(), [
+                'query' => $query,
+                'values' => $values,
+                'ids' => $idsData,
+                'exception' => $exception]);
             throw new EmptyResult($query, $exception);
         }
 
@@ -160,7 +164,36 @@ class Subscription extends AbstractEndPoint
             $data = [
                 'product_id' => $newPids[$idx],
             ];
-            if (!$this->edit($tokuId, $data, array_key_exists($idx, $keys) ? $keys[$idx] : null)) {
+            try {
+                if (!$this->edit($tokuId, $data, array_key_exists($idx, $keys) ? $keys[$idx] : null)) {
+                    $this->logger->error('Error while updating Toku', [
+                        'toku_id' => $tokuId,
+                        'old_pid' => $oldPids[$idx],
+                        'product_id' => $newPids[$idx],
+                        'account_key' => array_key_exists($idx, $keys) ? $keys[$idx] : null]);
+                    $output[] = [
+                        'toku_id' => $tokuId,
+                        'old_pid' => $oldPids[$idx],
+                        'product_id' => $newPids[$idx],
+                        'account_key' => array_key_exists($idx, $keys) ? $keys[$idx] : null,
+                        'error' => 'Error while updating Toku'
+                    ];
+                    continue;
+                }
+            } catch (EmptyResponse $exception) {
+                $this->logger->error($exception->getMessage(), [
+                    'toku_id' => $tokuId,
+                    'old_pid' => $oldPids[$idx],
+                    'product_id' => $newPids[$idx],
+                    'account_key' => array_key_exists($idx, $keys) ? $keys[$idx] : null,
+                    'exception' => $exception]);
+                $output[] = [
+                    'toku_id' => $tokuId,
+                    'old_pid' => $oldPids[$idx],
+                    'product_id' => $newPids[$idx],
+                    'account_key' => array_key_exists($idx, $keys) ? $keys[$idx] : null,
+                    'error' => $exception->getMessage()
+                ];
                 continue;
             }
             $output[] = [
@@ -256,7 +289,10 @@ class Subscription extends AbstractEndPoint
             $statement = $this->ventaService->getRepository()->getConnection()->execute($query, $values);
             $results = $statement->fetchAll(PDO::FETCH_ASSOC);
         } catch (PDOException $exception) {
-            $this->logger->error($exception);
+            $this->logger->error($exception->getMessage(), [
+                'query' => $query,
+                'values' => $values,
+                'exception' => $exception]);
             throw new EmptyResult($query, $exception);
         }
         $keys = array_column($results, 'account_key');

app/src/Service/Venta/Precio.php

@@ -1,19 +1,31 @@
 <?php
 namespace Incoviba\Service\Venta;
 
+use DateTimeInterface;
+use PDOException;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Exception\ServiceAction\Read;
-use Incoviba\Repository;
+use Incoviba\Exception\ServiceAction;
 use Incoviba\Model;
+use Incoviba\Repository;
 
-class Precio
+class Precio extends Ideal\Service
 {
-    public function __construct(protected Repository\Venta\Precio $precioRepository, protected Repository\Venta\EstadoPrecio $estadoPrecioRepository) {}
+    public function __construct(LoggerInterface $logger,
+                                protected Repository\Venta\Precio $precioRepository,
+                                protected Repository\Venta\EstadoPrecio $estadoPrecioRepository,
+                                protected Precio\Estado $estadoPrecioService,
+                                protected Precio\Import $importService)
+    {
+        parent::__construct($logger);
+    }
 
     /**
      * @param int $proyecto_id
      * @return array
-     * @throws Read
+     * @throws ServiceAction\Read
      */
     public function getByProyecto(int $proyecto_id): array
     {
@@ -25,14 +37,14 @@ class Precio
             }
             return $precios;
         } catch (EmptyResult $exception) {
-            throw new Read(__CLASS__, $exception);
+            throw new ServiceAction\Read(__CLASS__, $exception);
         }
     }
 
     /**
      * @param int $unidad_id
      * @return Model\Venta\Precio
-     * @throws Read
+     * @throws ServiceAction\Read
      */
     public function getVigenteByUnidad(int $unidad_id): Model\Venta\Precio
     {
@@ -42,14 +54,14 @@ class Precio
             $precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
             return $precio;
         } catch (EmptyResult $exception) {
-            throw new Read(__CLASS__, $exception);
+            throw new ServiceAction\Read(__CLASS__, $exception);
         }
     }
 
     /**
      * @param int $unidad_id
      * @return array
-     * @throws Read
+     * @throws ServiceAction\Read
      */
     public function getByUnidad(int $unidad_id): array
     {
@@ -61,7 +73,51 @@ class Precio
             }
             return $precios;
         } catch (EmptyResult $exception) {
-            throw new Read(__CLASS__, $exception);
+            throw new ServiceAction\Read(__CLASS__, $exception);
         }
     }
+
+    /**
+     * @param int $projectId
+     * @param DateTimeInterface $date
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     * @throws ServiceAction\Create
+     */
+    public function import(int $projectId, DateTimeInterface $date, UploadedFileInterface $uploadedFile): array
+    {
+        $pricesData = $this->importService->importData($projectId, $date, $uploadedFile);
+        $prices = [];
+        foreach ($pricesData as $data) {
+            try {
+                $price = $this->precioRepository->create($data);
+                $price = $this->precioRepository->save($price);
+                $prices[] = $price;
+            } catch (EmptyResult | PDOException $exception) {
+                $this->logger->error('Problemas para agregar precio', ['data' => $data, 'exception' => $exception]);
+            }
+        }
+
+        foreach ($prices as $price) {
+            $idx = array_search($price->unidad->id, array_column($pricesData, 'unidad'));
+            $row = $pricesData[$idx];
+            try {
+                $this->estadoPrecioService->replacePrices($price->unidad, $date, $price);
+            } catch (ServiceAction\Update $exception) {
+                $this->logger->error('Problemas para reemplazar precios', [
+                    'data' => $row,
+                    'exception' => $exception
+                ]);
+            }
+            try {
+                $this->estadoPrecioService->updatePrice($price, $row['fecha']);
+            } catch (ServiceAction\Update $exception) {
+                $this->logger->error('Problemas para actualizar estado de precio', [
+                    'data' => $row,
+                    'exception' => $exception
+                ]);
+            }
+        }
+        return $prices;
+    }
 }

app/src/Service/Venta/Precio/Estado.php

@@ -0,0 +1,89 @@
+<?php
+namespace Incoviba\Service\Venta\Precio;
+
+use DateTimeInterface;
+use Incoviba\Model\Venta\Precio;
+use Incoviba\Model\Venta\Unidad;
+use PDOException;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Model;
+use Incoviba\Repository;
+
+class Estado extends Ideal\Service
+{
+    public function __construct(LoggerInterface $logger,
+                                protected Repository\Venta\Precio $precioRepository,
+                                protected Repository\Venta\EstadoPrecio $estadoPrecioRepository,
+                                protected Repository\Venta\TipoEstadoPrecio $tipoEstadoPrecioRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    /**
+     * @param Model\Venta\Precio $price
+     * @param DateTimeInterface $date
+     * @return void
+     * @throws ServiceAction\Update
+     */
+    public function updatePrice(Model\Venta\Precio $price, DateTimeInterface $date): void
+    {
+        try {
+            $tipoEstado = $this->tipoEstadoPrecioRepository->fetchByDescripcion('vigente');
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Update(__CLASS__, $exception);
+        }
+        $data = [
+            'precio' => $price->id,
+            'fecha' => $date->format('Y-m-d'),
+            'estado' => $tipoEstado->id
+        ];
+        try {
+            $estado = $this->estadoPrecioRepository->create($data);
+            $this->estadoPrecioRepository->save($estado);
+        } catch (Implement\Exception\EmptyResult | PDOException $exception) {
+            throw new ServiceAction\Update(__CLASS__, $exception);
+        }
+    }
+
+    /**
+     * @param Unidad $unidad
+     * @param DateTimeInterface $date
+     * @param Precio $price
+     * @return void
+     * @throws ServiceAction\Update
+     */
+    public function replacePrices(Model\Venta\Unidad $unidad, DateTimeInterface $date, Model\Venta\Precio $price): void
+    {
+        try {
+            $tipoEstado = $this->tipoEstadoPrecioRepository->fetchByDescripcion('reemplazado');
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Update(__CLASS__, $exception);
+        }
+        try {
+            $precios = $this->precioRepository->fetchByUnidad($unidad->id);
+            foreach ($precios as $p) {
+                if ($p->id === $price->id) {
+                    continue;
+                }
+                try {
+                    $estado = $this->estadoPrecioRepository->fetchCurrentByPrecio($p->id);
+                    if ($estado->tipoEstadoPrecio->id === $tipoEstado->id) {
+                        continue;
+                    }
+                    $data = [
+                        'precio' => $p->id,
+                        'estado' => $tipoEstado->id,
+                        'fecha' => $date->format('Y-m-d')
+                    ];
+                    $estado = $this->estadoPrecioRepository->create($data);
+                    $this->estadoPrecioRepository->save($estado);
+                } catch (Implement\Exception\EmptyResult) {}
+            }
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Update(__CLASS__, $exception);
+        }
+    }
+}

app/src/Service/Venta/Precio/Import.php

@@ -0,0 +1,243 @@
+<?php
+namespace Incoviba\Service\Venta\Precio;
+
+use DateTime;
+use DateTimeInterface;
+use PDOException;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Model;
+use Incoviba\Service;
+use Incoviba\Repository;
+
+class Import extends Ideal\Service
+{
+    public function __construct(LoggerInterface $logger,
+                                protected Repository\Venta\Precio $precioRepository,
+                                protected Repository\Inmobiliaria $inmobiliariaRepository,
+                                protected Repository\Proyecto $proyectoRepository,
+                                protected Repository\Venta\Unidad $unidadRepository,
+                                protected Service\FileUpload $fileUploadService)
+    {
+        parent::__construct($logger);
+    }
+
+    /**
+     * @param int $projectId
+     * @param DateTimeInterface $date
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     * @throws ServiceAction\Create
+     */
+    public function importData(int $projectId, DateTimeInterface $date, UploadedFileInterface $uploadedFile): array
+    {
+        try {
+            $data = $this->fileUploadService->getData($uploadedFile);
+        } catch (ServiceAction\Read $exception) {
+            throw new ServiceAction\Create(__CLASS__, $exception);
+        }
+        $mappedData = $this->mapData($data, $projectId, $date);
+        $pricesData = [];
+        foreach ($mappedData as $row) {
+            $pricesData[] = [
+                'unidad' => $row['unidad'],
+                'valor' => $row['precio'],
+                'fecha' => $row['fecha']
+            ];
+        }
+        try {
+            $priceUnitIds = array_map(fn($price) => $price['unidad'], $pricesData);
+            $prices = $this->precioRepository->fetchVigentesByUnidades($priceUnitIds);
+            $priceUnitIds = array_map(fn(array $p) => $p['id'], $prices);
+            $pricePrices = array_map(fn(array $p) => $p['precio']->valor, $prices);
+            return array_filter($pricesData, function($price) use ($priceUnitIds, $pricePrices) {
+                $idx = array_search($price['unidad'], $priceUnitIds);
+                if ($idx === false) {
+                    return true;
+                }
+                return $pricePrices[$idx] !== $price['valor'];
+            });
+        } catch (EmptyResult $exception) {
+            throw new ServiceAction\Create(__CLASS__, $exception);
+        }
+    }
+    protected array $realTitlesMap;
+    protected function extractTitlesFromData(array $data): array
+    {
+        if (isset($this->realTitlesMap)) {
+            return $this->realTitlesMap;
+        }
+        $baseTitlesMap = [
+            'proyecto' => [],
+            'precio' => [],
+            'unidad' => ['departamento'],
+            'tipo' => ['tipo unidad'],
+            'fecha' => []
+        ];
+
+        $realTitlesMap = [];
+        $titles = array_keys($data[0]);
+        foreach ($baseTitlesMap as $base => $optionals) {
+            foreach ($titles as $title) {
+                if (str_contains($title, $base)) {
+                    $realTitlesMap[$title] = $base;
+                    break;
+                }
+                foreach ($optionals as $optional) {
+                    if (str_contains($title, $optional)) {
+                        $realTitlesMap[$title] = $base;
+                        break;
+                    }
+                }
+            }
+        }
+        return $this->realTitlesMap = $realTitlesMap;
+    }
+    protected function mapData(array $data, int $projectId, DateTimeInterface $date): array
+    {
+        $mappedData = $this->mapTitles($data);
+        $mappedData = $this->mapProjects($mappedData, $projectId);
+        $mappedData = $this->mapUnits($mappedData);
+        return $this->mapDates($mappedData, $date);
+    }
+    protected function mapTitles(array $data): array
+    {
+        $titlesMap = $this->extractTitlesFromData($data);
+        $mappedData = [];
+        foreach ($data as $row) {
+            $mappedData []= $this->mapRow($row, $titlesMap);
+        }
+        return $mappedData;
+    }
+    protected function mapProjects(array $data, int $projectId): array
+    {
+        if (!array_key_exists('proyecto', $data[0])) {
+            return array_map(function($row) use ($projectId) {
+                $row['proyecto'] = $projectId;
+                return $row;
+            },$data);
+        }
+        $projects = $this->extractProjectsFromData($data);
+        $mappedData = [];
+        foreach ($data as $row) {
+            $mappedRow = $row;
+            $mappedRow['proyecto'] = $projects[$row['proyecto']]?->id ?? $projectId;
+            $mappedData []= $mappedRow;
+        }
+        return $mappedData;
+    }
+    protected function mapUnits(array $data): array
+    {
+        if (!array_key_exists('unidad', $data[0]) or !array_key_exists('tipo', $data[0])) {
+            return $data;
+        }
+        $unidades = [];
+        $mappedData = [];
+        foreach ($data as $row) {
+            if (!isset($unidades[$row['proyecto']])) {
+                $unidades[$row['proyecto']] = $this->unidadRepository->fetchByProyecto($row['proyecto']);
+            }
+            $tipo = $this->mapTipoUnidad($row['tipo']);
+            $unidad = array_filter($unidades[$row['proyecto']], function(Model\Venta\Unidad $unidad) use ($row, $tipo) {
+                return $unidad->descripcion == $row['unidad']
+                        and $unidad->proyectoTipoUnidad->tipoUnidad->descripcion == $tipo;
+            });
+            if (count($unidad) === 0) {
+                $this->logger->warning('Unidad no encontrada', ['row' => $row]);
+                continue;
+            }
+            $mappedRow = $row;
+            $mappedRow['unidad'] = array_shift($unidad)->id;
+            unset($mappedRow['tipo']);
+            $mappedData []= $mappedRow;
+        }
+        return $mappedData;
+    }
+    protected function mapDates(array $data, DateTimeInterface $date): array
+    {
+        if (!array_key_exists('fecha', $data[0])) {
+            return array_map(function($row) use ($date) {
+                $row['fecha'] = $date;
+                return $row;
+            }, $data);
+        }
+        $mappedData = [];
+        foreach ($data as $row) {
+            $mappedRow = $row;
+            $newDate = DateTime::createFromFormat('d/m/Y', $row['fecha']);
+            $mappedRow['fecha'] = $newDate;
+            if ($newDate === false) {
+                $mappedRow['fecha'] = $date;
+            }
+            $mappedData []= $mappedRow;
+        }
+        return $mappedData;
+    }
+    protected function mapRow(array $row, array $titlesMap): array
+    {
+        $mappedRow = [];
+        foreach ($row as $key => $value) {
+            $mappedRow[$titlesMap[$key]] = $value;
+        }
+        return $mappedRow;
+    }
+    protected function mapTipoUnidad(string $tipo): string
+    {
+        if (str_contains(mb_strtolower($tipo), 'bod')) {
+            return 'bodega';
+        }
+        if (str_contains(mb_strtolower($tipo), 'est')) {
+            return 'estacionamiento';
+        }
+        if (str_contains(mb_strtolower($tipo), 'terr')) {
+            return 'terraza';
+        }
+        return 'departamento';
+    }
+    protected array $projectsMap;
+    protected function extractProjectsFromData(array $data): array
+    {
+        if (isset($this->projectsMap)) {
+            return $this->projectsMap;
+        }
+        $projectNames = array_unique(array_map(fn($row) => $row['proyecto'], $data));
+        $projects = [];
+        foreach ($projectNames as $projectName) {
+            try {
+                $projects[$projectName] = $this->proyectoRepository->fetchByName($projectName);
+            } catch (EmptyResult $exception) {
+                try {
+                    $inm = $this->inmobiliariaRepository->fetchByName($projectName);
+                    $inmProjects = $this->proyectoRepository->fetchByInmobiliaria($inm->rut);
+                    $projects[$projectName] = $inmProjects[0];
+                } catch (EmptyResult $exception2) {
+                    $this->logger->warning('Neither Project nor Society found', [
+                        'projectName' => $projectName,
+                        'exceptions' => [
+                            [
+                                'code' => $exception->getCode(),
+                                'message' => $exception->getMessage(),
+                                'file' => $exception->getFile(),
+                                'line' => $exception->getLine(),
+                                'data' => $exception->getData(),
+                                'trace' => $exception->getTraceAsString()
+                            ],
+                            [
+                                'code' => $exception2->getCode(),
+                                'message' => $exception2->getMessage(),
+                                'file' => $exception2->getFile(),
+                                'line' => $exception2->getLine(),
+                                'data' => $exception2->getData(),
+                                'trace' => $exception2->getTraceAsString()
+                            ]
+                        ],
+                    ]);
+                }
+            }
+        }
+        return $this->projectsMap = $projects;
+    }
+}

app/src/Service/Venta/Promotion.php

@@ -48,6 +48,20 @@ class Promotion extends Ideal\Service
         }
     }
 
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Exception\ServiceAction\Read
+     */
+    public function getByProject(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->promotionRepository->fetchByProject($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new Exception\ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
     /**
      * @param int $contract_id
      * @return array

app/src/Service/Venta/Propietario.php

@@ -1,22 +1,24 @@
 <?php
 namespace Incoviba\Service\Venta;
 
+use PDOException;
+use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Exception\ServiceAction\Create;
 use Incoviba\Exception\ServiceAction\Read;
 use Incoviba\Exception\ServiceAction\Update;
-use Incoviba\Repository;
 use Incoviba\Model;
-use PDOException;
-use Psr\Log\LoggerInterface;
+use Incoviba\Repository;
+use Incoviba\Service\Valor;
 
 class Propietario extends Service
 {
     public function __construct(
         LoggerInterface $logger,
         protected Repository\Venta\Propietario $propietarioRepository,
-        protected Repository\Direccion $direccionRepository
+        protected Repository\Direccion $direccionRepository,
+        protected Valor $valorService
     ) {
         parent::__construct($logger);
     }
@@ -49,6 +51,9 @@ class Propietario extends Service
             $data['direccion'] = $direccion->id;
         }
         $filteredData = $this->propietarioRepository->filterData($data);
+        if (array_key_exists('telefono', $filteredData)) {
+            $filteredData['telefono'] = $this->valorService->telefono()->toDatabase($filteredData['telefono']);
+        }
         try {
             return $this->propietarioRepository->edit($propietario, $filteredData);
         } catch (PDOException | EmptyResult $exception) {
@@ -85,6 +90,10 @@ class Propietario extends Service
         ]);
         $filtered_data = array_intersect_key($data, $fields);
 
+        if (array_key_exists('telefono', $filtered_data)) {
+            $filtered_data['telefono'] = $this->valorService->telefono()->toDatabase($filtered_data['telefono']);
+        }
+
         try {
             $propietario = $this->propietarioRepository->fetchById($data['rut']);
             $edits = [];
@@ -95,6 +104,7 @@ class Propietario extends Service
         } catch (EmptyResult) {
             try {
                 $propietario = $this->propietarioRepository->create($filtered_data);
+                $this->logger->info('Propietario', ['propietario' => $propietario]);
                 $propietario = $this->propietarioRepository->save($propietario);
             } catch (PDOException $exception) {
                 throw new Create(__CLASS__, $exception);

app/src/Service/Venta/Reservation.php

@@ -1,8 +1,10 @@
 <?php
 namespace Incoviba\Service\Venta;
 
-use DateTimeImmutable;
 use DateMalformedStringException;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Incoviba\Exception\ServiceAction\Read;
 use PDOException;
 use Psr\Log\LoggerInterface;
 use Incoviba\Common\Define;
@@ -11,10 +13,16 @@ use Incoviba\Common\Implement;
 use Incoviba\Exception\ServiceAction;
 use Incoviba\Model;
 use Incoviba\Repository;
+use Incoviba\Service;
 
 class Reservation extends Ideal\Service\API
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Venta\Reservation $reservationRepository)
+    public function __construct(LoggerInterface                              $logger,
+                                protected Repository\Venta\Reservation       $reservationRepository,
+                                protected Repository\Venta\Reservation\State $stateRepository,
+                                protected Service\Persona $personaService,
+                                protected Service\Proyecto\Broker $brokerService,
+                                protected Promotion $promotionService, protected Unidad $unitService)
     {
         parent::__construct($logger);
     }
@@ -22,12 +30,26 @@ class Reservation extends Ideal\Service\API
     public function getAll(null|string|array $order = null): array
     {
         try {
-            return $this->reservationRepository->fetchAll($order);
+            return array_map([$this, 'process'], $this->reservationRepository->fetchAll($order));
         } catch (Implement\Exception\EmptyResult) {
             return [];
         }
     }
 
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getByProject(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchByProject($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
     public function get(int $id): Model\Venta\Reservation
     {
         try {
@@ -37,25 +59,124 @@ class Reservation extends Ideal\Service\API
         }
     }
 
-    public function add(array $data): Model\Venta\Reservation
+    /**
+     * @param int $buyer_rut
+     * @param DateTimeInterface $date
+     * @return Model\Venta\Reservation
+     * @throws Read
+     */
+    public function getByBuyerAndDate(int $buyer_rut, DateTimeInterface $date): Model\Venta\Reservation
     {
         try {
-            $date = new DateTimeImmutable();
-            try {
-                $date = new DateTimeImmutable($data['date']);
-            } catch (DateMalformedStringException) {}
-            return $this->process($this->reservationRepository->fetchByBuyerAndDate($data['buyer_rut'], $date));
-        } catch (Implement\Exception\EmptyResult) {}
-
-        try {
-            $reservationData = $this->reservationRepository->filterData($data);
-            $reservation = $this->reservationRepository->create($reservationData);
-            $this->reservationRepository->save($reservation);
-            return $this->process($reservation);
-        } catch (PDOException $exception) {
-            throw new ServiceAction\Create(__CLASS__, $exception);
+            return $this->process($this->reservationRepository->fetchByBuyerAndDate($buyer_rut, $date));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
         }
     }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getActive(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchActive($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getPending(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchPending($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getRejected(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchRejected($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
+    public function add(array $data): Model\Venta\Reservation
+    {
+        $date = new DateTimeImmutable();
+        try {
+            $date = new DateTimeImmutable($data['date']);
+        } catch (DateMalformedStringException) {}
+        try {
+            $reservation = $this->reservationRepository->fetchByBuyerAndDate($data['buyer_rut'], $date);
+
+            if (array_key_exists('broker_rut', $data) and $data['broker_rut'] !== '') {
+                try {
+                    $broker = $this->brokerService->get($data['broker_rut']);
+                    $reservation = $this->reservationRepository->edit($reservation, ['broker_rut' => $broker->rut]);
+                } catch (ServiceAction\Read) {}
+            }
+        } catch (Implement\Exception\EmptyResult) {
+            $buyerData = [];
+            foreach ($data as $key => $value) {
+                if (!str_starts_with($key, 'buyer_')) {
+                    continue;
+                }
+                $buyerData[substr($key, strlen('buyer_'))] = $value;
+            }
+            $this->personaService->add($buyerData);
+
+            $data['date'] = $date->format('Y-m-d');
+            try {
+                $reservationData = $this->reservationRepository->filterData($data);
+                $reservation = $this->reservationRepository->create($reservationData);
+                $reservation = $this->reservationRepository->save($reservation);
+
+                try {
+                    $stateType = Model\Venta\Reservation\State\Type::ACTIVE;
+                    $stateData = [
+                        'reservation_id' => $reservation->id,
+                        'date' => $data['date'],
+                        'type' => $stateType->value,
+                    ];
+                    $state = $this->stateRepository->create($stateData);
+                    $this->stateRepository->save($state);
+                } catch (PDOException $exception) {
+                    $this->logger->warning($exception->getMessage(), ['reservation_id' => $reservation->id, 'exception' => $exception->getTraceAsString()]);
+                }
+            } catch (PDOException $exception) {
+                throw new ServiceAction\Create(__CLASS__, $exception);
+            }
+        }
+
+        $units = array_combine($data['units'], $data['units_value']);
+        $this->addUnits($reservation, $units);
+
+        if (array_key_exists('broker_rut', $data) and !empty($data['broker_rut'])) {
+            $this->addBroker($reservation, $data['broker_rut']);
+        }
+
+        if (array_key_exists('promotions', $data)) {
+            $this->addPromotions($reservation, $data['promotions']);
+        }
+
+        return $this->process($reservation);
+    }
     public function edit(Define\Model $model, array $new_data): Model\Venta\Reservation
     {
         try {
@@ -76,6 +197,45 @@ class Reservation extends Ideal\Service\API
     }
     protected function process(Define\Model $model): Model\Venta\Reservation
     {
+        $model->addFactory('states', new Implement\Repository\Factory()
+            ->setArgs(['reservation_id' => $model->id])
+            ->setCallable(function(int $reservation_id) {
+                return $this->stateRepository->fetchByReservation($reservation_id);
+            })
+        );
+        $model->buyer = $this->personaService->getById($model->buyer->rut);
         return $model;
     }
+    protected function addUnits(Model\Venta\Reservation $reservation, array $units): void
+    {
+        foreach ($units as $unit_id => $value) {
+            try {
+                $unit = $this->unitService->getById($unit_id);
+            } catch (ServiceAction\Read) {
+                continue;
+            }
+            $reservation->addUnit($unit, $value);
+        }
+        $this->reservationRepository->save($reservation);
+    }
+    protected function addBroker(Model\Venta\Reservation $reservation, int $broker_rut): void
+    {
+        try {
+            $broker = $this->brokerService->get($broker_rut);
+            $reservation->broker = $broker;
+            $this->reservationRepository->save($reservation);
+        } catch (ServiceAction\Read) {}
+    }
+    protected function addPromotions(Model\Venta\Reservation $reservation, array $promotions): void
+    {
+        foreach ($promotions as $promotion_id) {
+            try {
+                $promotion = $this->promotionService->getById($promotion_id);
+            } catch (ServiceAction\Read) {
+                continue;
+            }
+            $reservation->promotions []= $promotion;
+        }
+        $this->reservationRepository->save($reservation);
+    }
 }

app/tests/extension/ContainerTrait.php

@@ -0,0 +1,15 @@
+<?php
+namespace Tests\Extension;
+
+use Psr\Container\ContainerInterface;
+
+trait ContainerTrait
+{
+    protected ContainerInterface $container;
+    protected function setUp(): void
+    {
+        parent::setUp();
+        require_once implode(DIRECTORY_SEPARATOR, [dirname(__DIR__, 2), 'setup', 'container.php']);
+        $this->container = buildContainer();
+    }
+}

app/tests/extension/Seeds/Bancos.php

@@ -0,0 +1,23 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use Tests\Extension\AbstractSeed;
+
+class Bancos extends AbstractSeed
+{
+    public function run(): void
+    {
+        $count = 10;
+
+        $data = [];
+        for ($i = 0; $i < $count; $i++) {
+            $data[] = [
+                'nombre' => $this->faker->company,
+            ];
+        }
+
+        $this->table('banco')
+            ->insertValues($data)
+            ->save();
+    }
+}

app/tests/extension/Seeds/BrokerContracts.php

@@ -0,0 +1,45 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use Tests\Extension\AbstractSeed;
+
+class BrokerContracts extends AbstractSeed
+{
+    public function getDependencies(): array
+    {
+        return [
+            Brokers::class,
+            Proyectos::class,
+        ];
+    }
+
+    public function run(): void
+    {
+        $brokers = $this->loadValues('brokers', columns: 'rut');
+        $projects = $this->loadValues('proyecto', columns: 'id');
+
+        $data = [];
+        foreach ($projects as $project) {
+            $count = $this->faker->numberBetween(1, count($brokers));
+            for ($i = 0; $i < $count; $i++) {
+                $data []= [
+                    'broker_rut' => $brokers[$i],
+                    'project_id' => $project,
+                    'commission' => $this->faker->randomFloat(4, 0, 1),
+                ];
+            }
+        }
+        $this->table('broker_contracts')->insertValues($data)->save();
+
+        $contracts = $this->loadValues('broker_contracts', columns: 'id');
+        $stateData = [];
+        foreach ($contracts as $contract) {
+            $stateData[]= [
+                'contract_id' => $contract,
+                'date' => $this->faker->dateTimeBetween('-1 year'),
+                'type' => 1
+            ];
+        }
+        $this->table('broker_contract_states')->insertValues($stateData)->save();
+    }
+}

app/tests/extension/Seeds/Brokers.php

@@ -0,0 +1,50 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use Tests\Extension\AbstractSeed;
+
+class Brokers extends AbstractSeed
+{
+    public function run(): void
+    {
+        $addresses = $this->loadValues('direccion', columns: 'id');
+
+
+
+        $count = 10;
+        $contactData = [];
+        for($i = 0; $i < $count; $i++) {
+            $rut = $this->faker->rut(false, false);
+            $contactData[]= [
+                'rut' => $rut,
+                'digit' => $this->faker->digitoVerificador($rut),
+                'name' => $this->faker->name,
+                'email' => $this->faker->email,
+                'phone' => $this->faker->phoneNumber,
+                'address_id' => $this->faker->randomElement($addresses)
+            ];
+        }
+        $this->table('broker_contacts')->insertValues($contactData)->save();
+
+        $contacts = $this->loadValues('broker_contacts', columns: 'id');
+
+        $data = [];
+        $brokerData = [];
+        for($i = 0; $i < $count; $i ++) {
+            $rut = $this->faker->rut(false, false);
+            $data[] = [
+                'rut' => $rut,
+                'digit' => $this->faker->digitoVerificador($rut),
+                'name' => $this->faker->word
+            ];
+            $brokerData []= [
+                'broker_rut' => $rut,
+                'representante_id' => $this->faker->randomElement($contacts),
+                'legal_name' => $this->faker->company
+            ];
+        }
+
+        $this->table('brokers')->insertValues($data)->save();
+        $this->table('broker_data')->insertValues($brokerData)->save();
+    }
+}

app/tests/extension/Seeds/Direcciones.php

@@ -9,14 +9,14 @@ class  Direcciones extends AbstractSeed
     {
         $comunas = $this->loadValues('comuna', columns: 'id');
 
-        $n = 50;
+        $n = 100;
         $data = [];
         for ($i = 0; $i < $n; $i++) {
             $row = [
                 'calle' => $this->faker->streetName,
                 'numero' => $this->faker->randomNumber(5),
                 'comuna' => $this->faker->randomElement($comunas),
-                'extra' => '',
+                'extra' => $this->faker->optional(0.9, '')->words(2, true),
             ];
             $extraRand = ((int) round(rand() / getrandmax())) === 1;
             if ($extraRand) {

app/tests/extension/Seeds/Inmobiliarias.php

@@ -5,9 +5,17 @@ use Tests\Extension\AbstractSeed;
 
 class Inmobiliarias extends AbstractSeed
 {
+    public function getDependencies(): array
+    {
+        return [
+            Bancos::class
+        ];
+    }
+
     public function run(): void
     {
         $tipos = $this->loadValues('tipo_sociedad', columns: 'id');
+        $bancos = $this->loadValues('banco', columns: 'id');
         $suffixes = [
             'Inmobiliaria ',
             'Administradora ',
@@ -28,8 +36,10 @@ class Inmobiliarias extends AbstractSeed
                 'dv' => $this->faker->digitoVerificador($rut),
                 'razon' => $razon,
                 'abreviacion' => $abreviacion,
-                'sigla' => $sigla,
+                'cuenta' => $this->faker->randomNumber(8),
+                'banco' => $this->faker->randomElement($bancos),
                 'sociedad' => $this->faker->randomElement($tipos),
+                'sigla' => $sigla,
             ];
         }
         $this->table('inmobiliaria')

app/tests/extension/Seeds/Promotions.php

@@ -0,0 +1,55 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use DateInterval;
+use Tests\Extension\AbstractSeed;
+
+class Promotions extends AbstractSeed
+{
+    public function getDependencies(): array
+    {
+        return [
+            Proyectos::class,
+        ];
+    }
+
+    public function run(): void
+    {
+        $projects = $this->loadValues('proyecto', columns: 'id');
+
+        $data = [];
+        $count = $this->faker->numberBetween(1, 10);
+        for ($i = 0; $i < $count; $i++) {
+            $start = $this->faker->dateTimeBetween('-1 year');
+            $end = $this->faker->dateTimeBetween($start, $start->add(new DateInterval('P1Y')));
+            $data[] = [
+                'description' => $this->faker->sentence,
+                'type' => 1,
+                'amount' => $this->faker->randomFloat(2, 0, 1),
+                'start_date' => $start,
+                'end_date' => $end,
+                'valid_until' => $this->faker->dateTimeBetween($end, $end->add(new DateInterval('P1M'))),
+                'state' => 1,
+            ];
+        }
+        $this->table('promotions')->insertValues($data)->save();
+
+        $promotions = $this->loadValues('promotions', columns: 'id');
+
+        $data = [];
+        foreach ($projects as $project) {
+            $hasPromo = $this->faker->boolean(10);
+            if (!$hasPromo) {
+                continue;
+            }
+
+            $data []= [
+                'promotion_id' => $this->faker->randomElement($promotions),
+                'project_id' => $project,
+            ];
+        }
+        if (count($data) > 0) {
+            $this->table('promotion_projects')->insertValues($data)->save();
+        }
+    }
+}

app/tests/extension/Seeds/ProyectoTipoUnidad.php

@@ -0,0 +1,42 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use Tests\Extension\AbstractSeed;
+
+class ProyectoTipoUnidad extends AbstractSeed
+{
+    public function getDependencies(): array
+    {
+        return [
+            Proyectos::class,
+        ];
+    }
+
+    public function run(): void
+    {
+        $projects = $this->loadValues('proyecto', columns: 'id');
+        $types = $this->loadValues('tipo_unidad', columns: 'id');
+
+        $data = [];
+        foreach ($projects as $project) {
+            foreach ($types as $type) {
+                $count = $this->faker->numberBetween(1, 10);
+                for ($i = 0; $i < $count; $i++) {
+                    $name = $this->faker->word;
+                    $data []= [
+                        'proyecto' => $project,
+                        'tipo' => $type,
+                        'nombre' => $name,
+                        'abreviacion' => substr($name, 0, 3),
+                        'm2' => $this->faker->randomFloat(2, 10, 100),
+                        'logia' => $this->faker->optional(.3, 0)->randomFloat(2, 1, 5),
+                        'terraza' => $this->faker->optional(.3, 0)->randomFloat(2, 2, 30),
+                        'descripcion' => $this->faker->sentence,
+                    ];
+                }
+            }
+        }
+
+        $this->table('proyecto_tipo_unidad')->insertValues($data)->save();
+    }
+}

app/tests/extension/Seeds/Proyectos.php

@@ -27,9 +27,9 @@ class Proyectos extends AbstractSeed
                 'direccion' => $this->faker->randomElement($direcciones),
                 'superficie_sobre_nivel'  => $this->faker->randomFloat(2, 1000, 10000),
                 'superficie_bajo_nivel'  => $this->faker->randomFloat(2, 0, 5000),
-                'pisos'  => $this->faker->randomNumber(2),
-                'subterraneos'  => $this->faker->randomNumber(2),
-                'corredor'  => $this->faker->randomFloat(4, 0, 1)
+                'pisos'  => $this->faker->numberBetween(2, 30),
+                'subterraneos'  => $this->faker->numberBetween(0, 5),
+                'corredor'  => $this->faker->optional(.6, 0)->randomFloat(4, 0, 1)
             ];
         }
 

app/tests/extension/Seeds/Unidades.php

@@ -0,0 +1,47 @@
+<?php
+namespace Tests\Extension\Seeds;
+
+use Tests\Extension\AbstractSeed;
+
+class Unidades extends AbstractSeed
+{
+    public function getDependencies(): array
+    {
+        return [
+            ProyectoTipoUnidad::class,
+        ];
+    }
+
+    public function run(): void
+    {
+        $ptus = $this->loadValues('proyecto_tipo_unidad', columns: ['id', 'proyecto', 'tipo', 'm2', 'logia', 'terraza']);
+
+        $data = [];
+        foreach ($ptus as $s => $ptu) {
+            $count = $this->faker->numberBetween(1, 10);
+            $abr = $this->faker->word;
+            $orientation = $this->faker->randomElement(['N', 'NO', 'NP', 'S', 'SO', 'SP', 'P', 'O']);
+
+            for ($i = 0; $i < $count; $i++) {
+                $data[] = [
+                    'proyecto' => $ptu['proyecto'],
+                    'tipo' => $ptu['tipo'],
+                    'subtipo' => $s,
+                    'piso' => $i + 2,
+                    'descripcion' => ($i + 2) * 100 + $s,
+                    'abreviacion' => $abr,
+                    'm2' => $ptu['m2'],
+                    'logia' => $ptu['logia'],
+                    'cubierta' => 0,
+                    'terraza' => $ptu['terraza'],
+                    'orientacion' => $orientation,
+                    'costo_inmobiliaria' => $this->faker->randomFloat(2, 1000, 3000),
+                    'pt' => $ptu['id'],
+                    'valor' => $this->faker->randomFloat(2, 1000, 3000),
+                ];
+            }
+        }
+
+        $this->table('unidad')->insertValues($data)->save();
+    }
+}

app/tests/integration/API/Ventas/ReservationTest.php

@@ -0,0 +1,92 @@
+<?php
+namespace Incoviba\Tests\Integration\API\Ventas;
+
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use Faker;
+use Incoviba\Common\Define;
+use Incoviba\Common\Implement;
+use Incoviba\Common\Ideal;
+use Incoviba\Model;
+use Incoviba\Service;
+use Incoviba\Repository;
+use Tests\Extension\AbstractIntegration;
+use Tests\Extension\ContainerTrait;
+use Tests\Extension\Faker\Provider\Rut;
+
+class ReservationTest extends TestCase
+{
+    use ContainerTrait;
+
+    public function testAdd(): void
+    {
+        $faker = Faker\Factory::create('es_CL');
+        $faker->addProvider(new Rut($faker));
+
+        $comunas = $this->container->get(Repository\Comuna::class)->fetchAll();
+        $projects = $this->container->get(Repository\Proyecto::class)->fetchAll();
+        $project = $faker->randomElement($projects);
+        $brokers = $this->container->get(Repository\Proyecto\Broker::class)->fetchAll();
+        $units = $this->container->get(Repository\Venta\Unidad::class)->fetchAll();
+
+        $selectedUnits = [];
+        $unitsValue = [];
+        $unitsCount = $faker->numberBetween(1, 3);
+        for ($i = 0; $i < $unitsCount; $i++) {
+            $selectedUnits[] = $faker->randomElement($units)->id;
+            $unitsValue[] = $faker->randomFloat(2, 1000, 10000);
+        }
+
+        $broker = $faker->randomElement($brokers);
+
+        $activePromotions = $this->container->get(Repository\Venta\Promotion::class)->fetchActiveByProject($project->id);
+
+        $promotionsCount = $faker->numberBetween(0, min(3, count($activePromotions)));
+        $promotions = [];
+        for ($i = 0; $i < $promotionsCount; $i++) {
+            $promotions[] = $faker->randomElement($activePromotions)->id;
+        }
+        $rut = $faker->rut(false, false);
+        $data = [
+            'project_id' => $faker->randomElement($projects)->id,
+            'date' => $faker->dateTimeBetween('-2 years', 'now')->format('Y-m-d'),
+            'buyer_rut' => $rut,
+            'buyer_digit' => $faker->digitoVerificador($rut),
+            'buyer_names' => $faker->firstName,
+            'buyer_last_name' => $faker->lastName,
+            'buyer_last_name2' => $faker->lastName,
+            'buyer_email' => $faker->email,
+            'buyer_phone' => $faker->randomNumber(8),
+            'buyer_address_street' => $faker->streetName,
+            'buyer_address_number' => $faker->buildingNumber,
+            'buyer_address_extra' => $faker->streetAddress,
+            'buyer_address_comuna_id' => $faker->randomElement($comunas)->id,
+            'units' => $selectedUnits,
+            'units_value' => $unitsValue,
+            'broker_rut' => $broker ? $broker->rut : '',
+        ];
+        if (count($promotions) > 0) {
+            $data['promotions'] = $promotions;
+        }
+
+        $reservation = $this->container->get(Service\Venta\Reservation::class)->add($data);
+        $this->assertInstanceOf(Model\Venta\Reservation::class, $reservation);
+        $this->assertEquals($data['date'], $reservation->date->format('Y-m-d'));
+        $this->assertEquals($data['project_id'], $reservation->project->id);
+        $this->assertEquals($data['buyer_rut'], $reservation->buyer->rut);
+        $this->assertEquals($data['buyer_digit'], $reservation->buyer->digito);
+        $this->assertEquals($data['buyer_names'], $reservation->buyer->nombres);
+        $this->assertEquals($data['buyer_last_name'], $reservation->buyer->apellidoPaterno);
+        $this->assertEquals($data['buyer_last_name2'], $reservation->buyer->apellidoMaterno);
+        $this->assertEquals($data['buyer_email'], $reservation->buyer->datos->email);
+        $this->assertEquals($data['buyer_phone'], $reservation->buyer->datos->telefono);
+        $this->assertEquals($data['buyer_address_street'], $reservation->buyer->datos->direccion->calle);
+        $this->assertEquals($data['buyer_address_number'], $reservation->buyer->datos->direccion->numero);
+        $this->assertEquals($data['buyer_address_extra'], $reservation->buyer->datos->direccion->extra);
+        $this->assertEquals($data['buyer_address_comuna_id'], $reservation->buyer->datos->direccion->comuna->id);
+        if ($broker !== null) {
+            $this->assertEquals($data['broker_rut'], $reservation->broker->rut);
+        }
+        $this->assertEquals(1, $reservation->currentState()->type->value);
+    }
+}

app/tests/integration/QueueTest.php

@@ -11,17 +11,12 @@ use Incoviba\Common\Implement;
 use Incoviba\Common\Ideal;
 use Incoviba\Service;
 use Incoviba\Repository;
+use Tests\Extension\ContainerTrait;
 use Tests\Extension\Faker\Provider\Rut;
 
 class QueueTest extends TestCase
 {
-    protected ContainerInterface $container;
-
-    protected function setUp(): void
-    {
-        require_once implode(DIRECTORY_SEPARATOR, [dirname(__DIR__, 2), 'setup', 'container.php']);
-        $this->container = buildContainer();
-    }
+    use ContainerTrait;
 
     public function testServiceWorker(): void
     {