Skip to content

Address review feedback for brand feature (PR #174) #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
layoutd merged 15 commits into from
Feb 19, 2026
Merged

Address review feedback for brand feature (PR #174) #201

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c832934
add new collection
masteradhoc Aug 25, 2025
e226441
add brand feature to product generation
masteradhoc Aug 25, 2025
52f1fb2
adjust term generation so product_brands only get 1 brand assigned
masteradhoc Aug 25, 2025
5c30890
Update includes/Generator/Term.php
masteradhoc Oct 3, 2025
dc9fa4c
Update includes/Generator/Product.php
masteradhoc Oct 3, 2025
8672d9d
Update includes/Generator/Product.php
masteradhoc Oct 3, 2025
5cf3d6d
Merge remote-tracking branch 'origin/trunk' into patch-brand-feature
layoutd Feb 13, 2026
330f0d1
Address PR 174 review feedback
layoutd Feb 13, 2026
845e27c
Remove unused include
layoutd Feb 13, 2026
0a6466d
Fix product_brand term generation for non-hierarchical taxonomies
layoutd Feb 16, 2026
eb5c8ac
Add taxonomy existence check and error handling for brands
layoutd Feb 16, 2026
0edc4dc
Add unit tests for brand assignment
layoutd Feb 16, 2026
36c8058
Fix brand assignment test cache isolation issue
layoutd Feb 16, 2026
1ee6564
Clear term caches after generating new terms in batch
layoutd Feb 16, 2026
6653f49
Test linter fixes
layoutd Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions includes/Generator/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ protected static function init_faker() {
if ( ! self::$faker ) {
self::$faker = \Faker\Factory::create( 'en_US' );
self::$faker->addProvider( new \Bezhanov\Faker\Provider\Commerce( self::$faker ) );
self::$faker->addProvider( new \Bezhanov\Faker\Provider\Device( self::$faker ) );
}
}

Expand Down
45 changes: 30 additions & 15 deletions includes/Generator/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ public static function generate( $save = true, $assoc_args = array() ) {

if ( $product ) {
$product->save();

// Assign brand terms using wp_set_object_terms.
$brand_ids = self::get_term_ids( 'product_brand', self::$faker->numberBetween( 1, 3 ) );
if ( ! empty( $brand_ids ) ) {
wp_set_object_terms( $product->get_id(), $brand_ids, 'product_brand' );
}
}

// Limit size of stored relationship IDs.
Expand All @@ -119,8 +125,8 @@ public static function generate( $save = true, $assoc_args = array() ) {
/**
* Create multiple products.
*
* @param int $amount The number of products to create.
* @param array $args Additional args for product creation.
* @param int $amount The number of products to create.
* @param array $args Additional args for product creation.
*
* @return int[]|\WP_Error
*/
Expand All @@ -137,7 +143,7 @@ public static function batch( $amount, array $args = array() ) {

$product_ids = array();

for ( $i = 1; $i <= $amount; $i ++ ) {
for ( $i = 1; $i <= $amount; $i++ ) {
$product = self::generate( true, $args );

// Skip products that failed to generate.
Expand All @@ -151,6 +157,7 @@ public static function batch( $amount, array $args = array() ) {
// In case multiple batches are being run in one request, refresh the cache data.
RandomRuntimeCache::clear( 'product_cat' );
RandomRuntimeCache::clear( 'product_tag' );
RandomRuntimeCache::clear( 'product_brand' );

return $product_ids;
}
Expand Down Expand Up @@ -322,9 +329,9 @@ protected static function generate_variable_product() {
'name' => $name,
'featured' => self::$faker->boolean( 10 ),
'sku' => sanitize_title( $name ) . '-' . self::$faker->ean8,
'global_unique_id' => self::$faker->randomElement( [ self::$faker->ean13, self::$faker->isbn10 ] ),
'global_unique_id' => self::$faker->randomElement( array( self::$faker->ean13, self::$faker->isbn10 ) ),
'attributes' => $attributes,
'tax_status' => self::$faker->randomElement( [ 'taxable', 'shipping', 'none' ] ),
'tax_status' => self::$faker->randomElement( array( 'taxable', 'shipping', 'none' ) ),
'tax_class' => '',
'manage_stock' => $will_manage_stock,
'stock_quantity' => $will_manage_stock ? self::$faker->numberBetween( -100, 100 ) : null,
Expand All @@ -348,22 +355,22 @@ protected static function generate_variable_product() {
$variation_attributes = wc_list_pluck( array_filter( $product->get_attributes(), 'wc_attributes_array_filter_variation' ), 'get_slugs' );
$possible_attributes = array_reverse( wc_array_cartesian( $variation_attributes ) );
foreach ( $possible_attributes as $possible_attribute ) {
$price = self::$faker->randomFloat( 2, 1, 1000 );
$is_on_sale = self::$faker->boolean( 35 );
$price = self::$faker->randomFloat( 2, 1, 1000 );
$is_on_sale = self::$faker->boolean( 35 );
$has_sale_schedule = $is_on_sale && self::$faker->boolean( 40 ); // ~40% of on-sale variations have a schedule.
$sale_price = $is_on_sale ? self::$faker->randomFloat( 2, 0, $price ) : '';
$sale_price = $is_on_sale ? self::$faker->randomFloat( 2, 0, $price ) : '';
$date_on_sale_from = $has_sale_schedule ? self::$faker->dateTimeBetween( '-3 days', '+3 days' )->format( DATE_ATOM ) : '';
$date_on_sale_to = $has_sale_schedule ? self::$faker->dateTimeBetween( '+4 days', '+4 months' )->format( DATE_ATOM ) : '';
$is_virtual = self::$faker->boolean( 20 );
$variation = new \WC_Product_Variation();
$is_virtual = self::$faker->boolean( 20 );
$variation = new \WC_Product_Variation();
$variation->set_props( array(
'parent_id' => $product->get_id(),
'attributes' => $possible_attribute,
'regular_price' => $price,
'sale_price' => $sale_price,
'date_on_sale_from' => $date_on_sale_from,
'date_on_sale_to' => $date_on_sale_to,
'tax_status' => self::$faker->randomElement( [ 'taxable', 'shipping', 'none' ] ),
'tax_status' => self::$faker->randomElement( array( 'taxable', 'shipping', 'none' ) ),
'tax_class' => '',
'manage_stock' => $will_manage_stock,
'stock_quantity' => $will_manage_stock ? self::$faker->numberBetween( -20, 100 ) : null,
Expand All @@ -381,7 +388,7 @@ protected static function generate_variable_product() {
if ( wc_get_container()->get( 'Automattic\WooCommerce\Internal\CostOfGoodsSold\CostOfGoodsSoldController' )->feature_is_enabled() ) {
$variation->set_props( array( 'cogs_value' => round( $price * ( 1 - self::$faker->numberBetween( 15, 60 ) / 100 ), 2 ) ) );
}

$variation->save();
}
$data_store = $product->get_data_store();
Expand Down Expand Up @@ -417,13 +424,13 @@ protected static function generate_simple_product() {
'description' => self::$faker->paragraphs( self::$faker->numberBetween( 1, 5 ), true ),
'short_description' => self::$faker->text(),
'sku' => sanitize_title( $name ) . '-' . self::$faker->ean8,
'global_unique_id' => self::$faker->randomElement( [ self::$faker->ean13, self::$faker->isbn10 ] ),
'global_unique_id' => self::$faker->randomElement( array( self::$faker->ean13, self::$faker->isbn10 ) ),
'regular_price' => $price,
'sale_price' => $sale_price,
'date_on_sale_from' => $date_on_sale_from,
'date_on_sale_to' => $date_on_sale_to,
'total_sales' => self::$faker->numberBetween( 0, 10000 ),
'tax_status' => self::$faker->randomElement( [ 'taxable', 'shipping', 'none' ] ),
'tax_status' => self::$faker->randomElement( array( 'taxable', 'shipping', 'none' ) ),
'tax_class' => '',
'manage_stock' => $will_manage_stock,
'stock_quantity' => $will_manage_stock ? self::$faker->numberBetween( -100, 100 ) : null,
Expand Down Expand Up @@ -471,14 +478,17 @@ protected static function maybe_generate_terms( int $product_amount ): void {
$cats = 5;
$cat_depth = 1;
$tags = 10;
$brands = 5;
} elseif ( $product_amount < 50 ) {
$cats = 10;
$cat_depth = 2;
$tags = 20;
$brands = 10;
} else {
$cats = 20;
$cat_depth = 3;
$tags = 40;
$brands = 10;
}

$existing_cats = count( self::get_term_ids( 'product_cat', $cats ) );
Expand All @@ -490,6 +500,11 @@ protected static function maybe_generate_terms( int $product_amount ): void {
if ( $existing_tags < $tags ) {
Term::batch( $tags - $existing_tags, 'product_tag' );
}

$existing_brands = count( self::get_term_ids( 'product_brand', $brands ) );
if ( $existing_brands < $brands ) {
Term::batch( $brands - $existing_brands, 'product_brand' );
}
}

/**
Expand Down Expand Up @@ -548,7 +563,7 @@ protected static function maybe_get_gallery_image_ids() {

$image_count = wp_rand( 0, 3 );

for ( $i = 0; $i < $image_count; $i ++ ) {
for ( $i = 0; $i < $image_count; $i++ ) {
$gallery[] = self::get_image();
}

Expand Down
30 changes: 16 additions & 14 deletions includes/Generator/Term.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ public static function generate( $save = true, string $taxonomy = 'product_cat',

parent::maybe_initialize_generators();

if ( $taxonomy_obj->hierarchical ) {
if ( $taxonomy_obj->hierarchical && 'product_brand' === $taxonomy ) {
$term_name = self::$faker->company();
} elseif ( $taxonomy_obj->hierarchical ) {
$term_name = ucwords( self::$faker->department( 3 ) );
} else {
$term_name = self::random_weighted_element( array(
Expand Down Expand Up @@ -107,11 +109,11 @@ public static function batch( $amount, $taxonomy, array $args = array() ) {

$term_ids = array();

for ( $i = 1; $i <= $amount; $i ++ ) {
for ( $i = 1; $i <= $amount; $i++ ) {
$term = self::generate( true, $taxonomy );
if ( is_wp_error( $term ) ) {
if ( 'term_exists' === $term->get_error_code() ) {
$i --; // Try again.
--$i; // Try again.
continue;
}

Expand Down Expand Up @@ -173,11 +175,11 @@ protected static function batch_hierarchical( int $amount, string $taxonomy, arr

if ( $parent || 1 === $max_depth ) {
// All terms will be in the same hierarchy level.
for ( $i = 1; $i <= $amount; $i ++ ) {
for ( $i = 1; $i <= $amount; $i++ ) {
$term = self::generate( true, $taxonomy, $parent );
if ( is_wp_error( $term ) ) {
if ( 'term_exists' === $term->get_error_code() ) {
$i --; // Try again.
--$i; // Try again.
continue;
}

Expand All @@ -193,41 +195,41 @@ protected static function batch_hierarchical( int $amount, string $taxonomy, arr
}
$levels = array_fill( 1, $max_depth, array() );

for ( $i = 1; $i <= $max_depth; $i ++ ) {
for ( $i = 1; $i <= $max_depth; $i++ ) {
if ( 1 === $i ) {
// Always use the full term max for the top level of the hierarchy.
for ( $j = 1; $j <= $term_max && $remaining > 0; $j ++ ) {
for ( $j = 1; $j <= $term_max && $remaining > 0; $j++ ) {
$term = self::generate( true, $taxonomy );
if ( is_wp_error( $term ) ) {
if ( 'term_exists' === $term->get_error_code() ) {
$j --; // Try again.
--$j; // Try again.
continue;
}

return $term;
}
$term_ids[] = $term->term_id;
$term_ids[] = $term->term_id;
$levels[ $i ][] = $term->term_id;
$remaining --;
--$remaining;
}
} else {
// Subsequent hierarchy levels.
foreach ( $levels[ $i - 1 ] as $term_id ) {
$tcount = wp_rand( 0, $term_max );

for ( $j = 1; $j <= $tcount && $remaining > 0; $j ++ ) {
for ( $j = 1; $j <= $tcount && $remaining > 0; $j++ ) {
$term = self::generate( true, $taxonomy, $term_id );
if ( is_wp_error( $term ) ) {
if ( 'term_exists' === $term->get_error_code() ) {
$j --; // Try again.
--$j; // Try again.
continue;
}

return $term;
}
$term_ids[] = $term->term_id;
$term_ids[] = $term->term_id;
$levels[ $i ][] = $term->term_id;
$remaining --;
--$remaining;
}
}
}
Expand Down