Skip to content

Commit fc298d0

Browse files
mingoartecarlosescriAdrian Szulc
authored
Feature/api v2 (#133)
* Integrate Atomic Updates with API V2 (#131) refs #66504 Change-Id: Ib05cb1f336fcfa790956927a3d60d45cf51bd399 Co-authored-by: Carlos Escribano <carlos@doofinder.com> Co-authored-by: Adrian Szulc <adrian.szulc@magently.com> * Add docker files to run Magento 1 locally * Remove unnecesary file * Version 1.9.0 Co-authored-by: Carlos Escribano <carlos@doofinder.com> Co-authored-by: Adrian Szulc <adrian.szulc@magently.com>
1 parent 65421fe commit fc298d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1408
-136
lines changed

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid

‎app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Banner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Banner extends Mage_Core_Block_Template

‎app/code/community/Doofinder/Feed/Block/Integration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Locks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Locks extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_AtomicUpdates extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_DynamicFeedUrl extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description

‎app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category blocks
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

‎app/code/community/Doofinder/Feed/Helper/ApiConfiguration.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
/**
3+
* This file is part of Doofinder_Feed.
4+
*/
5+
6+
/**
7+
* @category Helpers
8+
* @package Doofinder_Feed
9+
* @version 1.9.0
10+
11+
* Class Doofinder_Feed_Helper_ApiConfiguration
12+
* The class responsible for providing API configuration values
13+
*/
14+
class Doofinder_Feed_Helper_ApiConfiguration extends Mage_Core_Helper_Abstract
15+
{
16+
/**
17+
* @return string
18+
*/
19+
public function getApiKey()
20+
{
21+
return Mage::getStoreConfig('doofinder_search/internal_settings/api_key');
22+
}
23+
24+
/**
25+
* @param string $storeCode
26+
* @return string
27+
*/
28+
public function getHashId($storeCode = null)
29+
{
30+
$storeCode = $storeCode === null ? Mage::app()->getStore() : $storeCode;
31+
return Mage::getStoreConfig('doofinder_search/internal_settings/hash_id', $storeCode);
32+
}
33+
34+
/**
35+
* @return string
36+
*/
37+
public function getManagementServer()
38+
{
39+
return Mage::getStoreConfig('doofinder_search/internal_settings/management_server');
40+
}
41+
}

‎app/code/community/Doofinder/Feed/Helper/Banner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.33
15+
* @version 1.9.0
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Banner extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
/**
1313
* Data helper for Doofinder Feed
1414
*
15-
* @version 1.8.33
15+
* @version 1.9.0
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Log.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
/**
1313
* Log helper for Doofinder Feed
1414
*
15-
* @version 1.8.33
15+
* @version 1.9.0
1616
* @package Doofinder_Feed
1717
*/
1818
class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract

‎app/code/community/Doofinder/Feed/Helper/Search.php

Lines changed: 6 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@ protected function loadDoofinderLibrary()
2222
spl_autoload_register(array($this, 'autoload'), true, true);
2323
}
2424

25-
/**
26-
* Get api key
27-
*
28-
* @param string $storeCode
29-
* @return string
30-
*/
31-
protected function getApiKey($storeCode = null)
32-
{
33-
$storeCode = $storeCode === null ? Mage::app()->getStore() : $storeCode;
34-
return Mage::getStoreConfig('doofinder_search/internal_settings/api_key', $storeCode);
35-
}
36-
37-
/**
38-
* Get hash id
39-
*
40-
* @param string $storeCode
41-
* @return string
42-
*/
43-
protected function getHashId($storeCode = null)
44-
{
45-
$storeCode = $storeCode === null ? Mage::app()->getStore() : $storeCode;
46-
return Mage::getStoreConfig('doofinder_search/internal_settings/hash_id', $storeCode);
47-
}
48-
4925
/**
5026
* Perform a doofinder search on given key.
5127
*
@@ -57,8 +33,9 @@ protected function getHashId($storeCode = null)
5733
*/
5834
public function performDoofinderSearch($queryText)
5935
{
60-
$hashId = $this->getHashId();
61-
$apiKey = $this->getApiKey();
36+
$apiConfiguration = Mage::helper('doofinder_feed/apiConfiguration');
37+
$hashId = $apiConfiguration->getHashId();
38+
$apiKey = $apiConfiguration->getApiKey();
6239
$limit = Mage::getStoreConfig('doofinder_search/internal_settings/request_limit', Mage::app()->getStore());
6340

6441
$this->loadDoofinderLibrary();
@@ -137,35 +114,6 @@ public function getResultsCount()
137114
return $this->_lastResults ? $this->_lastResults->getProperty('total') : 0;
138115
}
139116

140-
/**
141-
* Get Doofinder Search Engine
142-
*
143-
* @param string $storeCode
144-
* @return \Doofinder\Api\Management\SearchEngine
145-
*/
146-
public function getDoofinderSearchEngine($storeCode)
147-
{
148-
if ($this->_searchEngines === null) {
149-
$this->_searchEngines = array();
150-
151-
// Create DoofinderManagementApi instance
152-
$this->loadDoofinderLibrary();
153-
$api = new \Doofinder\Api\Management\Client($this->getApiKey($storeCode));
154-
155-
foreach ($api->getSearchEngines() as $searchEngine) {
156-
$this->_searchEngines[$searchEngine->hashid] = $searchEngine;
157-
}
158-
}
159-
160-
// Prepare SearchEngine instance
161-
$hashId = $this->getHashId($storeCode);
162-
if (!empty($this->_searchEngines[$hashId])) {
163-
return $this->_searchEngines[$hashId];
164-
}
165-
166-
return false;
167-
}
168-
169117
/**
170118
* Get search results banner data
171119
*
@@ -186,8 +134,9 @@ public function getDoofinderBannerData()
186134
*/
187135
public function getSearchClient()
188136
{
189-
$hashId = $this->getHashId();
190-
$apiKey = $this->getApiKey();
137+
$apiConfiguration = Mage::helper('doofinder_feed/apiConfiguration');
138+
$hashId = $apiConfiguration->getHashId();
139+
$apiKey = $apiConfiguration->getApiKey();
191140

192141
$this->loadDoofinderLibrary();
193142
$client = new \Doofinder\Api\Search\Client($hashId, $apiKey);

‎app/code/community/Doofinder/Feed/Helper/Tax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Helpers
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data

‎app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* @category Models
88
* @package Doofinder_Feed
9-
* @version 1.8.33
9+
* @version 1.9.0
1010
*/
1111

1212
class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data

0 commit comments

Comments
 (0)