parametrizar funciones de insercion para los 3 archivos. Tests

application/controllers/Parser.php

@@ -24,15 +24,15 @@ class Parser extends CI_Controller
         $fechaCarpeta = date("Y-m-d_H-i-s");
         if ($this->newFolder($this->rutaDiaria . $fechaCarpeta)) {
             $this->rutaDiariaFecha = $this->rutaDiaria . $fechaCarpeta . "/";
-            $this->downloadProcess();
+            $this->downloadProcess(URL_DIARIA_CONTRATOS_MENORES_PERFILES_CONTRATANES);
             $this->parserfile->index($this->rutaDiariaFecha, $fechaCarpeta);
         }
     }
 
-    private function downloadProcess()
+    private function downloadProcess($urlXML)
     {
-        $fileName = basename(URL_DIARIA);
-        $this->downloadFile($fileName, URL_DIARIA, $this->rutaDiariaFecha);
+        $fileName = basename($urlXML);
+        $this->downloadFile($fileName, $urlXML, $this->rutaDiariaFecha);
 
         $archivoAtom = $this->getFile($this->rutaDiariaFecha . $fileName, $fileName);
         $nuevoAtomAttrNext = $this->readNextAttribute($archivoAtom);

application/helpers/funciones_helper.php

@@ -152,37 +152,22 @@ if (!function_exists("enviarEmail")) {
 
         $CI->load->library('email');
 
-        $config = array();
-        if ($_SERVER["SERVER_NAME"] == "rielchyc.test") {
-            $config['protocol'] = 'smtp';
-            $config['smtp_host'] = 'smtp.gmail.com';
-            $config['smtp_user'] = 'chcalvoleon@mindden.com';
-            $config['smtp_pass'] = '';
-            $config['smtp_crypto'] = 'ssl';
-            $config['smtp_port'] = 465;
-            $config['mailtype'] = 'html';
-            $config['wordwrap'] = 'TRUE';
-            $config['newline'] = "\r\n";
-            $config['priority'] = 5;
-            $config['crlf'] = "\r\n";
-        } else {
-            $config['protocol'] = 'smtp';
-            $config['smtp_host'] = 'b2b.rielchyc.es';
-            $config['smtp_user'] = 'webmaster@b2b.rielchyc.es';
-            $config['smtp_pass'] = 'Mindden2021!';
-            $config['smtp_crypto'] = 'ssl';
-            $config['smtp_port'] = 465;
-            $config['mailtype'] = 'html';
-            $config['wordwrap'] = 'TRUE';
-            $config['newline'] = "\r\n";
-            $config['priority'] = 5;
-            $config['crlf'] = "\r\n";
-        }
+        $config['protocol'] = 'smtp';
+        $config['smtp_host'] = 'smtp.gmail.com';
+        $config['smtp_user'] = 'chcalvoleon@mindden.com';
+        $config['smtp_pass'] = '';
+        $config['smtp_crypto'] = 'ssl';
+        $config['smtp_port'] = 465;
+        $config['mailtype'] = 'html';
+        $config['wordwrap'] = 'TRUE';
+        $config['newline'] = "\r\n";
+        $config['priority'] = 5;
+        $config['crlf'] = "\r\n";
 
         $CI->email->initialize($config);
         $CI->email->clear(true);
 
-        $CI->email->from('webmaster@b2b.rielchyc.es');
+        $CI->email->from('chcalvoleon@mindden.com');
         $CI->email->to($email_envio);
         $CI->email->bcc("chcalvoleon@mindden.com");
         $CI->email->subject($asunto);

application/libraries/ParserDatabase.php

@@ -3,9 +3,6 @@ defined('BASEPATH') or exit('No direct script access allowed');
 
 class ParserDatabase
 {
-
-    //TODO: Functions return void
-
     protected $idLicitacion = 0;
     protected $fechaInicioParser = "";
 
@@ -29,13 +26,9 @@ class ParserDatabase
                     if ($idLicitacion['result']) {
                         $this->idLicitacion = $idLicitacion['id'];
 
-                        if ($row['general']['id_licitacion'] == "8500237") {
-                            $var = 1;
-                        }
-
-                        $this->setDatosSingular($row['contractInfo'], "BRUTO_contract_folder", $this->idLicitacion, "ContractInfo");
+                        $this->setDatosSingular($row, "contractInfo", "BRUTO_contract_folder", $this->idLicitacion, "ContractInfo");
 
-                        $this->setDatosSingular($row['tenderingProcess'], "BRUTO_tendering_process", $this->idLicitacion, "TenderingProcess");
+                        $this->setDatosSingular($row, "tenderingProcess", "BRUTO_tendering_process", $this->idLicitacion, "TenderingProcess");
 
                         $this->setProcurementProject($row['procurementProject']);
 
@@ -49,16 +42,15 @@ class ParserDatabase
 
                         $this->setValidNoticeInfo($row['validNoticeInfo']);
 
-                        $this->setDatosMultiples($row['tenderingResult'], "BRUTO_tender_result", $this->idLicitacion, "TenderResult");
+                        $this->setDatosMultiples($row, "tenderingResult", "BRUTO_tender_result", $this->idLicitacion, "TenderResult");
 
-                        $this->setDatosMultiples($row['legalDocs'], "BRUTO_legal_documents", $this->idLicitacion, "LegalDocs");
+                        $this->setDatosMultiples($row, "legalDocs", "BRUTO_legal_documents", $this->idLicitacion, "LegalDocs");
 
-                        $this->setDatosMultiples($row['technicalDocs'], "BRUTO_technical_documents", $this->idLicitacion, "TechnicalDocs");
+                        $this->setDatosMultiples($row, "technicalDocs", "BRUTO_technical_documents", $this->idLicitacion, "TechnicalDocs");
 
-                        $this->setDatosMultiples($row['generalDocs'], "BRUTO_general_documents", $this->idLicitacion, "GeneralDocs");
-
-                        $this->setDatosMultiples($row['additionalDocs'], "BRUTO_additional_documents", $this->idLicitacion, "AdditionalDocs");
+                        $this->setDatosMultiples($row, "generalDocs", "BRUTO_general_documents", $this->idLicitacion, "GeneralDocs");
 
+                        $this->setDatosMultiples($row, "additionalDocs", "BRUTO_additional_documents", $this->idLicitacion, "AdditionalDocs");
                     }
                 }
             }
@@ -84,31 +76,29 @@ class ParserDatabase
 
     private function setLocatedContractingParty($contractInfo): void
     {
-        $locatedContractingPartyId = $this->setDatosSingular($contractInfo['locatedContractingParty'], "BRUTO_located_contracting_party", $this->idLicitacion, "locatedContractingParty");
+        $locatedContractingPartyId = $this->setDatosSingular($contractInfo, "locatedContractingParty", "BRUTO_located_contracting_party", $this->idLicitacion, "locatedContractingParty");
+
+        $this->setDatosMultiples($contractInfo, "activity", "BRUTO_located_contracting_party_activity", $locatedContractingPartyId, "locatedContractingParty_Activity");
 
-        $this->setDatosMultiples($contractInfo['activity'], "BRUTO_located_contracting_party_activity", $locatedContractingPartyId, "locatedContractingParty_Activity");
     }
 
     private function setParty($partyInfo): void
     {
-        $partyId = $this->setDatosSingular($partyInfo['party'], "BRUTO_party", $this->idLicitacion, "PartyInfo");
+        $partyId = $this->setDatosSingular($partyInfo, "party", "BRUTO_party", $this->idLicitacion, "PartyInfo");
+
+        $this->setDatosMultiples($partyInfo, "partyIdentification", "BRUTO_party_party_idenfitication", $partyId, "PartyInfo_PartyIdentification");
 
-        $this->setDatosMultiples($partyInfo['partyIdentification'], "BRUTO_party_party_idenfitication", $partyId, "PartyInfo_PartyIdentification");
     }
 
     private function setProcurementProject($procurementInfo): void
     {
-        $procurementProjectId = $this->setDatosSingular($procurementInfo['budget'], "BRUTO_procurement_project", $this->idLicitacion, "ProcurementProject");
-
-        if (array_key_exists("itemClass", $procurementInfo)) {
-            $this->setDatosMultiples($procurementInfo['itemClass'], "BRUTO_procurement_project_itemClass", $procurementProjectId, "ProcurementProject_ItemClass");
-        }
+        $procurementProjectId = $this->setDatosSingular($procurementInfo, "budget", "BRUTO_procurement_project", $this->idLicitacion, "ProcurementProject");
 
+        $this->setDatosMultiples($procurementInfo, "itemClass", "BRUTO_procurement_project_itemClass", $procurementProjectId, "ProcurementProject_ItemClass");
     }
 
     private function setProcurementProjectLot($procurementLotInfo): void
     {
-
         $resultInsert = 0;
 
         if (!empty($procurementLotInfo)) {
@@ -121,8 +111,8 @@ class ParserDatabase
 
                 if (!empty($setInsert)) {
                     $resultInsert = insertBucle($setInsert, "BRUTO_procurement_project_lot", "setLicitacion_" . $this->fechaInicioParser);
-                    if ($row['itemClassification']) {
-                        $this->setDatosMultiples($row['itemClassification'], "BRUTO_procurement_project_lot_item", $resultInsert, "ProcurementLotItem");
+                    if (array_key_exists('itemClassification', $row)) {
+                        $this->setDatosMultiples($row, "itemClassification", "BRUTO_procurement_project_lot_item", $resultInsert, "ProcurementLotItem");
                     }
                 }
                 $aux++;
@@ -146,8 +136,7 @@ class ParserDatabase
         $resultInsert = 0;
 
         if (!empty($tenderingTermsInfo)) {
-            $aux = 0;
-            //foreach ($tenderingTermsInfo as $clave => $row) {
+
             $setInsert = array();
             $setInsert['tenderingTerms'][0] = $tenderingTermsInfo[0];
             $setInsert['tenderingTerms'][0]['id_ajena'] = $this->idLicitacion;
@@ -156,25 +145,15 @@ class ParserDatabase
                 $resultInsert = insertBucle($setInsert['tenderingTerms'], "BRUTO_tendering_terms", "setLicitacion_" . $this->fechaInicioParser);
 
                 if ($resultInsert > 0) {
-                    if (array_key_exists(1, $tenderingTermsInfo)) {
-                        $this->setDatosMultiples($tenderingTermsInfo[1], "BRUTO_tendering_terms_awarding_terms", $resultInsert, "TenderingTermsAwardingTerms");
-                    }
+                    $this->setDatosMultiples($tenderingTermsInfo, 1, "BRUTO_tendering_terms_awarding_terms", $resultInsert, "TenderingTermsAwardingTerms");
 
-                    if (array_key_exists(2, $tenderingTermsInfo)) {
-                        $this->setDatosMultiples($tenderingTermsInfo[2], "BRUTO_tendering_terms_qualification_request", $resultInsert, "TenderingTermsQualificationRequest");
-                    }
+                    $this->setDatosMultiples($tenderingTermsInfo, 2, "BRUTO_tendering_terms_qualification_request", $resultInsert, "TenderingTermsQualificationRequest");
 
-                    if (array_key_exists(3, $tenderingTermsInfo)) {
-                        $this->setDatosMultiples($tenderingTermsInfo[3], "BRUTO_tendering_terms_financial_evaluation", $resultInsert, "TenderingTermsFinancialEvaluation");
-                    }
+                    $this->setDatosMultiples($tenderingTermsInfo, 3, "BRUTO_tendering_terms_financial_evaluation", $resultInsert, "TenderingTermsFinancialEvaluation");
 
-                    if (array_key_exists(4, $tenderingTermsInfo)) {
-                        $this->setDatosMultiples($tenderingTermsInfo[4], "BRUTO_tendering_terms_specific_terms", $resultInsert, "TenderingTermsSpecificRequirement");
-                    }
+                    $this->setDatosMultiples($tenderingTermsInfo, 4, "BRUTO_tendering_terms_specific_terms", $resultInsert, "TenderingTermsSpecificRequirement");
                 }
             }
-            //$aux++;
-            //}
 
             if ($resultInsert) {
                 $result = array("result" => true);
@@ -205,12 +184,11 @@ class ParserDatabase
 
                 if (!empty($setInsert)) {
                     $resultInsert = insertBucle($setInsert, "BRUTO_valid_notice_info", "setLicitacion_" . $this->fechaInicioParser);
-                    if (array_key_exists("documento", $row)) {
-                        $this->setDatosMultiples($row['documento'], "BRUTO_valid_notice_info_documento", $resultInsert, "validNoticeInfoFechas");
-                    }
 
-                    if (array_key_exists("fechas", $row)) {
-                        $this->setDatosMultiples($row['fechas'], "BRUTO_valid_notice_info_fecha", $resultInsert, "validNoticeInfoDocumento");
+                    if ($resultInsert > 0) {
+                        $this->setDatosMultiples($row, "documento", "BRUTO_valid_notice_info_documento", $resultInsert, "validNoticeInfoFechas");
+
+                        $this->setDatosMultiples($row, "fechas", "BRUTO_valid_notice_info_fecha", $resultInsert, "validNoticeInfoDocumento");
                     }
                 }
                 $aux++;
@@ -228,13 +206,13 @@ class ParserDatabase
         }
     }
 
-    private function setDatosSingular($arrayDatos, $tabla, $idAjena = 0, $nodoLog): int
+    private function setDatosSingular($arrayDatos, $arrayKey, $tabla, $idAjena = 0, $nodoLog): int
     {
         $insertedId = 0;
-        if (!empty($arrayDatos)) {
+        if (!empty($arrayDatos) && array_key_exists($arrayKey, $arrayDatos)) {
             $arrayInsertar = array();
 
-            $arrayInsertar[0] = $arrayDatos;
+            $arrayInsertar[0] = $arrayDatos[$arrayKey];
 
             if ($idAjena > 0) {
                 $arrayInsertar[0]['id_ajena'] = $idAjena;
@@ -247,7 +225,6 @@ class ParserDatabase
             } else {
                 guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Finalizada Inserción", "false");
             }
-
         } else {
             guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " vacio", "false");
         }
@@ -255,33 +232,37 @@ class ParserDatabase
         return $insertedId;
     }
 
-    private function setDatosMultiples($arrayDatos, $tabla, $idAjena = 0, $nodoLog): void
+    private function setDatosMultiples($arrayDatos, $arrayKey, $tabla, $idAjena = 0, $nodoLog): void
     {
         $setInsert = array();
         $resultInsert = 0;
 
-        if (!empty($arrayDatos)) {
-            $aux = 0;
-            foreach ($arrayDatos as $row) {
-                $setInsert[$aux] = $row;
+        if (array_key_exists($arrayKey, $arrayDatos)) {
+            if (!empty($arrayDatos[$arrayKey])) {
+                $aux = 0;
+                foreach ($arrayDatos[$arrayKey] as $row) {
+                    $setInsert[$aux] = $row;
 
-                if ($idAjena > 0) {
-                    $setInsert[$aux]['id_ajena'] = $idAjena;
-                }
+                    if ($idAjena > 0) {
+                        $setInsert[$aux]['id_ajena'] = $idAjena;
+                    }
 
-                $aux++;
-            }
+                    $aux++;
+                }
 
-            if (!empty($setInsert)) {
-                $resultInsert = insertBucle($setInsert, $tabla, "setLicitacion_" . $this->fechaInicioParser);
-            }
+                if (!empty($setInsert)) {
+                    $resultInsert = insertBucle($setInsert, $tabla, "setLicitacion_" . $this->fechaInicioParser);
+                }
 
-            if ($resultInsert) {
-                $result = array("result" => true);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Finalizada Inserción", "false");
+                if ($resultInsert) {
+                    $result = array("result" => true);
+                    guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Finalizada Inserción", "false");
+                } else {
+                    $result = array("result" => true, "id" => 0);
+                    guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Fallida", "false", 2);
+                }
             } else {
-                $result = array("result" => true, "id" => 0);
-                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " Fallida", "false", 2);
+                guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " vacio", "false");
             }
         } else {
             guardar_log("setLicitacion_" . $this->fechaInicioParser, $nodoLog . " vacio", "false");

application/libraries/ParserFile.php

@@ -79,7 +79,6 @@ class ParserFile
 
         $resultEntries['url_id_licitacion'] = (string) $xml->id;
         $resultEntries['id_licitacion'] = (string) substr($xml->id, strrpos($xml->id, '/') + 1);
-        $resultEntries['link_licitacion'] = (string) $xml->link;
         $resultEntries['link_uri'] = (string) $this->existAttribute($xml, "link", "string", 'href');
         $resultEntries['summary'] = (string) $xml->summary;
         $resultEntries['title'] = (string) $xml->title;
@@ -103,7 +102,7 @@ class ParserFile
     private function nodoLocatedContractingParty($xml)
     {
         $resultEntries = array();
-        if (isset($xml->ContractFolderStatus->LocatedContractingParty)) {
+        if (isset($xml->ContractFolderStatus->LocatedContractingParty) && !empty($xml->ContractFolderStatus->LocatedContractingParty)) {
             $LocatedContractingParty = $xml->ContractFolderStatus->LocatedContractingParty;
 
             $resultEntries['locatedContractingParty']['contractingPartyTypeCode'] = $this->existNodo($LocatedContractingParty, "ContractingPartyTypeCode", 'string');
@@ -276,7 +275,8 @@ class ParserFile
             }
         }
         //$resultFinal = $this->array_remove_empty($resultEntries);
-        return $resultEntries;
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
+        return $resultFinal;
     }
 
     private function nodoTenderingTerms($xml)
@@ -320,8 +320,9 @@ class ParserFile
                 }
             }
 
-            $financialEvaluationCriteria = $TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria;
-            if (isset($financialEvaluationCriteria) && !empty($financialEvaluationCriteria)) {
+            if (isset($TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria)
+                && !empty($TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria)) {
+                $financialEvaluationCriteria = $TenderingTerms->TendererQualificationRequest->FinancialEvaluationCriteria;
                 for ($i = 0; $i < count($financialEvaluationCriteria); $i++) {
                     $resultEntries[3][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($financialEvaluationCriteria[$i], 'EvaluationCriteriaTypeCode', 'string');
                     $resultEntries[3][$i]['evaluationCriteriaTypeCode_attr'] = $this->existAttribute($financialEvaluationCriteria[$i], "EvaluationCriteriaTypeCode", "string", 'listURI');
@@ -329,8 +330,9 @@ class ParserFile
                 }
             }
 
-            $specificTendererRequirement = $TenderingTerms->TendererQualificationRequest->SpecificTendererRequirement;
-            if (isset($specificTendererRequirement) && !empty($specificTendererRequirement)) {
+            if (isset($TenderingTerms->TendererQualificationRequest->SpecificTendererRequirement)
+                && !empty($TenderingTerms->TendererQualificationRequest->SpecificTendererRequirement)) {
+                $specificTendererRequirement = $TenderingTerms->TendererQualificationRequest->SpecificTendererRequirement;
                 for ($i = 0; $i < count($specificTendererRequirement); $i++) {
 
                     $resultEntries[4][$i]['evaluationCriteriaTypeCode'] = $this->existNodo($specificTendererRequirement[$i]->SpecificTendererRequirement, 'RequirementTypeCode', 'string');
@@ -340,8 +342,10 @@ class ParserFile
 
             $resultEntries[0]['language'] = $this->existNodo($TenderingTerms->Language, 'ID', 'string');
         }
+
         //$resultFinal = $this->array_remove_empty($resultEntries);
-        return $resultEntries;
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
+        return $resultFinal;
     }
 
     private function nodoTenderingProcess($xml)
@@ -376,7 +380,8 @@ class ParserFile
             $resultEntries['documentAvailablePeriod_EndDate'] = $this->existNodo($tenderingProcess->DocumentAvailabilityPeriod, 'EndDate', 'string');
             $resultEntries['documentAvailablePeriod_EndTime'] = $this->existNodo($tenderingProcess->DocumentAvailabilityPeriod, 'EndTime', 'string');
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
+        //$resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultFinal;
     }
 
@@ -394,7 +399,7 @@ class ParserFile
             }
 
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultFinal;
     }
 
@@ -412,7 +417,7 @@ class ParserFile
             }
 
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultFinal;
     }
 
@@ -430,7 +435,7 @@ class ParserFile
             }
 
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultFinal;
     }
 
