Estado cuenta

.gitignore

@@ -10,3 +10,5 @@
 **/.idea/
 **/upload?/
 **/informe?/
+**/.phpunit.cache/
+**/coverage/

Dockerfile

@@ -9,6 +9,7 @@ RUN pecl install xdebug-3.1.3 \
     && docker-php-ext-enable xdebug
 
 COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini
+COPY ./php-xdebug.ini /usr/local/etc/php/conf.d/docker-php-xdebug.ini
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 

app/.phpunit-watcher.yml

@@ -0,0 +1,13 @@
+watch:
+  directories:
+    - src
+    - tests
+    - common
+  fileMask: '*.php'
+notifications:
+  passingTests: false
+  failingTests: false
+hideManual: true
+phpunit:
+  arguments: '--log-events-text /logs/output.txt --stop-on-failure'
+  timeout: 180

app/common/Define/Cartola/Banco.php

@@ -5,6 +5,11 @@ use Psr\Http\Message\UploadedFileInterface;
 
 interface Banco
 {
+    /**
+     * Process bank movements for database inserts
+     * @param UploadedFileInterface $file
+     * @return array
+     */
     public function process(UploadedFileInterface $file): array;
 
 }

app/common/Ideal/Cartola/Banco.php

@@ -9,7 +9,7 @@ abstract class Banco extends Service implements Define\Cartola\Banco
 {
     public function process(UploadedFileInterface $file): array
     {
-        $data = $this->parseFile($file);
+        $data = $this->handleFile($file);
         $temp = [];
         $columns = $this->columnMap();
         foreach ($data as $row) {
@@ -24,11 +24,48 @@ abstract class Banco extends Service implements Define\Cartola\Banco
         }
         return $temp;
     }
+
+    /**
+     * There are banks that need some post-processing
+     * @param array $movimientos
+     * @return array
+     */
     public function processMovimientosDiarios(array $movimientos): array
     {
         return $movimientos;
     }
 
+    /**
+     * Move the UploadedFile into a temp file from getFilename and after parseFile remove temp file
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     */
+    protected function handleFile(UploadedFileInterface $uploadedFile): array
+    {
+        $filename = $this->getFilename($uploadedFile);
+        $uploadedFile->moveTo($filename);
+        $data = $this->parseFile($filename);
+        unlink($filename);
+        return $data;
+    }
+
+    /**
+     * Get filename where to move UploadedFile
+     * @param UploadedFileInterface $uploadedFile
+     * @return string
+     */
+    abstract protected function getFilename(UploadedFileInterface $uploadedFile): string;
+
+    /**
+     * Mapping of uploaded file data columns to database columns
+     * @return array
+     */
     abstract protected function columnMap(): array;
-    abstract protected function parseFile(UploadedFileInterface $uploadedFile): array;
+
+    /**
+     * Translate uploaded file data to database data
+     * @param string $filename
+     * @return array
+     */
+    abstract protected function parseFile(string $filename): array;
 }

app/composer.json

@@ -1,8 +1,11 @@
 {
     "name": "incoviba/web",
+    "version": "2.0.0",
     "type": "project",
     "require": {
         "berrnd/slim-blade-view": "^1.0",
+        "ext-openssl": "*",
+        "ext-pdo": "*",
         "guzzlehttp/guzzle": "^7.8",
         "monolog/monolog": "^3.4",
         "nyholm/psr7": "^1.8",
@@ -14,8 +17,10 @@
         "slim/slim": "^4.11"
     },
     "require-dev": {
+        "fakerphp/faker": "^1.23",
         "kint-php/kint": "^5.1",
-        "phpunit/phpunit": "^10.2"
+        "phpunit/phpunit": "^10.2",
+        "spatie/phpunit-watcher": "^1.23"
     },
     "authors": [
         {
@@ -30,6 +35,7 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "process-timeout": 0
     }
 }

app/phpunit.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="false"
+         beStrictAboutOutputDuringTests="true"
+         colors="true"
+         failOnRisky="false"
+         failOnWarning="false">
+    <testsuites>
+        <testsuite name="unit">
+            <directory>tests/units</directory>
+        </testsuite>
+        <testsuite name="acceptance">
+            <directory>tests/integration</directory>
+        </testsuite>
+        <testsuite name="performance">
+            <directory>tests/performance</directory>
+        </testsuite>
+    </testsuites>
+
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+            <directory>common</directory>
+        </include>
+    </source>
+    <coverage includeUncoveredFiles="true" pathCoverage="false" ignoreDeprecatedCodeUnits="true" disableCodeCoverageIgnore="true">
+        <report>
+            <html outputDirectory="/code/public/coverage/html" />
+            <php outputFile="/code/public/coverage/coverage.php" />
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="/logs/junit.xml" />
+        <teamcity outputFile="/logs/teamcity.txt" />
+        <testdoxHtml outputFile="/logs/testdox.html" />
+        <testdoxText outputFile="/logs/testdox.txt" />
+    </logging>
+</phpunit>

app/resources/routes/01_api.php

@@ -1,4 +1,6 @@
 <?php
+use Incoviba\Controller\API\Base;
+
 $app->group('/api', function($app) {
     $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'api']);
     if (file_exists($folder)) {
@@ -10,4 +12,5 @@ $app->group('/api', function($app) {
             include_once $file->getRealPath();
         }
     }
+    $app->get('[/]', Base::class);
 })->add($app->getContainer()->get(Incoviba\Middleware\API::class));

app/resources/views/contabilidad/informes/tesoreria.blade.php

@@ -1,5 +1,13 @@
 @extends('layout.base')
 
+@push('page_styles')
+    <style>
+        tr.bold>th {
+            font-weight: bold !important;
+        }
+    </style>
+@endpush
+
 @section('page_content')
     <div class="ui container">
         <h1 class="ui centered header">Informe de Tesorería</h1>

app/resources/views/inmobiliarias/list.blade.php

@@ -10,11 +10,6 @@
             <div class="column">
                 Inmobiliarias
             </div>
-            {{--<div class="right aligned column">
-                <button class="ui icon button" type="button">
-                    <i class="plus icon"></i>
-                </button>
-            </div>--}}
         </h2>
         <div class="ui divider"></div>
         <div class="ui cards">
@@ -22,9 +17,7 @@
             <div class="ui card">
                 <div class="content">
                     <div class="header">
-                            {{$inmobiliaria->abreviacion}}
+                        {{$inmobiliaria->abreviacion}}
-                        {{--<a href="{{$urls->base}}/inmobiliaria/{{$inmobiliaria->rut}}">
-                        </a>--}}
                     </div>
                     <div class="description">{{$inmobiliaria->razon}} {{$inmobiliaria->tipoSociedad->descripcion}}</div>
                     <div class="meta">{{$inmobiliaria->rut()}}</div>

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

@@ -2,6 +2,13 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.3/semantic.min.js" integrity="sha512-gnoBksrDbaMnlE0rhhkcx3iwzvgBGz6mOEj4/Y5ZY09n55dYddx6+WYc72A55qEesV8VX2iMomteIwobeGK1BQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
 <script type="text/javascript">
