Skip to content

Commit d8f95e8

Browse files
damcoudamcou
authored
Develop (#1169)
1 parent 291b95b commit d8f95e8

17 files changed

+1114
-195
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# CHANGE LOG
22

3+
## 1.18.0
4+
5+
### Updates
6+
- Update PHP Client to v 1.28.0 (#1162)
7+
- Update copyQueryRules to use scopedCopyIndex method (#1166)
8+
- Update README.md (#1167)
9+
310
## 1.17.1
411

512
### Updates

‎README.md

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Algolia Search for Magento 1.6+
22
==================
33

4-
![Latest version](https://img.shields.io/badge/latest-1.17.1-green.svg)
4+
![Latest version](https://img.shields.io/badge/latest-1.18.0-green.svg)
55

66
[![Build Status](https://travis-ci.org/algolia/algoliasearch-magento.svg?branch=master)](https://travis-ci.org/algolia/algoliasearch-magento)
77
![PHP >= 5.3](https://img.shields.io/badge/php-%3E=5.3-green.svg)
@@ -14,15 +14,15 @@ Algolia Search for Magento 1.6+
1414

1515
-------
1616

17-
🔎 Are you a Magento engineer? [Join our team](https://www.algolia.com/careers#!?j=eed58660-f684-436d-a2ff-e9947d2b65a2) and help us deliver the best search solution for Magento stores!
17+
🔎   **Need help?** Check out our [Troubleshooting Guide](https://www.algolia.com/doc/integration/magento-1/troubleshooting/data-indexes-queues/) and our [General FAQs](https://www.algolia.com/doc/integration/magento-1/troubleshooting/general-faq/). For feedback, bug reporting, or unresolved issues with the extension, please contact us at [[email protected]](mailto:[email protected]). Please include your Magento version, extension version, application ID, and steps to reproducing your issue. Add additional information like screenshots, screencasts, and error messages to help our team better troubleshoot your issues.
1818

1919
-------
2020

21-
- **Auto-completion menu:** Offer End-Users immediate access to your whole catalog from the dropdown menu, whatever your number of categories or attributes.
21+
- **Autocompletion menu:** Offer End-Users immediate access to your whole catalog from the dropdown menu, whatever your number of categories or attributes.
2222

23-
- **Instant search results page:** Have your search results page, navigation and pagination updated in realtime, after each keystroke.
23+
- **Instantsearch results page:** Have your search results page, navigation and pagination updated in realtime, after each keystroke.
2424

25-
Official website: [community.algolia.com/magento](https://community.algolia.com/magento).
25+
Official website: [https://www.algolia.com/solutions/magento/](https://www.algolia.com/solutions/magento/).
2626

2727
*Note: if your store is running under Magento version 2, please check our [Algolia for Magento 2 extension](https://github.com/algolia/algoliasearch-magento-2).*
2828

@@ -38,12 +38,12 @@ You can check out our [live demo](https://magento.algolia.com).
3838
Documentation
3939
--------------
4040

41-
Check out the [Algolia Search for Magento 1 documentation](https://community.algolia.com/magento/doc/m1/getting-started/).
41+
Check out the [Algolia Search for Magento 1 documentation](https://www.algolia.com/doc/integration/magento-1/getting-started/quick-start/).
4242

4343
Installation
4444
------------
4545

46-
Follow our [getting started guide](https://community.algolia.com/magento/doc/m1/getting-started/).
46+
Follow our [getting started guide](https://www.algolia.com/doc/integration/magento-1/getting-started/quick-start/).
4747

4848
Contribute to the Extension
4949
------------
@@ -101,3 +101,15 @@ $ cd /path/to/your/magento/directory
101101
$ modman init
102102
$ modman clone https://github.com/algolia/algoliasearch-magento.git
103103
```
104+
105+
Need Help?
106+
------------
107+
Here are some helpful documentation to help with your issue:
108+
109+
- [General FAQs](https://www.algolia.com/doc/integration/magento-1/troubleshooting/general-faq/)
110+
- [Troubleshooting Guide](https://www.algolia.com/doc/integration/magento-1/troubleshooting/data-indexes-queues/)
111+
- [Indexing Queue](https://www.algolia.com/doc/integration/magento-1/how-it-works/indexing-queue/)
112+
- [Frontend Custom Events](https://www.algolia.com/doc/integration/magento-1/customize/custom-front-end-events/)
113+
- [Dispatched Backend Events](https://www.algolia.com/doc/integration/magento-1/customize/custom-back-end-events/)
114+
115+
For feedback, bug reporting, or unresolved issues with the extension, please contact us at [[email protected]](mailto:[email protected]). Please include your Magento version, extension version, application ID, and steps to reproducing your issue. Add additional information like screenshots, screencasts, and error messages to help our team better troubleshoot your issues.

‎app/code/community/Algolia/Algoliasearch/Helper/Algoliahelper.php

+5-30
Original file line numberDiff line numberDiff line change
@@ -240,40 +240,15 @@ public function copySynonyms($fromIndexName, $toIndexName)
240240
/**
241241
* @param $fromIndexName
242242
* @param $toIndexName
243-
*
244-
* @throws \AlgoliaSearch\AlgoliaException
245243
*/
246244
public function copyQueryRules($fromIndexName, $toIndexName)
247245
{
248-
$fromIndex = $this->getIndex($fromIndexName);
249-
$toIndex = $this->getIndex($toIndexName);
250-
251-
$queryRulesToSet = array();
252-
253-
$hitsPerPage = 100;
254-
$page = 0;
255-
do {
256-
$fetchedQueryRules = $fromIndex->searchRules(array(
257-
'page' => $page,
258-
'hitsPerPage' => $hitsPerPage,
259-
));
260-
261-
foreach ($fetchedQueryRules['hits'] as $hit) {
262-
unset($hit['_highlightResult']);
246+
$res = $this->getClient()->scopedCopyIndex($fromIndexName, $toIndexName, array('rules'), array(
247+
'forwardToReplicas' => true,
248+
'clearExistingRules' => true
249+
));
263250

264-
$queryRulesToSet[] = $hit;
265-
}
266-
267-
$page++;
268-
} while (($page * $hitsPerPage) < $fetchedQueryRules['nbHits']);
269-
270-
if (empty($queryRulesToSet)) {
271-
$res = $toIndex->clearRules(true);
272-
} else {
273-
$res = $toIndex->batchRules($queryRulesToSet, true, true);
274-
}
275-
276-
$this->lastUsedIndexName = $toIndex;
251+
$this->lastUsedIndexName = $toIndexName;
277252
$this->lastTaskId = $res['taskID'];
278253
}
279254

‎app/code/community/Algolia/Algoliasearch/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Algolia_Algoliasearch>
5-
<version>1.17.1</version>
5+
<version>1.18.0</version>
66
</Algolia_Algoliasearch>
77
</modules>
88
<frontend>

‎app/code/community/Algolia/Algoliasearch/etc/system.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<algoliasearch translate="label" module="algoliasearch">
55
<label>
66
<![CDATA[
7-
Algolia Search 1.17.1
7+
Algolia Search 1.18.0
88
<style>
99
.algoliasearch-admin-menu span {
1010
padding-left: 38px !important;

‎app/etc/modules/Algolia_Algoliasearch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Algolia_Algoliasearch>
55
<active>true</active>
66
<codePool>community</codePool>
7-
<version>1.17.1</version>
7+
<version>1.18.0</version>
88
</Algolia_Algoliasearch>
99
</modules>
1010
</config>

‎lib/AlgoliaSearch/Analytics.php

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?php
2+
3+
namespace AlgoliaSearch;
4+
5+
class Analytics
6+
{
7+
/**
8+
* @var \AlgoliaSearch\Client
9+
*/
10+
private $client;
11+
12+
public function __construct(Client $client)
13+
{
14+
$this->client = $client;
15+
}
16+
17+
public function getABTests($params = array())
18+
{
19+
$params += array('offset' => 0, 'limit' => 10);
20+
21+
return $this->request('GET', '/2/abtests', $params);
22+
}
23+
24+
public function getABTest($abTestID)
25+
{
26+
if (!$abTestID) {
27+
throw new AlgoliaException('Cannot retrieve ABTest because the abtestID is invalid.');
28+
}
29+
30+
return $this->request('GET', sprintf('/2/abtests/%s', urlencode($abTestID)));
31+
}
32+
33+
public function addABTest($abTest)
34+
{
35+
return $this->request(
36+
'POST',
37+
'/2/abtests',
38+
array(),
39+
$abTest
40+
);
41+
}
42+
43+
public function stopABTest($abTestID)
44+
{
45+
if (!$abTestID) {
46+
throw new AlgoliaException('Cannot retrieve ABTest because the abtestID is invalid.');
47+
}
48+
49+
return $this->request('POST', sprintf('/2/abtests/%s/stop', urlencode($abTestID)));
50+
}
51+
52+
public function deleteABTest($abTestID)
53+
{
54+
if (!$abTestID) {
55+
throw new AlgoliaException('Cannot retrieve ABTest because the abtestID is invalid.');
56+
}
57+
58+
return $this->request('DELETE', sprintf('/2/abtests/%s', urlencode($abTestID)));
59+
}
60+
61+
public function waitTask($indexName, $taskID, $timeBeforeRetry = 100, $requestHeaders = array())
62+
{
63+
$this->client->waitTask($indexName, $taskID, $timeBeforeRetry, $requestHeaders);
64+
}
65+
66+
protected function request(
67+
$method,
68+
$path,
69+
$params = array(),
70+
$data = array()
71+
) {
72+
return $this->client->request(
73+
$this->client->getContext(),
74+
$method,
75+
$path,
76+
$params,
77+
$data,
78+
array('analytics.algolia.com'),
79+
$this->client->getContext()->connectTimeout,
80+
$this->client->getContext()->readTimeout
81+
);
82+
}
83+
}

0 commit comments

Comments
 (0)