@@ -458,7 +463,7 @@ class ParserFile
             }
         }
 
-        //$resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultEntries;
     }
 
@@ -472,11 +477,11 @@ class ParserFile
             for ($i = 0; $i < count($generalDocument); $i++) {
                 $resultEntries[$i]['idDoc'] = $this->existNodo($generalDocument[$i], 'ID', 'string');
                 $resultEntries[$i]['attachment'] = $this->existNodo($generalDocument[$i]->Attachment->ExternalReference, 'URI', 'string');
-                $resultEntries[$i]['documentHash'] = $this->existNodo($generalDocument[$i]->Attachment->ExternalReference, 'DocumentHash', 'string');
+                $resultEntries[$i]['fileName'] = $this->existNodo($generalDocument[$i]->Attachment->ExternalReference, 'FileName', 'string');
             }
 
         }
-        $resultFinal = $this->array_remove_empty($resultEntries);
+        $resultFinal = $this->checkArrayValuesEmpty($resultEntries);
         return $resultFinal;
     }
 
@@ -556,6 +561,28 @@ class ParserFile
         return $haystack;
     }
 
+    public function checkArrayValuesEmpty($arrayCheck)
+    {
+        $valuesTotales = count($arrayCheck);
+        $valuesVacios = 0;
+        foreach ($arrayCheck as $key => $value) {
+
+            if (is_array($value)) {
+                $arrayCheck[$key] = $this->checkArrayValuesEmpty($arrayCheck[$key]);
+            } else {
+                $value = trim($value);
+                if (empty($arrayCheck[$key])) {
+                    $valuesVacios++;
+                }
+            }
+
+        }
+
+        if ($valuesTotales == $valuesVacios) {
+            $this->array_remove_empty($arrayCheck);
+        }
+    }
+
 }
 
 /* End of file ParserFile.php */