From 6a47119fb4f36d3789f5cddb380aecf7d22dcc48 Mon Sep 17 00:00:00 2001 From: "usama.jameel" Date: Tue, 12 Aug 2025 13:42:29 +0500 Subject: [PATCH] remove schema name from query builder and Dao --- .../com/utopiaindustries/dao/ctp/AuthorityDAO.java | 2 +- .../com/utopiaindustries/dao/ctp/BundleDAO.java | 2 +- .../com/utopiaindustries/dao/ctp/CutPieceDAO.java | 2 +- .../utopiaindustries/dao/ctp/CutPieceTypeDAO.java | 2 +- .../utopiaindustries/dao/ctp/FinishedItemDAO.java | 2 +- .../dao/ctp/InventoryAccountDAO.java | 2 +- .../dao/ctp/InventoryTransactionDAO.java | 2 +- .../dao/ctp/InventoryTransactionLegDAO.java | 2 +- .../com/utopiaindustries/dao/ctp/JobCardDAO.java | 2 +- .../utopiaindustries/dao/ctp/JobCardItemDAO.java | 2 +- .../utopiaindustries/dao/ctp/MasterBundleDAO.java | 2 +- .../com/utopiaindustries/dao/ctp/ProcessDAO.java | 2 +- .../dao/ctp/PurchaseOrderCTPDao.java | 2 +- .../utopiaindustries/dao/ctp/SkuCutPiecesDAO.java | 2 +- .../dao/ctp/StitchingOfflineItemDAO.java | 2 +- .../dao/ctp/SummaryInventoryReportDao.java | 14 ++------------ .../java/com/utopiaindustries/dao/ctp/UserDAO.java | 2 +- .../dao/ctp/UserInventoryAccountDAO.java | 2 +- .../querybuilder/ctp/BundleQueryBuilder.java | 2 +- .../querybuilder/ctp/FinishedItemQueryBuilder.java | 2 +- .../ctp/InventoryAccountQueryBuilder.java | 2 +- .../querybuilder/ctp/JobCardQueryBuilder.java | 2 +- .../querybuilder/ctp/MasterBundleQueryBuilder.java | 2 +- .../ctp/PurchaseOrderCTPQueryBuilder.java | 2 +- .../ctp/StichedOfflineItemQueryBuilder.java | 2 +- .../ctp/SummaryInventoryReportQueryBuilder.java | 2 +- src/main/resources/application-prod.yml | 2 +- 27 files changed, 28 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java index e82d950..c500b65 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java @@ -13,7 +13,7 @@ public class AuthorityDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.authorities"; + private final String TABLE_NAME = "authorities"; private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY username DESC", TABLE_NAME ); private final String SELECT_BY_USERNAME_QUERY = String.format( "SELECT * FROM %s WHERE username = :username ORDER BY username DESC", TABLE_NAME ); private final String SELECT_BY_AUTHORITY_QUERY = String.format( "SELECT * FROM %s WHERE authority = :authority ORDER BY username DESC", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/BundleDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/BundleDAO.java index 7efbc0f..abbf865 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/BundleDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/BundleDAO.java @@ -17,7 +17,7 @@ public class BundleDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.bundle"; + private final String TABLE_NAME = "bundle"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java index 38ad87d..9824fd7 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java @@ -16,7 +16,7 @@ public class CutPieceDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.cut_piece"; + private final String TABLE_NAME = "cut_piece"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceTypeDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceTypeDAO.java index 1acbd36..c96b28c 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceTypeDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceTypeDAO.java @@ -16,7 +16,7 @@ public class CutPieceTypeDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.cut_piece_type"; + private final String TABLE_NAME = "cut_piece_type"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java index ec8345d..ffac865 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java @@ -18,7 +18,7 @@ public class FinishedItemDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.finished_item"; + private final String TABLE_NAME = "finished_item"; private final String SELECT_QUERY = String.format("SELECT * FROM %s WHERE id = :id", TABLE_NAME); private final String SELECT_ALL_QUERY = String.format("SELECT * FROM %s ORDER BY id DESC", TABLE_NAME); private final String SELECT_QUERY_BY_BARCODE_QA_STATUS =String.format("SELECT CASE WHEN EXISTS (SELECT 1 FROM %s WHERE barcode = :barcode AND (is_store = TRUE OR is_packed = TRUE)) THEN TRUE ELSE FALSE END AS result", TABLE_NAME); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java index 95b0aee..589d058 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java @@ -16,7 +16,7 @@ public class InventoryAccountDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.inventory_account"; + private final String TABLE_NAME = "inventory_account"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY title DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionDAO.java index b659485..a4b3fc5 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionDAO.java @@ -16,7 +16,7 @@ public class InventoryTransactionDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.inventory_transaction"; + private final String TABLE_NAME = "inventory_transaction"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionLegDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionLegDAO.java index 6f2c455..2bb75a3 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionLegDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/InventoryTransactionLegDAO.java @@ -18,7 +18,7 @@ public class InventoryTransactionLegDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.inventory_transaction_leg"; + private final String TABLE_NAME = "inventory_transaction_leg"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java index 9223638..c842b7b 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java @@ -18,7 +18,7 @@ public class JobCardDAO { @Autowired private NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.job_card"; + private final String TABLE_NAME = "job_card"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String SELECT_ALL_BY_PO_ID = String.format( "SELECT * FROM %s WHERE purchase_order_id = :purchase_order_id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java index b99977e..2886822 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardItemDAO.java @@ -17,7 +17,7 @@ public class JobCardItemDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.job_card_item"; + private final String TABLE_NAME = "job_card_item"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/MasterBundleDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/MasterBundleDAO.java index c8143d6..a05980d 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/MasterBundleDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/MasterBundleDAO.java @@ -16,7 +16,7 @@ public class MasterBundleDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.master_bundle"; + private final String TABLE_NAME = "master_bundle"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/ProcessDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/ProcessDAO.java index 4ef80f8..4c79d53 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/ProcessDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/ProcessDAO.java @@ -16,7 +16,7 @@ public class ProcessDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.process"; + private final String TABLE_NAME = "process"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id ASC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java b/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java index 52203ff..fe16df3 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/PurchaseOrderCTPDao.java @@ -21,7 +21,7 @@ public class PurchaseOrderCTPDao { @Autowired private NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.purchase_order"; + private final String TABLE_NAME = "purchase_order"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY created_at DESC LIMIT :limit ", TABLE_NAME ); private final String SELECT_BY_PO_CODE = String.format("SELECT * FROM %s WHERE purchase_order_code = :purchase_order_code ORDER BY created_at DESC LIMIT :limit", TABLE_NAME); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/SkuCutPiecesDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/SkuCutPiecesDAO.java index 9d7e11c..55cb07d 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/SkuCutPiecesDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/SkuCutPiecesDAO.java @@ -16,7 +16,7 @@ import java.util.List; public class SkuCutPiecesDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.sku_cut_piece"; + private final String TABLE_NAME = "sku_cut_piece"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java index d1764ca..a5403a1 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java @@ -19,7 +19,7 @@ public class StitchingOfflineItemDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.stitching_offline_item"; + private final String TABLE_NAME = "stitching_offline_item"; private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME ); private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME ); private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id AND inline_received = TRUE", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java index d84f3fe..c55e916 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java @@ -12,18 +12,8 @@ public class SummaryInventoryReportDao { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.inventory_transaction_leg "; - String SELECT_QUERY = "SELECT job_card_id, item_id, account_id, parent_document_id, DATE(transaction_leg_datetime) AS transaction_date, " - + "sku, parent_document_type, parent_document_piece_type, " - + "SUM(CASE WHEN type = 'IN' THEN 1 ELSE 0 END) AS total_in, " - + "SUM(CASE WHEN type = 'OUT' THEN 1 ELSE 0 END) AS total_out " - + "FROM " + TABLE_NAME + " " - + "WHERE " - + "(:sku IS NULL OR sku = :sku) " - + "AND (:item_id IS NULL OR item_id = :item_id) " - + "OR (:start_date IS NULL OR :end_date IS NULL OR transaction_leg_datetime BETWEEN :start_date AND :end_date) " - + "GROUP BY DATE(transaction_leg_datetime), account_id, sku, parent_document_type, parent_document_piece_type " - + "ORDER BY transaction_date, sku;"; + private final String TABLE_NAME = "inventory_transaction_leg"; + String SELECT_QUERY = String.format("SELECT job_card_id, item_id, account_id, parent_document_id, DATE(transaction_leg_datetime) AS transaction_date, sku, parent_document_type, parent_document_piece_type, SUM(CASE WHEN type = 'IN' THEN 1 ELSE 0 END) AS total_in, SUM(CASE WHEN type = 'OUT' THEN 1 ELSE 0 END) AS total_out FROM %s WHERE (:sku IS NULL OR sku = :sku) AND (:item_id IS NULL OR item_id = :item_id) OR (:start_date IS NULL OR :end_date IS NULL OR transaction_leg_datetime BETWEEN :start_date AND :end_date) GROUP BY DATE(transaction_leg_datetime), account_id, sku, parent_document_type, parent_document_piece_type ORDER BY transaction_date, sku;", TABLE_NAME); public SummaryInventoryReportDao(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; diff --git a/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java index 401f31b..4661a3f 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/UserDAO.java @@ -14,7 +14,7 @@ public class UserDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.users"; + private final String TABLE_NAME = "users"; private final String SELECT_BY_USERNAME = String.format( "SELECT * FROM %s WHERE username = :username", TABLE_NAME ); private final String FIND_ALL_QUERY = String.format( "SELECT * FROM %s", TABLE_NAME ); private final String INSERT_QUERY = String.format( "INSERT INTO %s (username, password, enabled) VALUES (:username, :password, :enabled ) ON DUPLICATE KEY UPDATE username = :username, password = :password, enabled = :enabled", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/dao/ctp/UserInventoryAccountDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/UserInventoryAccountDAO.java index e5acd09..2d83e71 100644 --- a/src/main/java/com/utopiaindustries/dao/ctp/UserInventoryAccountDAO.java +++ b/src/main/java/com/utopiaindustries/dao/ctp/UserInventoryAccountDAO.java @@ -13,7 +13,7 @@ public class UserInventoryAccountDAO { private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; - private final String TABLE_NAME = "cut_to_pack.user_inventory_account"; + private final String TABLE_NAME = "user_inventory_account"; private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY username DESC", TABLE_NAME ); private final String SELECT_BY_USERNAME_QUERY = String.format( "SELECT * FROM %s WHERE username = :username ORDER BY username DESC", TABLE_NAME ); private final String SELECT_BY_AUTHORITY_QUERY = String.format( "SELECT * FROM %s WHERE account_id = :account_id ORDER BY username DESC", TABLE_NAME ); diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/BundleQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/BundleQueryBuilder.java index cd382b2..9295234 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/BundleQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/BundleQueryBuilder.java @@ -27,7 +27,7 @@ public class BundleQueryBuilder { QueryBuilder qb = new QueryBuilder() - .setTable("cut_to_pack.bundle") + .setTable("bundle") .setColumns("*") .where() .columnEquals("id", id) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java index 2dc8de1..370c3b1 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/FinishedItemQueryBuilder.java @@ -27,7 +27,7 @@ public class FinishedItemQueryBuilder { } return ( new QueryBuilder() ) - .setTable("cut_to_pack.finished_item") + .setTable("finished_item") .setColumns("*") .where() .columnEquals("id", id) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java index d8618eb..f73c0b2 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java @@ -39,7 +39,7 @@ public class InventoryAccountQueryBuilder { } QueryBuilder qb = (new QueryBuilder()) - .setTable("cut_to_pack.inventory_account") + .setTable("inventory_account") .setColumns("*") .where() .columnLikeTitle("title", title) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java index 6f085c0..52ad4c9 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java @@ -27,7 +27,7 @@ public class JobCardQueryBuilder { } return (new QueryBuilder()) - .setTable("cut_to_pack.job_card") + .setTable("job_card") .setColumns("*") .where() .columnEquals("created_by", createdBy) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/MasterBundleQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/MasterBundleQueryBuilder.java index 2a85fbf..fce420c 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/MasterBundleQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/MasterBundleQueryBuilder.java @@ -27,7 +27,7 @@ public class MasterBundleQueryBuilder { } } QueryBuilder queryBuilder = new QueryBuilder() - .setTable( "cut_to_pack.master_bundle" ) + .setTable( "master_bundle" ) .setColumns( "*" ) .where() .columnEquals( "id", id ) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/PurchaseOrderCTPQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/PurchaseOrderCTPQueryBuilder.java index fceb334..3869f63 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/PurchaseOrderCTPQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/PurchaseOrderCTPQueryBuilder.java @@ -28,7 +28,7 @@ public class PurchaseOrderCTPQueryBuilder { } return (new QueryBuilder()) - .setTable("cut_to_pack.purchase_order") + .setTable("purchase_order") .setColumns("*") .where() .columnEquals("created_by", createdBy) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java index 680887e..74e8bcb 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java @@ -25,7 +25,7 @@ public class StichedOfflineItemQueryBuilder { } } QueryBuilder qb = (new QueryBuilder()) - .setTable("cut_to_pack.stitching_offline_item") + .setTable("stitching_offline_item") .setColumns("*") .where() .columnEquals("id", id) diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java index 18335ec..49a51d6 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.List; public class SummaryInventoryReportQueryBuilder { - private final static String TABLE_NAME = " cut_to_pack.inventory_transaction_leg "; + private final static String TABLE_NAME = "inventory_transaction_leg"; public static String buildQuery(String itemId, String sku, diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 807cd84..8ca860d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -21,7 +21,7 @@ spring: pool-name: UINDCosmosPool leak-detection-threshold: 2000 localdatasource: - jdbcUrl: jdbc:mysql://localhost:3306/cut_to_pack + jdbcUrl: jdbc:mysql://localhost:3306/cut_to_pack_new username: root password: Utopia01 driverClassName: com.mysql.cj.jdbc.Driver