mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-04-17 05:19:43 -04:00
PSR and Readability Changes - Removed unused import - Corrected PHPdoc to include the correct return type - Refactored out a function to get attribute data from the row in a CSV item import. - refactored snake_case variables and function names to camelCase - Refactored the naming of saveAttributeData() to better reflect the functions purpose. - Improved PHPdocs - Remove whitespace - Remove unneeded comment - Refactored abbreviated variable name for clarity - Removed $csvHeaders as it is unused - Corrected spacing and curly brace location - Refactored Stock Locations validation inside general validation Bugfixes - Fixed bug causing attribute_id and item_id to not be properly assigned when empty() returns true. - Fixed bug causing CSV Item import to not update barcode when changed in the import file. - Fixed saveAttributeValue() logic causing attribute_value to be updated to a value that already exists for a different attribute_id - Fixed bug preventing Category as dropdown functionality from working - Fixed bug preventing barcodes from updating. in Item CSV Imports - Corrected bug in stock_location->save_value() - Corrected incorrect helper file references. - Removed duplicate call to save attribute link - Rollback transaction on failure before returning false - Rollback transaction and return 0 on failure to save attribute link. - Account for '0' being an acceptable TEXT or DECIMAL attributeValue. - Corrected Business logic - Resolved incorrect array key - Account for 0 in column values - Correct check empty attribute check - Previously 0 would have been skipped even though that's a valid value for an attribute. - Removed unused foreach loop index variables - Corrected CodeIgniter Framework version to specific version UnitTest Seeder and tests - Created a seeder to automatically prepare the test database. - Modified the Unit Test setup to properly seed the test database. - Wrote a unit test to test deleting an attribute from an item through the CSV. - Corrected errors in unit tests preventing them from passing. save_value() returns a bool, not the itemId - Fix Unit Tests that were failing - Corrected the logic in itemUpdate test - Replaced precision test with one reflecting testing of actual value. - This test does not test cash rounding rules. That should go into a different test. - Correct expected value in test. - Update app/Database/Seeds/TestDatabaseBootstrapSeeder.php - Added check to testImportDeleteAttributeFromExistingItem - Correct mocking of dropdowns - Remove code depending on removed database.sql - Removed FQN in seeder() call - Added checks in Database seeder - Moved the function to the attribute model where it belongs which allows testability. Case Change Capability (CSV Import and Form) - CSV Import and view Case Changes of `attribute_value` - Store attribute even when just case is different. - Add getAttributeValueByAttributeId() to assist in comparing the value - Corrected Capitalization in File Handling Logic CSV Import Attribute Link Deletion Capability - Validation checks bypass magic word cells. - Delete the attribute link for an item if the CSV contains `_DELETE_` - Added calls to deleteOrphanedValues() - Items CSV Import Attribute Delete - Exclude the itemId in the check to see if the barcode number exists Error Checking and Reporting Improvements - Fail the import if an invalid stock location is found in the CSV - Return false if deleteAttributeLinks fails - Match sanitization of description field to Form submission import - Fold errors into result and return value - Populated $allowedStockLocations before sending it to the validation function - Added logic to not ignore failed saveItemAttributes calls - Add error checking to failed row insert - Reworked &= to && logic so that it short-circuits the function call after if success is already false. - Add transaction to storeCSVAttributeValue function to prevent deleting the attribute links before confirming the new value successfully saved. - Modified generate_message in Db_log.php to be defensive. Attribute Improvements - Move ATTRIBUTE_VALUE_TYPES to the helper - Normalize AttributeId in saveAttributeLink() - normalize itemId in saveAttributeLink() - Account for '0' in column values for allow_alt_description - Remove duplicate saveAttributeValue call - Correct return value of function - Like other save_value() functions, the location_data variable is passed by reference. - Unlike other save_value() functions, the location_data variable is not being updated with the primary key id. - Added updateAttributeValue() function as part of logic fix. - Added attribute_helper.php - Simplified logic to store attribute values --------- Signed-off-by: objec <objecttothis@gmail.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
152 lines
6.3 KiB
PHP
152 lines
6.3 KiB
PHP
<?php
|
|
|
|
namespace App\Database\Migrations;
|
|
|
|
use CodeIgniter\Database\Migration;
|
|
use CodeIgniter\Database\ResultInterface;
|
|
use App\Models\Attribute;
|
|
use Config\Database;
|
|
use Config\OSPOS;
|
|
use DateTime;
|
|
|
|
class Migration_database_optimizations extends Migration
|
|
{
|
|
/**
|
|
* Perform a migration step.
|
|
*/
|
|
public function up(): void
|
|
{
|
|
log_message('info', 'Migrating database optimizations.');
|
|
|
|
$attribute = model(Attribute::class);
|
|
|
|
$attribute->deleteOrphanedValues();
|
|
|
|
$this->migrate_duplicate_attribute_values(DECIMAL);
|
|
$this->migrate_duplicate_attribute_values(DATE);
|
|
|
|
// Select all attributes that have data in more than one column
|
|
$builder = $this->db->table('attribute_values');
|
|
$builder->select('attribute_id, attribute_value, attribute_decimal, attribute_date');
|
|
$builder->groupStart();
|
|
$builder->where('attribute_value IS NOT NULL');
|
|
$builder->where('attribute_date IS NOT NULL');
|
|
$builder->groupEnd();
|
|
$builder->orGroupStart();
|
|
$builder->where('attribute_value IS NOT NULL');
|
|
$builder->where('attribute_decimal IS NOT NULL');
|
|
$builder->groupEnd();
|
|
$attribute_values = $builder->get();
|
|
|
|
$this->db->transStart();
|
|
|
|
// Clean up Attribute values table where there is an attribute value and an attribute_date/attribute_decimal
|
|
foreach ($attribute_values->getResultArray() as $attribute_value) {
|
|
$builder = $this->db->table('attribute_values');
|
|
$builder->delete(['attribute_id' => $attribute_value['attribute_id']]);
|
|
|
|
$builder = $this->db->table('attribute_links');
|
|
$builder->select('links.definition_id, links.item_id, links.attribute_id, defs.definition_type');
|
|
$builder->join('attribute_definitions defs', 'defs.definition_id = links.definition_id');
|
|
$builder->where('attribute_id', $attribute_value['attribute_id']);
|
|
$attribute_links = $builder->get();
|
|
|
|
if ($attribute_links) {
|
|
$builder = $this->db->table('attribute_links');
|
|
$attribute_links = $attribute_links->getResultArray() ?: [];
|
|
|
|
foreach ($attribute_links->getResultArray() as $attribute_link) {
|
|
$builder->where('attribute_id', $attribute_link['attribute_id']);
|
|
$builder->where('item_id', $attribute_link['item_id']);
|
|
$builder->delete();
|
|
|
|
switch ($attribute_link['definition_type']) {
|
|
case DECIMAL:
|
|
$value = $attribute_value['attribute_decimal'];
|
|
break;
|
|
case DATE:
|
|
$config = config(OSPOS::class)->settings;
|
|
$attribute_date = DateTime::createFromFormat('Y-m-d', $attribute_value['attribute_date']);
|
|
$value = $attribute_date->format($config['dateformat']);
|
|
break;
|
|
default:
|
|
$value = $attribute_value['attribute_value'];
|
|
break;
|
|
}
|
|
|
|
$attribute->saveAttributeValue($value, $attribute_link['definition_id'], $attribute_link['item_id'], false, $attribute_link['definition_type']);
|
|
}
|
|
}
|
|
}
|
|
$this->db->transComplete();
|
|
|
|
helper('migration');
|
|
execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.0_database_optimizations.sql');
|
|
log_message('info', 'Finished migrating database optimizations.');
|
|
}
|
|
|
|
/**
|
|
* Given the type of attribute, deletes any duplicates it finds in the attribute_values table and reassigns those
|
|
*/
|
|
private function migrate_duplicate_attribute_values($attribute_type): void
|
|
{
|
|
// Remove duplicate attribute values needed to make attribute_decimals and attribute_dates unique
|
|
$this->db->transStart();
|
|
|
|
$column = 'attribute_' . strtolower($attribute_type);
|
|
|
|
$builder = $this->db->table('attribute_values');
|
|
$builder->select("$column");
|
|
$builder->groupBy($column);
|
|
$builder->having("COUNT($column) > 1");
|
|
$duplicated_values = $builder->get();
|
|
|
|
foreach ($duplicated_values->getResultArray() as $duplicated_value) {
|
|
$subquery_builder = $this->db->table('attribute_values');
|
|
$subquery_builder->select('attribute_id');
|
|
$subquery_builder->where($column, $duplicated_value[$column]);
|
|
$subquery = $subquery_builder->getCompiledSelect();
|
|
|
|
$builder = $this->db->table('attribute_values');
|
|
$builder->select('attribute_id');
|
|
$builder->where($column, $duplicated_value[$column]);
|
|
$builder->where("attribute_id IN ($subquery)", null, false);
|
|
$attribute_ids_to_fix = $builder->get();
|
|
|
|
$this->reassign_duplicate_attribute_values($attribute_ids_to_fix, $duplicated_value);
|
|
}
|
|
|
|
$this->db->transComplete();
|
|
}
|
|
|
|
/**
|
|
* Updates the attribute_id in all attribute_link rows with duplicated attribute_ids then deletes unneeded rows from attribute_values
|
|
*
|
|
* @param ResultInterface $attribute_ids_to_fix All attribute_ids that need to parsed
|
|
* @param array $attribute_value The attribute value in question.
|
|
*/
|
|
private function reassign_duplicate_attribute_values(ResultInterface $attribute_ids_to_fix, array $attribute_value): void
|
|
{
|
|
$attribute_ids = $attribute_ids_to_fix->getResultArray();
|
|
$retain_attribute_id = $attribute_ids[0]['attribute_id'];
|
|
|
|
foreach ($attribute_ids as $attribute_id) {
|
|
// Update attribute_link with the attribute_id we are keeping
|
|
$builder = $this->db->table('attribute_links');
|
|
$builder->where('attribute_id', $attribute_id['attribute_id']);
|
|
$builder->update(['attribute_id' => $retain_attribute_id]);
|
|
|
|
// Delete the row from attribute_values if it isn't our keeper
|
|
if ($attribute_id['attribute_id'] !== $retain_attribute_id) {
|
|
$builder = $this->db->table('attribute_values');
|
|
$builder->delete(['attribute_id' => $attribute_id['attribute_id']]);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Revert a migration step.
|
|
*/
|
|
public function down(): void {}
|
|
}
|