+    function cleanNoCache() {
+        const url = new URL(window.location.href)
+        if (url.searchParams.has('nocache')) {
+            url.searchParams.delete('nocache')
+            window.location.href = url.href
+        }
+    }
     function fetchAPI(url, options=null) {
         if (options === null) {
             options = {}
@@ -10,7 +17,11 @@
             options['headers'] = {}
         }
         if (!Object.hasOwn(options['headers'], 'Authorization')) {
-            options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
+            @if (!$login->isIn())
+                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
+            @else
+                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}{{$login->getSeparator()}}{{$login->getToken()}}'
+            @endif
         }
         return fetch(url, options).then(response => {
             if (response.ok) {
@@ -36,6 +47,7 @@
             date: 'DD-MM-YYYY'
         },
     }
+    cleanNoCache()
 </script>
 
 @stack('page_scripts')

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

@@ -0,0 +1,3 @@
+@push('page_scripts')
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.2.0/crypto-js.min.js" integrity="sha512-a+SUDuwNzXDvz4XrIcXHuCf089/iJAoN4lmrXJg18XnduKK6YlDHNRalv4yd1N40OKI80tFidF+rqTFKGPoWFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+@endpush

app/resources/views/login/form.blade.php

@@ -16,28 +16,33 @@
     </div>
 @endsection
 
+@include('layout.body.scripts.cryptojs')
+
 @push('page_scripts')
     <script type="text/javascript">
+        function encryptPassword(password) {
+            const passphrase = Math.floor(Math.random() * Date.now()).toString()
+            const encrypted = CryptoJS.AES.encrypt(password, passphrase)
+            return [passphrase, encrypted.toString()].join('')
+        }
         function sendLogin(name, password) {
-            const data = new FormData()
+            const method = 'post'
-            data.append('name', name)
+            const headers = {
-            data.append('password', password)
+                Accept: 'json'
-            return fetch('{{$urls->base}}/login', {
+            }
-                method: 'post',
+            const body = new FormData()
-                headers: {
+            body.append('name', name)
-                    Accept: 'json'
+            body.append('password', encryptPassword(password))
-                },
+            return fetch('{{$urls->base}}/login', {method, headers, body}).then(response => {
-                body: data
-            }).then(response => {
                 if (response.ok) {
                     return response.json()
                 }
             }).then(data => {
                 if (data.login === true) {
                 @if(isset($redirect_uri))
-                    window.location = '{{$redirect_uri}}'
+                    window.location = '{{$redirect_uri}}?nocache=' + (new Date()).getTime()
                 @else
-                    window.location = '{{$urls->base}}'
+                    window.location = '{{$urls->base}}?nocache=' + (new Date()).getTime()
                 @endif
                 }
             })

app/resources/views/ventas/show/propiedad.blade.php

@@ -50,7 +50,7 @@
                 </td>
                 <td class="right aligned">
                     @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento')
-                        {{$format->number(($unidad->valor ?? $precio) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m²
+                        {{$format->number((($unidad->valor === null or $unidad->valor === 0.0) ? $precio : $unidad->valor) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m²
                     @endif
                 </td>
                 <td class="center aligned">

app/setup/middlewares/01_auth.php

@@ -1,2 +1,2 @@
 <?php
-//$app->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));
+$app->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));

app/setup/middlewares/96_cors.php

@@ -0,0 +1,2 @@
+<?php
+$app->add($app->getContainer()->get(Incoviba\Middleware\CORS::class));

app/setup/setups/middlewares.php

@@ -14,6 +14,7 @@ return [
     Incoviba\Middleware\API::class => function(ContainerInterface $container) {
         return new Incoviba\Middleware\API(
             $container->get(Psr\Http\Message\ResponseFactoryInterface::class),
+            $container->get(Incoviba\Service\Login::class),
             $container->get('API_KEY')
         );
     }

app/setup/setups/services.php

@@ -9,7 +9,8 @@ return [
             $container->get('COOKIE_NAME'),
             $container->get('MAX_LOGIN_HOURS'),
             $container->has('COOKIE_DOMAIN') ? $container->get('COOKIE_DOMAIN') : '',
-            $container->has('COOKIE_PATH') ? $container->get('COOKIE_PATH') : ''
+            $container->has('COOKIE_PATH') ? $container->get('COOKIE_PATH') : '',
+            $container->has('COOKIE_SEPARATOR') ? $container->get('COOKIE_SEPARATOR') : 'g'
         );
     },
     Incoviba\Service\Money::class => function(ContainerInterface $container) {
@@ -45,7 +46,8 @@ return [
         ))
             ->register('security', $container->get(Incoviba\Service\Cartola\Security::class))
             ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class))
-            ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class));
+            ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class))
+            ->register('bci', $container->get(Incoviba\Service\Cartola\BCI::class));
     },
     Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) {
         return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class);

app/src/Controller/API/Base.php

@@ -0,0 +1,20 @@
+<?php
+namespace Incoviba\Controller\API;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal\Controller;
+
+class Base extends Controller
+{
+    use withJson;
+
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+    {
+        $output = [
+            'version' => '2.0.0',
+            'organization' => 'Ingenieria y Construccion Vial Balmaceda Sociedad Anonima'
+        ];
+        return $this->withJson($response, $output);
+    }
+}

app/src/Controller/API/Inmobiliarias.php

