Merge pull request #30 from nguyenanhung/v3.2.0-develop

Update Project at Mon Mar 27 14:29:16 +07 2023

Author: hungnguyenhp

config/constants.php

@@ -18,3 +18,5 @@
 defined('POWERED_HUNGNG_SHORT_NAME') or define('POWERED_HUNGNG_SHORT_NAME', 'Hung Nguyen');
 defined('CODEIGNITER_HUNGNG_VENDOR_PACKAGES') or define('CODEIGNITER_HUNGNG_VENDOR_PACKAGES', 'https://packagist.org/packages/nguyenanhung/codeigniter-framework');
 defined('CODEIGNITER_HUNGNG_VENDOR_SOURCE') or define('CODEIGNITER_HUNGNG_VENDOR_SOURCE', 'https://github.com/nguyenanhung/codeigniter-framework');
+defined('CI3_FRAMEWORK_ISSUES') or define('CI3_FRAMEWORK_ISSUES', 'https://github.com/nguyenanhung/codeigniter-framework/issues');
+defined('CI3_FRAMEWORK_PULL_REQUESTS') or define('CI3_FRAMEWORK_PULL_REQUESTS', 'https://github.com/nguyenanhung/codeigniter-framework/pulls');

hungng/HungNG_CI_Exception.php

@@ -0,0 +1,25 @@
+<?php
+defined('BASEPATH') or exit('No direct script access allowed');
+
+class HungNG_CI_Exception extends Exception
+{
+	/**
+	 * HungNG_CI_Exception constructor.
+	 *
+	 * @param $message
+	 * @param $code
+	 *
+	 * @throws \HungNG_CI_Exception
+	 *
+	 * @author   : 713uk13m <dev@nguyenanhung.com>
+	 * @copyright: 713uk13m <dev@nguyenanhung.com>
+	 */
+	public function __construct($message = null, $code = 0)
+	{
+		if (!$message) {
+			throw new $this('Unknown ' . get_class($this));
+		}
+		$error_message = $message . ' - If you believe this is a codebase or framework bug, please report it and let us know here: ' . CI3_FRAMEWORK_ISSUES . ' - Codebase will be improved by your contributions. Thank you!';
+		parent::__construct($error_message, $code);
+	}
+}

hungng/HungNG_Custom_Based_model.php

@@ -529,9 +529,10 @@ public function prepare_wheres_not_statement($wheres)
 		 * @param $table
 		 *
 		 * @return bool|\CI_DB_query_builder|object
+		 * @throws \HungNG_CI_Exception
 		 * @author   : 713uk13m <dev@nguyenanhung.com>
 		 * @copyright: 713uk13m <dev@nguyenanhung.com>
-		 * @time     : 08/02/2023 42:52
+		 * @time     : 27/03/2023 15:20
 		 */
 		public function only_status_is_active($act = true, $field = 'status', $table = '')
 		{
@@ -540,11 +541,11 @@ public function only_status_is_active($act = true, $field = 'status', $table = '
 				$useField = !empty($field) ? trim($field) : 'status';
 				$tableExists = $this->db->table_exists($tableName);
 				if ($tableExists === false) {
-					return $this->db;
+					throw new HungNG_CI_Exception('Table ' . $tableName . ' không tồn tại', 404);
 				}
 				$fieldExists = $this->db->field_exists($useField, $tableName);
 				if ($fieldExists === false) {
-					return $this->db;
+					throw new HungNG_CI_Exception('Field ' . $useField . ' không tìm thấy trong bảng ' . $tableName, 404);
 				}
 
 				return $this->db->where($tableName . '.' . $useField, self::DEFAULT_STATUS_IS_ACTIVE);
@@ -561,9 +562,10 @@ public function only_status_is_active($act = true, $field = 'status', $table = '
 		 * @param $table
 		 *
 		 * @return bool|\CI_DB_query_builder|object
+		 * @throws \HungNG_CI_Exception
 		 * @author   : 713uk13m <dev@nguyenanhung.com>
 		 * @copyright: 713uk13m <dev@nguyenanhung.com>
-		 * @time     : 08/02/2023 42:52
+		 * @time     : 27/03/2023 17:52
 		 */
 		public function only_status_is_de_active($act = true, $field = 'status', $table = '')
 		{
@@ -572,11 +574,11 @@ public function only_status_is_de_active($act = true, $field = 'status', $table
 				$useField = !empty($field) ? trim($field) : 'status';
 				$tableExists = $this->db->table_exists($tableName);
 				if ($tableExists === false) {
-					return $this->db;
+					throw new HungNG_CI_Exception('Table ' . $tableName . ' không tồn tại', 404);
 				}
 				$fieldExists = $this->db->field_exists($useField, $tableName);
 				if ($fieldExists === false) {
-					return $this->db;
+					throw new HungNG_CI_Exception('Field ' . $useField . ' không tìm thấy trong bảng ' . $tableName, 404);
 				}
 
 				return $this->db->where($tableName . '.' . $useField, self::DEFAULT_STATUS_IS_DE_ACTIVE);