X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fpoints%2Fclass_UserPoints.php;h=94c8e991c2151312fbcb928a44adbc596cfc2e13;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=5f655a538f05ccfcb834b57ea415f6b25aebacae;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 5f655a53..94c8e991 100644
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -3,11 +3,14 @@
 namespace Org\Mxchange\CoreFramework\User\Points;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
-use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Traits\Manager\Account\ManageableAccountTrait;
+use Org\Mxchange\CoreFramework\Traits\Result\Search\SearchableResultTrait;
 use Org\Mxchange\CoreFramework\User\ManageableAccount;
 
 /**
@@ -15,11 +18,7 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/points/class_UserPoints.php
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/points/class_UserPoints.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -37,6 +36,10 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePoints {
+	// Load traits
+	use ManageableAccountTrait;
+	use SearchableResultTrait;
+
 	/**
 	 * Amount of points
 	 */
@@ -69,14 +72,14 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 		$searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
 		// Add search criteria
-		$searchInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS_UID, $userInstance->getUserId());
+		$searchInstance->addCriteria(UserPointsDatabaseFrontend::DB_COLUMN_POINTS_UID, $userInstance->getUserId());
 		$searchInstance->setLimit(1);
 
-		// Get a wrapper instance
-		$wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('user_points_db_wrapper_class');
+		// Get a frontend instance
+		$frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('user_points_db_frontend_class');
 
 		// Get result back
-		$resultInstance = $wrapperInstance->doSelectByCriteria($searchInstance);
+		$resultInstance = $frontendInstance->doSelectByCriteria($searchInstance);
 
 		// Advance to first entry by default
 		$resultInstance->next();
@@ -119,13 +122,13 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 		$hasRequired = false;
 
 		// Get the required points entry
-		$requiredPoints = $this->getConfigInstance()->getConfigEntry($action . '_action_points');
+		$requiredPoints = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($action . '_action_points');
 
 		// Rewind always
 		$this->getResultInstance()->rewind();
 
 		// Do we have an entry?
-		if ($this->getResultInstance()->next()) {
+		if ($this->getResultInstance()->valid()) {
 			// Get the entry
 			$currEntry = $this->getResultInstance()->current();
 
@@ -148,24 +151,24 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 		$this->getResultInstance()->rewind();
 
 		// Do we have an entry?
-		if ($this->getResultInstance()->next()) {
+		if ($this->getResultInstance()->valid()) {
 			// Get the entry
-			$entry = $this->getResultInstance()->current();
+			$currentEntry = $this->getResultInstance()->current();
 
 			// Add the points
-			$amount += $entry[UserPointsDatabaseWrapper::DB_COLUMN_POINTS];
+			$amount += $currentEntry[UserPointsDatabaseFrontend::DB_COLUMN_POINTS];
 
 			// Now get another criteria
 			$updateInstance = ObjectFactory::createObjectByConfiguredName('update_criteria_class');
 
 			// And add our both entries
-			$updateInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS, $amount);
+			$updateInstance->addCriteria(UserPointsDatabaseFrontend::DB_COLUMN_POINTS, $amount);
 
 			// Add the search criteria for searching for the right entry
 			$updateInstance->setSearchInstance($searchInstance);
 
-			// Set wrapper class name
-			$updateInstance->setWrapperConfigEntry('user_points_db_wrapper_class');
+			// Set frontend class name
+			$updateInstance->setFrontendConfigEntry('user_points_db_frontend_class');
 
 			// Remember the update in database result
 			$this->getResultInstance()->add2UpdateQueue($updateInstance);
@@ -174,7 +177,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 			$this->setAmount($amount);
 
 			// Create the new entry
-			$wrapperInstance->insertUserPoints($this);
+			$frontendInstance->insertUserPoints($this);
 		}
 	}
 
@@ -187,10 +190,10 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 	 */
 	public function addElementsToDataSet (StoreableCriteria $criteriaInstance) {
 		// Add user id
-		$criteriaInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS_UID, $this->getUserInstance()->getUserId());
+		$criteriaInstance->addCriteria(UserPointsDatabaseFrontend::DB_COLUMN_POINTS_UID, $this->getUserInstance()->getUserId());
 
 		// Add amount
-		$criteriaInstance->addCriteria(UserPointsDatabaseWrapper::DB_COLUMN_POINTS, $this->getAmount());
+		$criteriaInstance->addCriteria(UserPointsDatabaseFrontend::DB_COLUMN_POINTS, $this->getAmount());
 	}
 
 }