@@ -12,6 +12,16 @@ class Inmobiliarias
 {
     use withJson;
 
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
+    {
+        $output = [
+            'inmobiliarias' => []
+        ];
+        try {
+            $output['inmobiliarias'] = $inmobiliariaRepository->fetchAll('razon');
+        } catch (EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
     public function cuentas(ServerRequestInterface $request, ResponseInterface $response,
                             Repository\Inmobiliaria $inmobiliariaRepository,
                             Repository\Inmobiliaria\Cuenta $cuentaRepository, int $inmobiliaria_rut): ResponseInterface

app/src/Controller/Contabilidad.php

@@ -27,7 +27,7 @@ class Contabilidad extends Controller
             $inmobiliarias = $this->fetchRedis($redisService, $redisKey);
         } catch (EmptyRedis) {
             try {
-                $inmobiliarias = $inmobiliariaRepository->fetchAll();
+                $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
                 $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
             } catch (EmptyResult) {}
         }
@@ -73,4 +73,13 @@ class Contabilidad extends Controller
         $filename = "Informe de Tesorería {$fecha->format('d.m.Y')}";
         return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes', 'filename'));
     }
+    public function cuadratura(ServerRequestInterface $request, ResponseInterface $response, View $view,
+                               Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
+    {
+        $inmobiliarias = [];
+        try {
+            $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
+        } catch (EmptyResult) {}
+        return $view->render($response, 'contabilidad.cuadratura', compact('inmobiliarias'));
+    }
 }

app/src/Controller/Inmobiliarias.php

@@ -20,8 +20,8 @@ class Inmobiliarias
         $inmobiliarias = [];
         try {
             $inmobiliarias = array_map(function($row) use ($inmobiliariaRepository) {
-                return $inmobiliariaRepository->load((array) $row);
+                return $inmobiliariaRepository->load($row);
-            }, $this->fetchRedis($redisService, $redisKey));
+            }, $this->fetchRedis($redisService, $redisKey, true));
         } catch (EmptyRedis) {
             try {
                 $inmobiliarias = $inmobiliariaRepository->fetchAll();

app/src/Controller/Login.php

@@ -1,14 +1,16 @@
 <?php
 namespace Incoviba\Controller;
 
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use PDOException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
+use Incoviba\Common\Ideal\Controller;
 use Incoviba\Repository;
 use Incoviba\Service;
 
-class Login
+class Login extends Controller
 {
     public function form(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Login $service): ResponseInterface
     {
@@ -20,14 +22,17 @@ class Login
     public function login(ServerRequestInterface $request, ResponseInterface $response, Repository\User $userRepository, Service\Login $service): ResponseInterface
     {
         $body = $request->getParsedBody();
-        $user = $userRepository->fetchByName($body['name']);
         $output = [
-            'name' => $user->name,
+            'name' => $body['name'],
             'login' => false
         ];
-        if ($user->validate($body['password'])) {
+
-            $output['login'] = $service->login($user);
+        try {
-        }
+            $user = $userRepository->fetchByName($body['name']);
+            if ($service->validateUser($user, $body['password'])) {
+                $output['login'] = $service->login($user);
+            }
+        } catch (EmptyResult) {}
         $response->getBody()->write(json_encode($output));
         return $response->withHeader('Content-Type', 'application/json');
     }

app/src/Controller/Ventas/Creditos.php

@@ -6,14 +6,15 @@ use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Common\Ideal\Controller;
 use Incoviba\Repository;
+use Incoviba\Service;
 
 class Creditos extends Controller
 {
     public function show(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                         Repository\Venta $ventaRepository, Repository\Banco $bancoRepository,
+                         Service\Venta          $ventaService, Repository\Banco $bancoRepository,
-                         int $venta_id): ResponseInterface
+                         int                    $venta_id): ResponseInterface
     {
-        $venta = $ventaRepository->fetchById($venta_id);
+        $venta = $ventaService->getById($venta_id);
         $bancos = $bancoRepository->fetchAll('nombre');
         return $view->render($response, 'ventas.creditos', compact('venta', 'bancos'));
     }

app/src/Controller/withRedis.php

@@ -6,13 +6,13 @@ use Incoviba\Service;
 
 trait withRedis
 {
-    public function fetchRedis(Service\Redis $redisService, string $redisKey): mixed
+    public function fetchRedis(Service\Redis $redisService, string $redisKey, ?bool $asArray = null): mixed
     {
         $jsonString = $redisService->get($redisKey);
         if ($jsonString === null) {
             throw new EmptyRedis($redisKey);
         }
-        return json_decode($jsonString);
+        return json_decode($jsonString, $asArray);
     }
     public function saveRedis(Service\Redis $redisService, string $redisKey, mixed $value, ?int $expiration = null): void
     {

app/src/Middleware/API.php

@@ -6,10 +6,12 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Incoviba\Exception\MissingAuthorizationHeader;
+use Incoviba\Service;
 
 class API
 {
-    public function __construct(protected ResponseFactoryInterface $responseFactory, protected string $key) {}
+    public function __construct(protected ResponseFactoryInterface $responseFactory, protected Service\Login $loginService,
+                                protected string $key) {}
 
     public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
@@ -18,7 +20,7 @@ class API
         } catch (MissingAuthorizationHeader $exception) {
             return $this->responseFactory->createResponse(401);
         }
-        if ($this->validate($key)) {
+        if ($this->validate($request, $key)) {
             return $handler->handle($request);
         }
         return $this->responseFactory->createResponse(403);
@@ -33,8 +35,26 @@ class API
         }
         throw new MissingAuthorizationHeader();
     }
-    protected function validate($incoming_key): bool
+    protected function validate(ServerRequestInterface $request, $incoming_key): bool
     {
+        if (str_contains($incoming_key, $this->loginService->getSeparator())) {
+            list($incoming_key, $selector, $token) = explode($this->loginService->getSeparator(), $incoming_key);
+            if (!$this->loginService->isIn()) {
+                return false;
+            }
+        }
+        if (!$this->loginService->isIn() and !$this->validPermitted($request)) {
+            return false;
+        }
         return $incoming_key === md5($this->key);
     }
+    protected function validPermitted(ServerRequestInterface $request): bool
+    {
+        $uri = $request->getUri();
+        $validPaths = [
+            '/api',
+            '/api/'
+        ];
+        return in_array($uri->getPath(), $validPaths);
+    }
 }

app/src/Middleware/Authentication.php

@@ -45,13 +45,22 @@ class Authentication
         ]);
 
         $valid_paths = [
-            '/',
+            '/'
         ];
         if (in_array($current_path, $valid_paths, true)) {
             return true;
         }
+        $valid_subpaths = [
+            '/api/'
+        ];
+        foreach ($valid_subpaths as $path) {
+            if (str_starts_with($current_path, $path)) {
+                return true;
+            }
+        }
         $valid_uris = [
             $this->login_url,
+            "{$this->login_url}/",
         ];
         if (in_array($current_url, $valid_uris, true)) {
             return true;

app/src/Middleware/CORS.php

@@ -0,0 +1,21 @@
+<?php
+namespace Incoviba\Middleware;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class CORS
+{
+    public function __construct(protected ResponseFactoryInterface $responseFactory) {}
+    public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        if ($request->getMethod() === 'OPTIONS') {
+            return $this->responseFactory->createResponse()
+                ->withHeader('Access-Control-Allow-Origin', '*')
+                ->withHeader('Access-Control-Allow-Methods', 'POST,GET,OPTIONS');
+        }
+        return $handler->handle($request);
+    }
+}

app/src/Model/Inmobiliaria.php

@@ -10,8 +10,6 @@ class Inmobiliaria extends Model
     public ?string $dv;
     public ?string $razon;
     public ?string $abreviacion;
-    public ?string $cuenta;
-    public ?Banco $banco;
     public ?TipoSociedad $tipoSociedad;
 
     public function rut(): string
@@ -37,8 +35,6 @@ class Inmobiliaria extends Model
             'rut_formateado' => $this->rut(),
             'razon' => $this->razon ?? '',
             'abreviacion' => $this->abreviacion ?? '',
-            'cuenta' => $this->cuenta ?? '',
-            'banco' => $this->banco ?? '',
             'tipo_sociedad' => $this->tipoSociedad ?? ''
         ];
     }

app/src/Model/Inmobiliaria/Cuenta.php

@@ -2,6 +2,7 @@
 namespace Incoviba\Model\Inmobiliaria;
 
 use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
 
 class Cuenta extends Ideal\Model
@@ -10,6 +11,30 @@ class Cuenta extends Ideal\Model
     public Model\Banco $banco;
     public string $cuenta;
 
