[Noalyss-commit] [noalyss] 03/13: Bug : fiche account not created automatically when empty , improve test

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit f1ea56101d51587aac4e27fb722d337eeef2a992
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Mon Aug 23 20:12:18 2021 +0200

    Bug : fiche account not created automatically when empty , improve test
---
 include/class/card_property.class.php  |   6 +-
 include/class/fiche.class.php          |   7 +-
 include/constant.php                   |   2 +-
 include/sql/patch/upgrade166.sql       | 120 ++++++++++++++++++++++
 unit-test/include/class/fiche.Test.php | 181 +++++++++++++++++++++++++++++++--
 5 files changed, 300 insertions(+), 16 deletions(-)

diff --git a/include/class/card_property.class.php 
b/include/class/card_property.class.php
index 69bc864..76617a7 100644
--- a/include/class/card_property.class.php
+++ b/include/class/card_property.class.php
@@ -495,7 +495,6 @@ class Card_Property
                             if (mb_strlen($part2)>40)
                                 throw new Exception("CP476."._("Poste 
comptable trop long"), 1);
 
-                            $part1=$p_fiche->cn->get_value('select 
format_account($1)', array($part1));
                             $acc_account1=new Acc_Account($p_fiche->cn, 
$part1);
 
                             if ($acc_account1->get_parameter("id")==-1)
@@ -513,7 +512,6 @@ class Card_Property
                                 throw new Exception("CP493."._("Utilisation 
directe interdite du poste comptable $part1"));
                             }
                             // Part 2
-                            $part2=$p_fiche->cn->get_value('select 
format_account($1)', array($part2));
                             $acc_account2=new Acc_Account($p_fiche->cn, 
$part2);
 
                             if ($acc_account2->get_parameter("id")==-1)
@@ -556,7 +554,7 @@ class Card_Property
                                 throw new Exception("CP537."._("Utilisation 
directe interdite du poste comptable $v"));
                             }
                         }
-                        $sql=sprintf("select account_update(%d,'%s')", 
$p_fiche->id, $v);
+                        $sql=sprintf("select account_insert(%d,'%s')", 
$p_fiche->id, $v);
                         try
                         {
                             $p_fiche->cn->exec_sql($sql);
@@ -570,7 +568,7 @@ class Card_Property
                     if (strlen(trim($v))==0)
                     {
 
-                        $sql=sprintf("select account_update(%d,null)", 
$p_fiche->id);
+                        $sql=sprintf("select account_insert(%d,null)", 
$p_fiche->id);
                         try
                         {
                             $Ret=$p_fiche->cn->exec_sql($sql);
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index a5033a9..d88ee21 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -139,7 +139,7 @@ class Fiche
      * \param $p_qcode quick_code (ad_id=23)
      * \param $p_all retrieve all the attribut of the card, possible value
      * are true or false. false retrieves only the f_id. By default true
-     * \return 0 success 1 error not found
+     * \returns 0 success , card found / 1 error card not found
      */
     function get_by_qcode($p_qcode=null,$p_all=true)
     {
@@ -477,8 +477,11 @@ class Fiche
                     $this->setAttribut($property->ad_id, $p_array[$key]);
                 }
             }
+            // For accounting 
+            
             Card_Property::update($this);
-            $this->quick_code=$this->strAttribut(ATTR_DEF_QUICKCODE);
+            // reread from database
+            $this->getAttribut();
         }
         catch (Exception $e)
         {
diff --git a/include/constant.php b/include/constant.php
index ab35454..474486e 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -116,7 +116,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",166);
+define ("DBVERSION",167);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",20);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade166.sql b/include/sql/patch/upgrade166.sql
new file mode 100644
index 0000000..73c4433
--- /dev/null
+++ b/include/sql/patch/upgrade166.sql
@@ -0,0 +1,120 @@
+begin;
+
+
+CREATE OR REPLACE FUNCTION comptaproc.attribut_insert(p_f_id integer, p_ad_id 
integer, p_value character varying)
+ RETURNS void
+ AS $function$
+declare 
+       nResult bigint;
+begin
+       update fiche_detail set ad_value=p_value where ad_id=p_ad_id and 
f_id=p_f_id returning jft_id into nResult;
+       if nResult is null then
+               insert into fiche_detail (f_id,ad_id, ad_value) values 
(p_f_id,p_ad_id,p_value);
+       end if;
+
+return;
+end;
+$function$
+LANGUAGE plpgsql;
+ 
+CREATE OR REPLACE FUNCTION comptaproc.account_insert(p_f_id integer, p_account 
text)
+ RETURNS text
+AS $function$
+declare
+       nParent tmp_pcmn.pcm_val_parent%type;
+       sName varchar;
+       sNew tmp_pcmn.pcm_val%type;
+       bAuto bool;
+       nFd_id integer;
+       sClass_Base fiche_def.fd_class_base%TYPE;
+       nCount integer;
+       first text;
+       second text;
+       s_account text;
+begin
+       raise info 'ai17 : param card % account %',p_f_id,p_account;
+       -- accouting is given
+       if p_account is not null and length(trim(p_account)) != 0 then
+       -- if there is coma in p_account, treat normally
+               if position (',' in p_account) = 0 then
+                       raise info 'ai20.p_account is not empty';
+                               s_account := format_account(substr( p_account,1 
, 40)::account_type);
+                               select count(*)  into nCount from tmp_pcmn 
where pcm_val=s_account::account_type;
+                               raise notice 'ai24.found in tmp_pcm %',nCount;
+                               if nCount !=0  then
+                                       raise info 'ai25.this account exists in 
tmp_pcmn ';
+                                       perform 
attribut_insert(p_f_id,5,s_account);
+                                  else
+                                      -- account doesn't exist, create it
+                                       select ad_value into sName from
+                                               fiche_detail
+                                       where
+                                       ad_id=1 and f_id=p_f_id;
+
+                                       
nParent:=account_parent(s_account::account_type);
+                                       insert into 
tmp_pcmn(pcm_val,pcm_lib,pcm_val_parent) values 
(s_account::account_type,sName,nParent);
+                                       perform 
attribut_insert(p_f_id,5,s_account);
+                                       
+                               end if;
+                               return s_account;
+               else
+                       raise info 'ai42.presence of a comma';
+                       -- there is 2 accounts separated by a comma
+                       first := split_part(p_account,',',1);
+                       second := split_part(p_account,',',2);
+                       -- check there is no other coma
+                       raise info 'first value % second value %', first, 
second;
+
+               if  position (',' in first) != 0 or position (',' in second) != 
0 then
+                       raise exception 'Too many comas, invalid account';
+               end if;
+               perform attribut_insert(p_f_id,5,p_account);
+               
+               end if;
+       raise info 'ai55 : end ';
+       return s_account;
+       end if;
+
+-- accouting is empty and must be computed
+---------------------------------------------------
+       raise info 'ai61 : p_account is  empty';
+               select fd_id into nFd_id from fiche where f_id=p_f_id;
+               bAuto:= account_auto(nFd_id);
+
+               select fd_class_base into sClass_base from fiche_def where 
fd_id=nFd_id;
+raise info 'ai67.sClass_Base : %',sClass_base;
+               if bAuto = true and sClass_base similar to '[[:digit:]]*'  then
+                       raise info 'ai66.account generated automatically';
+                       sNew:=account_compute(p_f_id);
+                       raise info 'ai68.sNew %', sNew;
+                       select ad_value into sName from
+                               fiche_detail
+                       where
+                               ad_id=1 and f_id=p_f_id;
+                       nParent:=account_parent(sNew);
+                       sNew := account_add  (sNew,sName);
+                       raise info 'ai78.sNew % name %s', sNew,sName;
+                       perform attribut_insert(p_f_id,5,sNew);
+                       return sNew;
+               else
+               -- if there is an account_base then it is the default
+                   raise info 'ai82.account NOT generated automatically and 
class_base is [%]',sClass_base;
+                       if trim(coalesce(sClass_base::text,'')) = '' then
+                               raise notice 'ai81.count is null';
+                                perform attribut_insert(p_f_id,5,null);
+                       else
+                               raise notice 'ai87.Class base in the 
Accounting';
+                                perform attribut_insert(p_f_id,5,sClass_base);
+                       end if;
+                       return sClass_base;
+               end if;
+
+raise notice 'ai89.account_insert nothing done : error';
+
+end;
+$function$
+LANGUAGE plpgsql;
+
+insert into version (val,v_description) values (167,'Card accounting created 
automatically');
+commit ;
+
diff --git a/unit-test/include/class/fiche.Test.php 
b/unit-test/include/class/fiche.Test.php
index 77175bb..3c14f1b 100644
--- a/unit-test/include/class/fiche.Test.php
+++ b/unit-test/include/class/fiche.Test.php
@@ -308,7 +308,7 @@ class FicheTest extends TestCase
     }
 
     /**
-     * @testdox Test if it is possible to insert e a empty quickcode
+     * @testdox testInsertEmptyQuickCode Test if it is possible to insert an  
empty quickcode
      * @dataProvider dataEmptyQuickCode
      */
     public function testInsertEmptyQuickCode($name, $quick_code)
@@ -339,7 +339,7 @@ class FicheTest extends TestCase
     }
 
     /**
-     * @testdox Test if it is possible to update a empty quickcode
+     * @testdox testUpdateEmptyQuickCode Test if it is possible to update an 
empty quickcode
      * @dataProvider dataUpdateQuickCode
      */
     public function testUpdateEmptyQuickCode($name, $quick_code)
@@ -362,8 +362,6 @@ where
             in (select j1.ad_id from jnt_fic_attr j1 where j1.fd_id=$1)
     and a1.ad_type = $2",[$fiche_def_id,'card']);
         foreach ($aAttribute as $nAttribute) {
-            var_dump($nAttribute);
-
             $fiche_def->insertAttribut($nAttribute['ad_id']);
         }
         // related cards
@@ -484,21 +482,22 @@ where
         $fiche->remove();
     }
     /**
-     * @testdox quickcode is generated and get a number if already exists
+     * @testdox testQuickCodeNumbering quickcode is generated with number if 
duplicate
      */
     public function testQuickCodeNumbering()
     {
         global $g_connection;
         $fiche=new Fiche($g_connection);
-        $fiche->insert(2,array("av_text1"=>'Base Card','av_text23'=>'DUP'));
+        $fiche->insert(2,array("av_text1"=>'Card for 
PHPUNIT','av_text23'=>'DUP'));
         $this->assertTrue($fiche->id > 0 && 'DUP'==$fiche->strAttribut(23),
             'error : card created with wrong 
quickcode'.$fiche->strAttribut(23));
         for ($i=0;$i<100;$i++) {
             $fiche_duplicate = new Fiche($g_connection);
             $fiche_duplicate->insert(2, array("av_text1" => 'Base Card' . $i, 
'av_text23' => 'DUP'));
-         /*   $this->assertTrue($fiche_duplicate->id > $fiche->id && 'DUP' . 
$i == $fiche_duplicate->strAttribut(23),
-                'error : card created with empty 
quickcode'.$fiche_duplicate->strAttribut(23));
-         */
+            
+            $this->assertTrue($fiche_duplicate->id > $fiche->id && 'DUP' . $i 
== $fiche_duplicate->strAttribut(23),
+                " error : card created with  quickcode 
{$fiche_duplicate->strAttribut(23)} expected DUP{$i}");
+         
         }
         $a_fiche_clean=$g_connection->get_array("select f_id from fiche where 
f_id >= $1",
                     [$fiche->id]);
@@ -511,4 +510,168 @@ where
                 ,"Card not removed");
         }
     }
+    /**
+     * Create a card
+     * @global type $g_connection
+     * @param type $p_qcode
+     * @returns \Fiche
+     */
+    public function build_fiche($p_category,$p_qcode)
+    {
+                // insert a card in category 2 with automatic set 
+        global $g_connection;
+        $fiche=new Fiche($g_connection);
+        if ( $fiche->get_by_qcode($p_qcode) == 0 ) 
+        {
+            $fiche->remove();
+        }
+        
+        $fiche->insert($p_category,array("av_text1"=>'Card for 
PHPUNIT','av_text23'=>$p_qcode));
+        $this->assertTrue($fiche->id > 0 && $p_qcode==$fiche->strAttribut(23),
+            'error : card created with wrong 
quickcode'.$fiche->strAttribut(23));
+        return $fiche;
+    }
+    /**
+     * @testdox testAutomaticAccountingUpdate test accounting automatic 
compute(update)
+     */
+    public function testAutomaticAccountingUpdate()
+    {
+        global $g_connection;
+        $g_connection->exec_sql("delete from tmp_pcmn where pcm_val like 
'6000%'");
+        
+        $fiche_def=new Fiche_Def($g_connection,2);
+        $fiche_def->set_autocreate(true);
+        $fiche_def->save_class_base('600');
+        $fiche=$this->build_fiche(2,'TESTACCOUNT');
+        $start=$fiche->id;
+        
$this->assertEquals('600001',$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+        $aAccount=array();
+        for ( $i=600002; $i < 600999;$i++) {
+           $fiche->setAttribut(ATTR_DEF_ACCOUNT, "");
+           Card_Property::update($fiche);
+           $fiche->load();
+           
$this->assertEquals($i,$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+           $aAccount[]="'$i'";
+            
+        }
+        $sAccount=join(",",$aAccount);
+       $g_connection->exec_sql("delete from tmp_pcmn where pcm_val in 
($sAccount)");
+       $g_connection->exec_sql("delete from fiche_detail where f_id >= 
$1",[$start]);
+       $g_connection->exec_sql("delete from fiche where f_id >= $1",[$start]);
+    }
+    /**
+     * @testdox testAutomaticAccountingInsert test accounting automatic 
compute (insert)
+     */
+    public function testAutomaticAccountingInsert()
+    {
+
+        global $g_connection;
+        $g_connection->exec_sql("delete from tmp_pcmn where pcm_val like 
'6000%'");
+          
+        $fiche_def=new Fiche_Def($g_connection,2);
+        $fiche_def->set_autocreate(true);
+        $fiche_def->save_class_base('600');
+        $first=true;
+        $aAccount=array();
+        for ( $i=600001; $i <  601000;$i++) {
+            $fiche=new Fiche($g_connection);
+            $fiche->insert(2,['av_text1'=>'PHPUNIT '.__FUNCTION__]);
+            if ( $first ) { 
+                $first=false;
+                $start=$fiche->id;
+            }
+           $fiche->load();
+           
$this->assertEquals($i,$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+            $aAccount[]="'$i'";
+        }
+          $sAccount=join(",",$aAccount);
+       $g_connection->exec_sql("delete from tmp_pcmn where pcm_val in 
($sAccount)");
+       $g_connection->exec_sql("delete from fiche_detail where f_id >= 
$1",[$start]);
+       $g_connection->exec_sql("delete from fiche where f_id >= $1",[$start]);
+
+    }
+    public function dataAccount()
+    {
+        return array(
+            ['600002','600002'],
+            ['600100','600100'],
+            ['6500','6500']
+        );
+    }
+    /**
+     * @brief test insert of the accounting
+     * @testdox testAccountInsert Set  of the accounting while inserting
+     * @dataProvider dataAccount
+     */
+    public function testAccountInsert($p_value,$p_expected)
+    {
+          global $g_connection;
+        $fiche=$this->build_fiche(2, 'PHPUNIT.ACCOUNT.INSERT');
+        $fiche->setAttribut(ATTR_DEF_ACCOUNT, $p_value);
+        Card_Property::update($fiche);
+        
$this->assertEquals($p_expected,$fiche->strAttribut(ATTR_DEF_ACCOUNT)," cannot 
SET accounting");
+        $this->assertTrue($g_connection->get_value("select count(*) from 
tmp_pcmn where pcm_val = $1",[$p_expected])==1
+                ," accounting not created in TMP_PCMN");
+        $g_connection->exec_sql("delete from tmp_pcmn where 
pcm_val=$1",[$p_expected]);
+        $fiche->remove();
+    }
+
+     /**
+     * @brief test update of the accounting
+     * @testdox testAccountUpdate et  of the accounting while updating
+     * @dataProvider dataAccount
+     */
+    public function testAccountUpdate($p_value,$p_expected)
+    {
+        global $g_connection;
+        $fiche=$this->build_fiche(2, 'PHPUNIT.ACCOUNT.UPDATE');
+        $fiche->setAttribut(ATTR_DEF_ACCOUNT, $p_value);
+        $fiche->update($fiche->to_array());
+        
$this->assertEquals($p_expected,$fiche->strAttribut(ATTR_DEF_ACCOUNT)," cannot 
SET accounting");
+        $this->assertTrue($g_connection->get_value("select count(*) from 
tmp_pcmn where pcm_val = $1",[$p_expected])==1
+                ," accounting not created in TMP_PCMN");
+        $g_connection->exec_sql("delete from tmp_pcmn where 
pcm_val=$1",[$p_expected]);
+        $fiche->remove();
+    }
+    /**
+     * @testdox testSameAccountingUpdate UPDATE test all the same accounting 
+     */
+    public function testSameAccountingUpdate()
+    {
+        // insert a card in category 2 with always the same account
+        global $g_connection;
+        $fiche_def=new Fiche_Def($g_connection,2);
+        $fiche_def->set_autocreate(false);
+        $fiche_def->save_class_base('600');
+        $fiche=$this->build_fiche(2,'TESTACCOUNT');
+        
$this->assertEquals('600',$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+        for ( $i=600003; $i < 600025;$i++) {
+            $fiche->setAttribut(ATTR_DEF_ACCOUNT, "");
+           Card_Property::update($fiche);
+           $fiche->load();
+            
$this->assertEquals(600,$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+            
+        }
+        $fiche->remove();
+    }
+     /**
+     * @testdox testSameAccountingInsert INSERT test all the same accounting 
+     */
+    public function testSameAccountingInsert()
+    {
+        // insert a card in category 2 with always the same account
+        global $g_connection;
+        $fiche_def=new Fiche_Def($g_connection,2);
+        $fiche_def->set_autocreate(false);
+        $fiche_def->save_class_base('600');
+        
+        for ( $i=600002; $i < 600025;$i++) {
+            $fiche=new Fiche($g_connection);
+            $fiche->insert(2,['av_text1'=>'PHPUNIT test Same 
accounting','av_text5'=>""]);
+            $fiche->load();
+            
$this->assertEquals(600,$fiche->strAttribut(ATTR_DEF_ACCOUNT),'Account not 
properly created');
+            $fiche->remove();
+        }
+        
+    }
 }