RediPress compatibility

devgeniem · Jan 13, 2023 · f64509b · f64509b
2 parents 41d556d + c757948
commit f64509b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.38.0]
+
+### Changed
+- Google Maps field to be queryable to RediPress.
+- All mainline versions from now on require RediPress 2.0 if the integration is used.
+
 ## [1.37.2] - 2022-11-04
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         }
     ],
     "conflict": {
-        "devgeniem/redipress": "<1.9"
+        "devgeniem/redipress": "<2.0"
     },
     "autoload": {
         "psr-4": {"Geniem\\ACF\\": "src/"}

diff --git a/plugin.php b/plugin.php
@@ -3,7 +3,7 @@
 Plugin Name: ACF Codifier
 Plugin URI: https://github.com/devgeniem/acf-codifier
 Description: A helper class to make defining ACF field groups and fields easier in the code.
-Version: 1.37.1
+Version: 1.38.0
 Author: Miika Arponen / Geniem Oy
 Author URI: https://geniem.fi
 License: GPL-3.0

diff --git a/src/Field.php b/src/Field.php
@@ -286,7 +286,14 @@ public function export( bool $register = false, $parent = null ) : ?array {
                     if ( $this->get_is_user() ) {
                         switch ( $filter['filter'] ) {
                             case 'redipress/schema_fields':
-                                $filter['filter'] = 'redipress/user_schema_fields';
+                                $filter['filter'] = 'redipress/index/users/schema_fields';
+                                break;
+                        }
+                    }
+                    else {
+                        switch ( $filter['filter'] ) {
+                            case 'redipress/schema_fields':
+                                $filter['filter'] = 'redipress/index/posts/schema_fields';
                                 break;
                         }
                     }
@@ -873,7 +880,7 @@ private function redipress_add_queryable_internal() {
                     }
 
                     if ( strpos( $post_id, 'block_' ) !== false &&
-                        ! ( $post_id = \Geniem\RediPress\Index\Index::indexing() ) // phpcs:ignore
+                        ! ( $post_id = \Geniem\RediPress\Index\PostIndex::indexing() ) // phpcs:ignore
                     ) {
                         $document_uri = filter_input( INPUT_SERVER, 'DOCUMENT_URI', \FILTER_SANITIZE_STRING );
 
@@ -914,7 +921,7 @@ private function redipress_add_queryable_internal() {
                     $users = true;
                 }
                 elseif ( is_numeric( $post_id ) ) {
-                    $doc_id = \Geniem\RediPress\Index\Index::get_document_id( get_post( $post_id ) );
+                    $doc_id = \Geniem\RediPress\Index\PostIndex::get_document_id( get_post( $post_id ) );
                 }
                 elseif ( strpos( $post_id, 'block_' ) !== false ) {
                     if ( ! ( $post_id = \Geniem\RediPress\Index\Index::indexing() ) ) {
@@ -923,7 +930,7 @@ private function redipress_add_queryable_internal() {
                         $post_id = basename( $document_uri );
                     }
 
-                    $doc_id = \Geniem\RediPress\Index\Index::get_document_id( get_post( $post_id ) );
+                    $doc_id = \Geniem\RediPress\Index\PostIndex::get_document_id( get_post( $post_id ) );
                 }
 
                 if ( ! empty( $doc_id ) ) {
@@ -955,6 +962,7 @@ private function redipress_add_queryable_internal() {
         ];
 
         $this->filters['redipress_schema_fields'] = [
+            // This gets changed to the proper filter in the export method.
             'filter'        => 'redipress/schema_fields',
             'function'      => function( $fields ) {
 

diff --git a/src/Field/GoogleMap.php b/src/Field/GoogleMap.php
@@ -45,6 +45,29 @@ class GoogleMap extends \Geniem\ACF\Field {
      */
     protected $height;
 
+    /**
+     * What type the RediPress index field should be.
+     *
+     * @var string
+     */
+    protected $redipress_field_type = 'Geo';
+
+    /**
+     * Constructor.
+     *
+     * @param string      $label          Label for the field.
+     * @param string|null $key            Key for the field.
+     * @param string|null $name           Name for the field.
+     * @throws \Geniem\ACF\Exception Throw error if mandatory property is not set.
+     */
+    public function __construct( string $label, string $key = null, string $name = null ) {
+        parent::__construct( $label, $key, $name );
+
+        $this->redipress_queryable_filter = function( $value ) {
+            return $value['lat'] . ',' . $value['lng'];
+        };
+    }
+
     /**
      * Set center_lat variable
      *

diff --git a/src/Group.php b/src/Group.php
@@ -519,7 +519,7 @@ public function register() {
                 \acf_add_local_field_group( $exported );
 
                 $this->registered = true;
-            });
+            }, 15 );
         }
     }