+    protected array $estados;
+    public function getEstados(): array
+    {
+        if (!isset($this->estados)) {
+            $this->estados = $this->runFactory('estados');
+        }
+        return $this->estados;
+    }
+    protected Model\Inmobiliaria\Cuenta\Estado $currentEstado;
+    public function currentEstado(): Model\Inmobiliaria\Cuenta\Estado
+    {
+        if (!isset($this->currentEstado)) {
+            $estados = $this->getEstados();
+            if (count($estados) === 0) {
+                throw new EmptyResult('Current Estado Cuenta');
+            }
+            usort($estados, function(Model\Inmobiliaria\Cuenta\Estado $a, Model\Inmobiliaria\Cuenta\Estado $b) {
+                return $a->id - $b->id;
+            });
+            $this->currentEstado = end($estados);
+        }
+        return $this->currentEstado;
+    }
+
     public function jsonSerialize(): mixed
     {
         return array_merge(parent::jsonSerialize(), [

app/src/Model/Inmobiliaria/Cuenta/Estado.php

@@ -0,0 +1,22 @@
+<?php
+namespace Incoviba\Model\Inmobiliaria\Cuenta;
+
+use DateTimeInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Model;
+
+class Estado extends Ideal\Model
+{
+    public Model\Inmobiliaria\Cuenta $cuenta;
+    public DateTimeInterface $fecha;
+    public bool $active;
+
+    public function jsonSerialize(): mixed
+    {
+        return array_merge(parent::jsonSerialize(), [
+            'cuenta_id' => $this->cuenta->id,
+            'fecha' => $this->fecha->format('Y-m-d'),
+            'active' => $this->active
+        ]);
+    }
+}

app/src/Model/Movimiento.php

@@ -3,6 +3,7 @@ namespace Incoviba\Model;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model\Movimiento\Detalle;
 
 class Movimiento extends Ideal\Model
@@ -19,7 +20,11 @@ class Movimiento extends Ideal\Model
     public function getDetalles(): ?Detalle
     {
         if (!isset($this->detalles)) {
-            $this->detalles = $this->runFactory('detalles');
+            try {
+                $this->detalles = $this->runFactory('detalles');
+            } catch (EmptyResult) {
+                $this->detalles = null;
+            }
         }
         return $this->detalles;
     }

app/src/Model/Venta.php

@@ -3,9 +3,6 @@ namespace Incoviba\Model;
 
 use DateTimeInterface;
 use Incoviba\Common\Ideal;
-use Incoviba\Controller\Ventas;
-use Incoviba\Model\Venta\FormaPago;
-use Incoviba\Model\Venta\Pago;
 
 class Venta extends Ideal\Model
 {
@@ -18,7 +15,7 @@ class Venta extends Ideal\Model
     public bool $relacionado;
     protected ?Venta\Entrega $entrega;
     public float $uf;
-    protected ?Pago $resciliacion;
+    protected ?Venta\Pago $resciliacion;
 
     public ?array $estados;
     public ?Venta\EstadoVenta $currentEstado;
@@ -44,6 +41,11 @@ class Venta extends Ideal\Model
         }
         return $this->formaPago;
     }
+    public function setFormaPago(Venta\FormaPago $formaPago): Venta
+    {
+        $this->formaPago = $formaPago;
+        return $this;
+    }
     public function entrega(): ?Venta\Entrega
     {
         if (!isset($this->entrega)) {
@@ -94,9 +96,9 @@ class Venta extends Ideal\Model
         }
         return $this->valor_util;
     }
-    public function saldo(string $moneda = Pago::UF): float
+    public function saldo(string $moneda = Venta\Pago::UF): float
     {
-        $valor = $this->valor * (($moneda === Pago::UF) ? 1 : $this->uf);
+        $valor = $this->valor * (($moneda === Venta\Pago::UF) ? 1 : $this->uf);
         return $valor - $this->formaPago()->total($moneda);
     }
 

app/src/Model/Venta/Propiedad.php

@@ -6,8 +6,7 @@ use Incoviba\Model;
 
 class Propiedad extends Ideal\Model
 {
-    public array $unidades;
+    public array $unidades = [];
-
     protected array $departamentos;
     public function departamentos(): array
     {

app/src/Repository/Cartola.php

@@ -65,4 +65,14 @@ class Cartola extends Ideal\Repository
             ->where('cuenta_id = ? AND fecha = ?');
         return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]);
     }
+    public function fetchLastByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ? AND fecha <= ?')
+            ->order('fecha DESC')
+            ->limit(1);
+        return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]);
+    }
 }

app/src/Repository/Inmobiliaria.php

@@ -20,13 +20,9 @@ class Inmobiliaria extends Ideal\Repository
         return 'rut';
     }
 
-    public function create(?array $data = null): Define\Model
+    public function create(?array $data = null): Model\Inmobiliaria
     {
-        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion', 'cuenta']))
+        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion']))
-            ->register('banco', (new Implement\Repository\Mapper())
-                ->setFunction(function($data) {
-                    return $this->bancoRepository->fetchById($data['banco']);
-                }))
             ->register('sociedad', (new Implement\Repository\Mapper())
                 ->setProperty('tipoSociedad')
                 ->setFunction(function($data) {
@@ -34,7 +30,7 @@ class Inmobiliaria extends Ideal\Repository
                 }));
         return $this->parseData(new Model\Inmobiliaria(), $data, $map);
     }
-    public function save(Define\Model $model): Define\Model
+    public function save(Define\Model $model): Model\Inmobiliaria
     {
         $model->rut = $this->saveNew(
             ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'],
@@ -42,7 +38,7 @@ class Inmobiliaria extends Ideal\Repository
         );
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Define\Model
+    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria
     {
         return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data);
     }

app/src/Repository/Inmobiliaria/Cuenta/Estado.php

@@ -0,0 +1,62 @@
+<?php
+namespace Incoviba\Repository\Inmobiliaria\Cuenta;
+
+use Incoviba\Common\Define;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Repository;
+use Incoviba\Model;
+
+class Estado extends Ideal\Repository
+{
+    public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria\Cuenta $cuentaRepository)
+    {
+        parent::__construct($connection);
+        $this->setTable('estados_cuentas');
+    }
+
+    public function create(?array $data = null): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $map = (new Implement\Repository\MapperParser())
+            ->register('cuenta_id', (new Implement\Repository\Mapper())
+                ->setProperty('cuenta')
+                ->setFunction(function($data) {
+                    return $this->cuentaRepository->fetchById($data['cuenta_id']);
+                }))
+            ->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
+            ->register('active', new Implement\Repository\Mapper\Boolean('active'));
+        return $this->parseData(new Model\Inmobiliaria\Cuenta\Estado(), $data, $map);
+    }
+    public function save(Define\Model $model): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $model->id = $this->saveNew([
+            'cuenta_id', 'fecha', 'active'
+        ], [
+            $model->cuenta->id, $model->fecha->format('Y-m-d'), $model->active ? 1 : 0
+        ]);
+        return $model;
+    }
+    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Cuenta\Estado
+    {
+        return $this->update($model, ['cuenta_id', 'fecha', 'active'], $new_data);
+    }
+
+    public function fetchByCuenta(int $cuenta_id): array
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ?');
+        return $this->fetchMany($query, [$cuenta_id]);
+    }
+    public function fetchLastByCuenta(int $cuenta_id): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ?')
+            ->order('id DESC')
+            ->limit(1);
+        return $this->fetchMany($query, [$cuenta_id]);
+    }
+}

app/src/Repository/Venta.php

@@ -132,9 +132,9 @@ class Venta extends Ideal\Repository
             ['propietario', 'propiedad', 'pie', 'bono_pie', 'credito', 'escritura', 'subsidio', 'escriturado',
                 'entrega', 'entregado', 'fecha', 'valor_uf', 'estado', 'fecha_ingreso', 'avalchile', 'agente', 'uf',
                 'relacionado', 'promocion', 'resciliacion', 'devolucion'],
-            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()->pie?->id, $model->formaPago()->bonoPie?->id,
+            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()?->pie?->id, $model->formaPago()?->bonoPie?->id,
-                $model->formaPago()->credito?->id, $model->formaPago()->escritura?->id, $model->formaPago()->subsidio?->id,
+                $model->formaPago()?->credito?->id, $model->formaPago()?->escritura?->id, $model->formaPago()?->subsidio?->id,
-                $model->formaPago()->escritura !== null ? $model->formaPago()->escritura->pago->fecha->format('Y-m-d') : null,
+                $model->formaPago()?->escritura !== null ? $model->formaPago()?->escritura->pago->fecha->format('Y-m-d') : null,
                 null, null, $model->fecha->format('Y-m-d'), $model->valor, 1, $model->fechaIngreso->format('Y-m-d'),
                 null, null, $model->uf, $model->relacionado ? 1 : 0, null, null, null]
         );

app/src/Repository/Venta/Propiedad.php

@@ -18,22 +18,23 @@ class Propiedad extends Ideal\Repository
     public function create(?array $data = null): Model\Venta\Propiedad
     {
         $map = (new Implement\Repository\MapperParser())
-            ->register('unidad_principal', (new Implement\Repository\Mapper())
-                ->setProperty('unidades')
-                ->setFunction(function($data) {
-                    if (isset($data['id'])) {
-                        return $this->unidadService->getByPropiedad($data['id']);
-                    }
-                    return [$this->unidadService->getById($data['unidad_principal'])];
-                }))
             ->register('estado', new Implement\Repository\Mapper\Boolean('estado'));
         return $this->parseData(new Model\Venta\Propiedad(), $data, $map);
     }
+    public function load(array $data_row): Define\Model
+    {
+        $propiedad = parent::load($data_row);
+        if (isset($propiedad->id)) {
+            $propiedad->unidades = $this->unidadService->getByPropiedad($propiedad->id);
+        }
+        return $propiedad;
+    }
+
     public function save(Define\Model $model): Model\Venta\Propiedad
     {
         $model->id = $this->saveNew(
             ['unidad_principal', 'estacionamientos', 'bodegas', 'estado'],
-            [$model->departamentos()[0]->id,
+            [null,
                 implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->estacionamientos())),
                 implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->bodegas())),
                 1]

app/src/Service/Cartola.php

@@ -44,27 +44,29 @@ class Cartola extends Service
     {
         $ms = $this->getMovimientosDiarios($cuenta->banco, $file);
 
-        $cartolaData = [
+        $this->groupedMovimientos = [];
-            'cargos' => 0,
-            'abonos' => 0,
-            'saldo' => 0
-        ];
         $movimientos = [];
         foreach ($ms as $m) {
             $movimiento = $this->buildMovimiento($cuenta, $m);
             $movimiento = $this->movimientoService->process($movimiento);
-
+            $this->groupMovimientoByDay($movimiento);
             if ($movimiento->fecha->getTimestamp() === $fecha->getTimestamp()) {
                 $movimientos []= $movimiento;
+            }
+        }
+        foreach ($this->groupedMovimientos as $timestamp => $movimientos) {
+            $cartolaData = [
+                'cargos' => 0,
+                'abonos' => 0,
+                'saldo' => end($movimientos)->saldo
+            ];
+            foreach ($movimientos as $movimiento) {
                 $cartolaData['cargos'] += $movimiento->cargo;
                 $cartolaData['abonos'] += $movimiento->abono;
             }
-            if ($movimiento->fecha->getTimestamp() > $fecha->getTimestamp()) {
+            $this->buildCartola($cuenta, end($movimientos)->fecha, $cartolaData);
-                continue;
-            }
-            $cartolaData['saldo'] = $movimiento->saldo;
         }
-        $cartola = $this->buildCartola($cuenta, $fecha, $cartolaData);
+        $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
         return compact('cartola', 'movimientos');
     }
     public function diariaManual(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): array
@@ -96,6 +98,15 @@ class Cartola extends Service
         $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file);
         return $this->bancos[strtolower($banco->nombre)]->processMovimientosDiarios($movimientos);
     }
+    protected array $groupedMovimientos = [];
+    protected function groupMovimientoByDay(Model\Movimiento $movimiento): Cartola
+    {
+        if (!isset($this->groupedMovimientos[$movimiento->fecha->getTimestamp()])) {
+            $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] = [];
+        }
+        $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] []= $movimiento;
+        return $this;
+    }
     protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Cartola
     {
         try {
@@ -121,7 +132,12 @@ class Cartola extends Service
         } catch (Exception\EmptyResult $exception) {
             $data['cuenta_id'] = $cuenta->id;
             $movimiento = $this->movimientoRepository->create($data);
-            return $this->movimientoRepository->save($movimiento);
+            try {
+                return $this->movimientoRepository->save($movimiento);
+            } catch (\PDOException $exception) {
+                $this->logger->critical(var_export($data,true));
+                throw $exception;
+            }
         }
     }
 }

app/src/Service/Cartola/BCI.php

@@ -0,0 +1,86 @@
+<?php
+namespace Incoviba\Service\Cartola;
+
+use Psr\Http\Message\UploadedFileInterface;
+use PhpOffice\PhpSpreadsheet;
+use Incoviba\Common\Ideal\Cartola\Banco;
+
+class BCI extends Banco
+{
+    protected function columnMap(): array
+    {
+        return [
+            'Fecha Transacción' => 'fecha',
+            'Cargo $ (-)' => 'cargo',
+            'Abono $ (+)' => 'abono',
+            'Descripción' => 'glosa',
+            'Saldo' => 'saldo'
+        ];
+    }
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
+    {
+        return '/tmp/cartola.xlsx';
+    }
+    protected function parseFile(string $filename): array
+    {
+        $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
+        $worksheet = $xlsx->getActiveSheet();
+        $rows = $worksheet->getRowIterator();
+
+        $rows->seek(3);
+        $row = $rows->current();
+        $columnIterator = $row->getColumnIterator();
+        $saldoFinal = 0;
+        foreach ($columnIterator as $column) {
+            if ($column->getValue() === null) {
+                continue;
+            }
+            if ($column->getCalculatedValue() === 'Saldo Contable') {
+                $columnIterator->next();
+                $column = $columnIterator->current();
+                $saldoFinal = (int) str_replace('.', '', $column->getCalculatedValue());
+                break;
+            }
+        }
+        $saldo = $saldoFinal;
+
+        $data = [];
+        $columns = [];
+        $dataFound = false;
+        foreach ($rows as $row) {
+            if (!$dataFound and $worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue() !== null
+                    and trim($worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue()) === 'Fecha Contable') {
+                $dataFound = true;
+                $columns = $this->getRowData($row);
+                continue;
+            }
+            if (!$dataFound) {
+                continue;
+            }
+            if ($worksheet->getCell([1, $row->getRowIndex()])->getValue() === null) {
+                break;
+            }
+            $rowData = $this->getRowData($row);
+            $rowData = array_combine($columns, $rowData);
+            $rowData['Fecha Transacción'] = implode('-', array_reverse(explode('/', $rowData['Fecha Transacción'])));
+            $rowData['Cargo $ (-)'] = (int) str_replace('.', '', $rowData['Cargo $ (-)'] ?? 0);
+            $rowData['Abono $ (+)'] = (int) str_replace('.', '', $rowData['Abono $ (+)'] ?? 0);
+            $rowData['Saldo'] = $saldo;
+            $saldo = $saldo + $rowData['Cargo $ (-)'] - $rowData['Abono $ (+)'];
+            unset($rowData['']);
+
+            $data []= $rowData;
+        }
+        return array_reverse($data);
+    }
+
+    protected function getRowData(PhpSpreadsheet\Worksheet\Row $row): array
+    {
+        $data = [];
+        $cells = $row->getColumnIterator();
+        foreach ($cells as $cell) {
+            $data []= $cell->getCalculatedValue();
+        }
+        return $data;
+    }
+}

app/src/Service/Cartola/Itau.php

@@ -29,12 +29,12 @@ class Itau extends Banco
             'Saldos' => 'saldo'
         ];
     }
-
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    {
+        return '/tmp/cartola.xls';
+    }
+    protected function parseFile(string $filename): array
     {
-        $filename = '/tmp/cartola.xls';
-        $uploadedFile->moveTo($filename);
-
         $reader = PhpSpreadsheet\IOFactory::createReader('Xls');
         $xlsx = $reader->load($filename);
         $sheet = $xlsx->getActiveSheet();
@@ -51,8 +51,6 @@ class Itau extends Banco
             }
         } catch (PhpSpreadsheet\Exception $exception) {
             $this->logger->critical($exception);
-        } finally {
-            unlink($filename);
         }
         return $data;
     }

app/src/Service/Cartola/Santander.php

@@ -10,7 +10,6 @@ class Santander extends Banco
 {
     protected function columnMap(): array
     {
-        // MONTO	DESCRIPCIÓN MOVIMIENTO		FECHA	N° DOCUMENTO	SUCURSAL		CARGO/ABONO
         return [
             'cargo' => 'cargo',
             'abono' => 'abono',
@@ -25,17 +24,26 @@ class Santander extends Banco
             'Saldo Diario' => 'saldo'
         ];
     }
-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
     {
-        $filename = '/tmp/cartola.xlsx';
+        $start = $uploadedFile->getStream()->read(10);
-        $uploadedFile->moveTo($filename);
+        if (str_starts_with($start, '<')) {
-
+            return '/tmp/cartola.html';
-        $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx');
-        try {
-            $xlsx = $reader->load($filename);
-        } catch (PhpSpreadsheet\Reader\Exception) {
-            return $this->parseHtml($filename);
         }
+        return '/tmp/cartola.xlsx';
+    }
+
+    protected function parseFile(string $filename): array
+    {
+        if (str_ends_with($filename, 'xlsx')) {
+            return $this->parseXlsx($filename);
+        }
+        return $this->parseHtml($filename);
+    }
+    protected function parseXlsx(string $filename): array
+    {
+        $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx');
+        $xlsx = $reader->load($filename);
         $sheet = $xlsx->getActiveSheet();
 
         $found = false;
@@ -65,7 +73,7 @@ class Santander extends Banco
                 if ($mapped === 'fecha') {
                     $value = implode('-', array_reverse(explode('/', $value)));
                 }
-                if ($column === 'MONTO') {
+                if ($column === 'MONTO' or $column === 'SALDO') {
                     $value = (int) $value;
                 }
                 $rowData[$column] = $value;
@@ -81,7 +89,7 @@ class Santander extends Banco
             $data []= $rowData;
         }
 
-        return $data;
+        return array_reverse($data);
     }
     protected function parseHtml(string $filename): array
     {
@@ -108,11 +116,11 @@ class Santander extends Banco
             foreach (['Cargo ($)', 'Abono ($)', 'Saldo Diario'] as $column) {
                 $row[$column] = (int) str_replace('.', '', $row[$column]);
             }
-            $row['Saldo Diario'] -= ($row['Abono ($)'] - $row['Cargo ($)']);
             $row['N° DOCUMENTO'] = '';
             $data []= $row;
         }
-        return $data;
+
+        return array_reverse($data);
     }
     protected function parseHtmlRow(array $lines, int &$rowIndex): array
     {

app/src/Service/Cartola/Security.php

@@ -16,14 +16,21 @@ class Security extends Banco
         return $movimientos;
     }
 
-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
     {
         $stream = $uploadedFile->getStream();
         $stream->seek(3);
         if ($stream->read(strlen('table')) === 'table') {
-            return $this->processHtm($uploadedFile);
+            return '/tmp/cartola.htm';
         }
-        return $this->processXls($uploadedFile);
+        return '/tmp/cartola.xls';
+    }
+    protected function parseFile(string $filename): array
+    {
+        if (str_ends_with($filename, '.htm')) {
+            return $this->processHtm($filename);
+        }
+        return $this->processXls($filename);
     }
     protected function columnMap(): array
     {
@@ -38,10 +45,8 @@ class Security extends Banco
         ];
     }
 
-    private function processXls(UploadedFileInterface $file): array
+    private function processXls(string $filename): array
     {
-        $filename = '/tmp/cartola.xls';
-        $file->moveTo($filename);
         $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
         $worksheet = $xlsx->getActiveSheet();
         $rows = $worksheet->getRowIterator(3);
@@ -82,14 +87,10 @@ class Security extends Banco
                 $data []= $rowData;
             }
         }
-        unlink($filename);
         return $data;
     }
-    private function processHtm(UploadedFileInterface $file): array
+    private function processHtm(string $filename): array
     {
-        $filename = '/tmp/cartola.htm';
-        $file->moveTo($filename);
-
         $domDocument = new DOMDocument();
         $domDocument->loadHTML('<body>' . file_get_contents($filename) . '</body>');
 
@@ -122,7 +123,6 @@ class Security extends Banco
             }
             $data []= $rowData;
         }
-
         return $data;
     }
 }

app/src/Service/Contabilidad/Informe/Tesoreria.php

@@ -4,7 +4,6 @@ namespace Incoviba\Service\Contabilidad\Informe;
 use DateTimeInterface;
 use DateInterval;
 use Psr\Log\LoggerInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
@@ -13,14 +12,14 @@ use Incoviba\Service;
 
 class Tesoreria extends Ideal\Service
 {
-    public function __construct(LoggerInterface $logger,
+    public function __construct(LoggerInterface                                        $logger,
-                                protected Repository\Inmobiliaria $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria                      $inmobiliariaRepository,
-                                protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
+                                protected Service\Inmobiliaria\Cuenta                  $cuentaService,
-                                protected Repository\Deposito $depositoRepository,
+                                protected Repository\Deposito                          $depositoRepository,
-                                protected Repository\Cartola $cartolaRepository,
+                                protected Repository\Cartola                           $cartolaRepository,
-                                protected Repository\Movimiento $movimientoRepository,
+                                protected Repository\Movimiento                        $movimientoRepository,
                                 protected Service\Contabilidad\Informe\Tesoreria\Excel $excelService,
-                                protected Service\Contabilidad\Informe\Tesoreria\PDF $pdfService)
+                                protected Service\Contabilidad\Informe\Tesoreria\PDF   $pdfService)
     {
         parent::__construct($logger);
 
@@ -170,7 +169,7 @@ class Tesoreria extends Ideal\Service
         };
         $dataInmobiliaria->inmobiliaria = $inmobiliaria;
         try {
-            $cuentas = $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut);
+            $cuentas = $this->cuentaService->getAllActiveByInmobiliaria($inmobiliaria->rut);
         } catch (Implement\Exception\EmptyResult) {
             return $dataInmobiliaria;
         }
@@ -228,12 +227,14 @@ class Tesoreria extends Ideal\Service
                     }
                 }
             } catch (Implement\Exception\EmptyResult) {}
+            $anterior = $this->getAnterior($fecha);
             try {
-                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
+                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $fecha);
                 $data->actual = $cartola->saldo;
+                //$anterior = $this->getAnterior($cartola->fecha);
             } catch (Implement\Exception\EmptyResult) {}
             try {
-                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $this->getAnterior($fecha));
+                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $anterior);
                 $data->anterior = $cartola->saldo;
             } catch (Implement\Exception\EmptyResult) {}
             if ($data->diferencia() !== 0) {
@@ -289,5 +290,4 @@ class Tesoreria extends Ideal\Service
         $this->totales->{$tipo} += $total;
         return $this;
     }
-
 }

app/src/Service/Inmobiliaria/Cuenta.php

@@ -0,0 +1,56 @@
+<?php
+namespace Incoviba\Service\Inmobiliaria;
+
+use DateTimeImmutable;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal\Service;
+use Incoviba\Common\Implement;
+use Incoviba\Model;
+use Incoviba\Repository;
+
+class Cuenta extends Service
+{
+    public function __construct(LoggerInterface $logger, protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
+                                protected Repository\Inmobiliaria\Cuenta\Estado $estadoRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    public function getAllActive(): array
+    {
+        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchAll());
+        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
+            return $cuenta->currentEstado()->active;
+        }));
+    }
+    public function getAllActiveByInmobiliaria(int $inmobiliaria_rut): array
+    {
+        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria_rut));
+        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
+            return $cuenta->currentEstado()->active;
+        }));
+    }
+    public function add(array $data): Model\Inmobiliaria\Cuenta
+    {
+        $cuenta = $this->cuentaRepository->create($data);
+        $cuenta = $this->cuentaRepository->save($cuenta);
+        $dataEstado = [
+            'cuenta_id' => $cuenta->id,
+            'fecha' => new DateTimeImmutable(),
+            'active' => true
+        ];
+        $estado = $this->estadoRepository->create($dataEstado);
+        $this->estadoRepository->save($estado);
+        return $this->process($cuenta);
+    }
+
+    protected function process(Model\Inmobiliaria\Cuenta $cuenta): Model\Inmobiliaria\Cuenta
+    {
+        $cuenta->addFactory('estados', (new Implement\Repository\Factory())
+            ->setCallable(function($cuenta_id) {
+                return $this->estadoRepository->fetchByCuenta($cuenta_id);
+            })
+            ->setArgs(['cuenta_id' => $cuenta->id]));
+        return $cuenta;
+    }
+}

app/src/Service/Login.php

@@ -47,7 +47,24 @@ class Login
         }
         return $login->user;
     }
-
+    public function getToken(): string
+    {
+        return implode($this->cookie_separator, [$this->selector, $this->token]);
+    }
+    public function getSeparator(): string
+    {
+        return $this->cookie_separator;
+    }
+    public function validateUser(Model\User $user, string $encryptedPassword): bool
+    {
+        list($passphrase, $encrypted) = $this->splitPassword($encryptedPassword);
+        try {
+            $password = $this->cryptoJs_aes_decrypt($encrypted, $passphrase);
+        } catch (Exception) {
+            return false;
+        }
+        return $user->validate($password);
+    }
     public function login(Model\User $user): bool
     {
         try {
@@ -97,6 +114,10 @@ class Login
             return;
         }
         $cookie = $_COOKIE[$this->cookie_name];
+        if (!str_contains($cookie, $this->cookie_separator)) {
+            $this->removeCookie();
+            return;
+        }
         list($this->selector, $this->token) = explode($this->cookie_separator, $cookie);
     }
     protected function saveCookie(string $selector, string $token, DateTimeInterface $expires): void
@@ -104,9 +125,12 @@ class Login
         setcookie(
             $this->cookie_name,
             implode($this->cookie_separator, [$selector, $token]),
-            $expires->getTimestamp(),
+            [
-            $this->path,
+                'expires' => $expires->getTimestamp(),
-            $this->domain
+                'path' => $this->path,
+                'domain' => $this->domain,
+                'samesite' => 'Strict'
+            ]
         );
         $this->selector = $selector;
         $this->token = $token;
@@ -126,10 +150,70 @@ class Login
     {
         return password_verify($this->token, $login->token);
     }
-    protected function generateToken(Model\Login $login)
+    protected function generateToken(Model\Login $login): array
     {
         $selector = bin2hex(random_bytes(12));
         $token = bin2hex(random_bytes(20));
         return ['selector' => $selector, 'token' => $token];
     }
+
+    protected function splitPassword(string $input): array
+    {
+        $ini = strpos($input, 'U');
+        $passphrase = substr($input, 0, $ini);
+        $message = substr($input, $ini);
+        return [$passphrase, $message];
+    }
+    protected function cryptoJs_aes_decrypt($data, $key): string
+    {
+        $data = base64_decode($data);
+        if (substr($data, 0, 8) != "Salted__") {
+            return false;
+        }
+        $salt = substr($data, 8, 8);
+        $keyAndIV = $this->aes_evpKDF($key, $salt);
+        $decrypted = openssl_decrypt(
+            substr($data, 16),
+            "aes-256-cbc",
+            $keyAndIV["key"],
+            OPENSSL_RAW_DATA, // base64 was already decoded
+            $keyAndIV["iv"]
+        );
+        if ($decrypted === false) {
+            throw new Exception();
+        }
+        return $decrypted;
+    }
+    protected function aes_evpKDF($password, $salt, $keySize = 8, $ivSize = 4, $iterations = 1, $hashAlgorithm = "md5"): array
+    {
+        $targetKeySize = $keySize + $ivSize;
+        $derivedBytes = "";
+        $numberOfDerivedWords = 0;
+        $block = NULL;
+        $hasher = hash_init($hashAlgorithm);
+        while ($numberOfDerivedWords < $targetKeySize) {
+            if ($block != NULL) {
+                hash_update($hasher, $block);
+            }
+            hash_update($hasher, $password);
+            hash_update($hasher, $salt);
+            $block = hash_final($hasher, TRUE);
+            $hasher = hash_init($hashAlgorithm);
+
+            // Iterations
+            for ($i = 1; $i < $iterations; $i++) {
+                hash_update($hasher, $block);
+                $block = hash_final($hasher, TRUE);
+                $hasher = hash_init($hashAlgorithm);
+            }
+
+            $derivedBytes .= substr($block, 0, min(strlen($block), ($targetKeySize - $numberOfDerivedWords) * 4));
+
+            $numberOfDerivedWords += strlen($block) / 4;
+        }
+        return array(
+            "key" => substr($derivedBytes, 0, $keySize * 4),
+            "iv"  => substr($derivedBytes, $keySize * 4, $ivSize * 4)
+        );
+    }
 }

app/src/Service/Venta.php

@@ -104,7 +104,7 @@ class Venta extends Service
         $data['uf'] = $this->moneyService->getUF($fecha);
         $propietario = $this->addPropietario($data);
         $propiedad = $this->addPropiedad($data);
-        $forma_pago = $this->addFormaPago($data);
+        $formaPago = $this->addFormaPago($data);
         $venta_data = [
             'propietario' => $propietario->rut,
             'propiedad' => $propiedad->id,
@@ -116,14 +116,15 @@ class Venta extends Service
         $map = ['pie', 'subsidio', 'credito', 'bono_pie'];
         foreach ($map as $field) {
             $name = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $field))));
-            if (isset($forma_pago->{$name})) {
+            if (isset($formaPago->{$name})) {
-                $venta_data[$field] = $forma_pago->{$name}->id;
+                $venta_data[$field] = $formaPago->{$name}->id;
             }
         }
         try {
             return $this->ventaRepository->fetchByPropietarioAndPropiedad($propietario->rut, $propiedad->id);
         } catch (Implement\Exception\EmptyResult) {
             $venta = $this->ventaRepository->create($venta_data);
+            $venta->setFormaPago($formaPago);
             $venta = $this->ventaRepository->save($venta);
 
             $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('vigente');
@@ -231,7 +232,7 @@ class Venta extends Service
     protected function addPropiedad(array $data): Model\Venta\Propiedad
     {
         $ids = array_filter($data, function($key) {
-            return str_contains($key, 'unidad');
+            return str_starts_with($key, 'unidad');
         }, ARRAY_FILTER_USE_KEY);
 
         return $this->propiedadService->addPropiedad($ids);
@@ -239,85 +240,7 @@ class Venta extends Service
     protected function addFormaPago(array $data): Model\Venta\FormaPago
     {
         return $this->formaPagoService->add($data);
-        /*$fields = [
-            'pie',
-            'subsidio',
-            'credito',
-            'bono_pie'
-        ];
-        $forma_pago = new Model\Venta\FormaPago();
-        foreach ($fields as $name) {
-            if (isset($data["has_{$name}"])) {
-                $method = 'add' . str_replace(' ', '', ucwords(str_replace('_', ' ', $name)));
-                $obj = $this->{$method}($data);
-                $forma_pago->{$name} = $obj;
-            }
-        }
-        return $forma_pago;*/
     }
-    /*protected function addPie(array $data): Model\Venta\Pie
-    {
-        $fields = array_fill_keys([
-            'fecha_venta',
-            'pie',
-            'cuotas',
-            'uf'
-        ], 0);
-        $filtered_data = array_intersect_key($data, $fields);
-        $mapped_data = array_combine([
-            'fecha',
-            'valor',
-            'cuotas',
-            'uf'
-        ], $filtered_data);
-        $mapped_data['valor'] = $this->cleanValue($mapped_data['valor']);
-        return $this->pieService->add($mapped_data);
-    }
-    protected function addSubsidio(array $data): Model\Venta\Subsidio
-    {
-        $fields = array_fill_keys([
-            'fecha_venta',
-            'ahorro',
-            'subsidio',
-            'uf'
-        ], 0);
-        $filtered_data = array_intersect_key($data, $fields);
-        $mapped_data = array_combine([
-            'fecha',
-            'ahorro',
-            'subsidio',
-            'uf'
-        ], $filtered_data);
-        return $this->subsidioService->add($mapped_data);
-    }
-    protected function addCredito(array $data): Model\Venta\Credito
-    {
-        $fields = array_fill_keys([
-            'fecha_venta',
-            'credito',
-            'uf'
-        ], 0);
-        $filtered_data = array_intersect_key($data, $fields);
-        $mapped_data = array_combine([
-            'fecha',
-            'valor',
-            'uf'
-        ], $filtered_data);
-        return $this->creditoService->add($mapped_data);
-    }
-    protected function addBonoPie(array $data): Model\Venta\BonoPie
-    {
-        $fields = array_fill_keys([
-            'fecha_venta',
-            'bono_pie'
-        ], 0);
-        $filtered_data = array_intersect_key($data, $fields);
-        $mapped_data = array_combine([
-            'fecha',
-            'valor'
-        ], $filtered_data);
-        return $this->bonoPieService->add($mapped_data);
-    }*/
     protected function addEstado(Model\Venta $venta, Model\Venta\TipoEstadoVenta $tipoEstadoVenta, array $data): void
     {
         $fecha = new DateTimeImmutable($data['fecha']);

app/src/Service/Venta/Cuota.php

@@ -75,10 +75,11 @@ class Cuota
     }
     public function getByPie(int $pie_id): array
     {
-        return $this->cuotaRepository->fetchByPie($pie_id);
+	try {
-        /*return array_filter($this->cuotaRepository->fetchByPie($pie_id), function(Model\Venta\Cuota $cuota) {
+            return $this->cuotaRepository->fetchByPie($pie_id);
-            return !in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado']);
+	} catch (EmptyResult) {
-        });*/
+	    return [];
+	}
     }
     public function getVigenteByPie(int $pie_id): array
     {

app/src/Service/Venta/FormaPago.php

@@ -77,7 +77,6 @@ class FormaPago extends Ideal\Service
             'uf'
         ], 0);
         $filtered_data = array_intersect_key($data, $fields);
-        $this->logger->critical(var_export($filtered_data,true));
         $mapped_data = array_combine([
             'fecha',
             'valor',

app/src/Service/Venta/Propiedad.php

@@ -3,18 +3,23 @@ namespace Incoviba\Service\Venta;
 
 use PDO;
 use PDOException;
+use Psr\Log\LoggerInterface;
 use Incoviba\Common\Define;
+use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Repository;
 use Incoviba\Model;
 
-class Propiedad
+class Propiedad extends Service
 {
     public function __construct(
+        LoggerInterface $logger,
         protected Repository\Venta\Propiedad $propiedadRepository,
         protected Repository\Venta\Unidad $unidadRepository,
         protected Define\Connection $connection
-    ) {}
+    ) {
+        parent::__construct($logger);
+    }
 
     public function addPropiedad(array $ids): Model\Venta\Propiedad
     {

app/tests/performance/APITest.php

@@ -0,0 +1,17 @@
+<?php
+namespace ProVM\Performance;
+
+use GuzzleHttp\Client;
+use PHPUnit\Framework;
+
+class APITest extends Framework\TestCase
+{
+    public function testLoad(): void
+    {
+        $client = new Client(['base_uri' => 'http://proxy']);
+        $start = microtime(true);
+        $response = $client->get('/api', ['headers' => ['Authorization'  => 'Bearer ' . md5($_ENV['API_KEY'])]]);
+        $end = microtime(true);
+        $this->assertLessThanOrEqual(1000, $end - $start);
+    }
+}

app/tests/performance/HomeTest.php

@@ -0,0 +1,17 @@
+<?php
+namespace ProVM\Performance;
+
+use GuzzleHttp\Client;
+use PHPUnit\Framework;
+
+class HomeTest extends Framework\TestCase
+{
+    public function testLoad(): void
+    {
+        $client = new Client(['base_uri' => 'http://proxy']);
+        $start = microtime(true);
+        $response = $client->get('');
+        $end = microtime(true);
+        $this->assertLessThanOrEqual(1000, $end - $start);
+    }
+}

app/tests/units/common/Alias/ViewTest.php

@@ -0,0 +1,36 @@
+<?php
+namespace ProVM\Test\Common\Alias;
+
+use Incoviba\Common\Alias\View;
+use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+class ViewTest extends TestCase
+{
+    public function testRender(): void
+    {
+        $contents = <<<HTML
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf8" />
+    <title>Test</title>
+</head>
+<body>
+Test
+</body>
+</html>
+HTML;
+        mkdir('/tmp/views');
+        mkdir('/tmp/cache', 777);
+        file_put_contents('/tmp/views/test.blade.php', $contents);
+        $view = new View('/tmp/views', '/tmp/cache');
+        $body = $this->getMockBuilder(StreamInterface::class)->getMock();
+        $body->method('getContents')->willReturn($contents);
+        $response = $this->getMockBuilder(ResponseInterface::class)->getMock();
+        $response->method('getBody')->willReturn($body);
+        $output = $view->render($response, 'test');
+        $this->assertEquals($contents, $output->getBody()->getContents());
+    }
+}

app/tests/units/common/Implement/ConnectionTest.php

@@ -0,0 +1,8 @@
+<?php
+namespace ProVM\Test\Common\Implement;
+
+use PHPUnit\Framework\TestCase;
+
+class ConnectionTest extends TestCase
+{
+}

app/tests/units/src/Service/MenuTest.php

@@ -0,0 +1,50 @@
+<?php
+namespace ProVM\Test\Service;
+
+use PHPUnit\Framework\TestCase;
+use Incoviba\Common\Define;
+use Incoviba\Model;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class MenuTest extends TestCase
+{
+    public function testBuild(): void
+    {
+        $tests = mt_rand(10, 100);
+        for ($i = 0; $i < $tests; $i ++) {
+            list($expected, $menu) = $this->generateBuildTest();
+            $this->assertEquals($expected, $menu->build(1));
+        }
+    }
+    protected function generateBuildTest(): array
+    {
+        $modelCount = mt_rand(3, 100);
+        $expected = [];
+        $models = [];
+        for ($j = 0; $j < $modelCount; $j ++) {
+            $model = $this->generateModel();
+            $models []= $model;
+            $expected []= "<a class=\"item\" href=\"http://localhost/url{$model->id}\">title{$model->id}</a>";
+        }
+        $expected = implode(PHP_EOL, $expected);
+        $connection = $this->getMockBuilder(Define\Connection::class)->getMock();
+        $repository = $this->getMockBuilder(Repository\Menu::class)->setConstructorArgs(compact('connection'))->getMock();
+        $permissionsRepository = $this->getMockBuilder(Repository\Permission::class)->setConstructorArgs(compact('connection'))->getMock();
+        $permissions = $this->getMockBuilder(Service\Permission::class)->setConstructorArgs([$permissionsRepository])->getMock();
+        $repository->method('fetchByUser')->willReturn($models);
+        $menu = new Service\Menu($repository, $permissions, (object) ['base' => 'http://localhost']);
+
+        return [$expected, $menu];
+    }
+    protected function generateModel(): Model\Menu
+    {
+        $id = mt_rand(1, 100000);
+        $model = $this->getMockBuilder(Model\Menu::class)->getMock();
+        $model->id = $id;
+        $model->url = "url{$id}";
+        $model->title = "title{$id}";
+
+        return $model;
+    }
+}

docker-compose.yml

@@ -83,6 +83,16 @@ services:
       - ${CLI_PATH:-.}:/code
       - ./logs/cli:/logs
 
+  testing:
+    profiles:
+      - testing
+    container_name: incoviba_tests
+    extends:
+      service: web
+    volumes:
+      - ./logs/test:/logs
+    command: [ '/code/vendor/bin/phpunit-watcher', 'watch' ]
+
 volumes:
   dbdata: {}
   incoviba_redis: {}

php-xdebug.ini

@@ -0,0 +1,2 @@
+[xdebug]
+xdebug.mode=coverage