From 7160aacdc83cfcef9ffd795cec7e9397bfbb3698 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Thu, 15 Apr 2021 21:50:58 +0200
Subject: Make Band::create return band object, not just id.

---
 includes/admin/views/giglog_import_gigs.php |  6 +++---
 includes/band.php                           | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'includes')

diff --git a/includes/admin/views/giglog_import_gigs.php b/includes/admin/views/giglog_import_gigs.php
index ca1c7b8..17b1cbd 100644
--- a/includes/admin/views/giglog_import_gigs.php
+++ b/includes/admin/views/giglog_import_gigs.php
@@ -61,7 +61,7 @@ if ( !class_exists( 'GiglogAdmin_ImportGigsPage' ) ) {
                 }
 
                 $resultArray = explode("\t", $line);
-                $band        = trim($resultArray[0]);
+                $bandname    = trim($resultArray[0]);
                 $venue       = trim($resultArray[1]);
                 $condate     = date('Y-m-d', strtotime($resultArray[2]));
                 $ticketlink  = trim($resultArray[3]);
@@ -69,7 +69,7 @@ if ( !class_exists( 'GiglogAdmin_ImportGigsPage' ) ) {
                 //first item in the row should be band $resultArray[0]; second should be venue $resultArray[1]; third should be concert date $resultArray[2];
                 //fourth item is ticketlink $resultArray[3];  fifth item is eventlink $resultArray[4];
 
-                $newconcert[0] = GiglogAdmin_Band::create($band,'');
+                $band = GiglogAdmin_Band::create($bandname);
 
                 if (is_numeric($venue))
                     $newconcert[1] = $venue;
@@ -81,7 +81,7 @@ if ( !class_exists( 'GiglogAdmin_ImportGigsPage' ) ) {
                 //not sure how to check dates, hopefully manual verification of files will take care of it
 
                     GiglogAdmin_Concert::create(
-                        $newconcert[0],
+                        $band->id(),
                         $newconcert[1],
                         $condate,
                         $ticketlink,
diff --git a/includes/band.php b/includes/band.php
index ad5ce28..13a816f 100644
--- a/includes/band.php
+++ b/includes/band.php
@@ -20,10 +20,10 @@ if ( !class_exists('GiglogAdmin_Band') ) {
             $this->country = isset($attrs->country) ? $attrs->country : 'NO';
         }
 
-        static function create($bandname, $country)
+        static function create($bandname, $country = 'NO')
         {
             global $wpdb;
-            if (empty($country)) $country = 'NO';
+
             $bandsql = 'SELECT id FROM wpg_bands WHERE upper(wpgband_name)="' . $bandname . '" and wpgband_country = "'.$country.'"';
             $results = $wpdb->get_results($bandsql);
             $attrs = new stdClass();
@@ -37,20 +37,19 @@ if ( !class_exists('GiglogAdmin_Band') ) {
             }
             else
             {
+                $attrs->id = '';
 
-            $attrs->id = '';
-
-            $bid = new GiglogAdmin_Band($attrs);
-            $bid->save();
+                $bid = new GiglogAdmin_Band($attrs);
+                $bid->save();
 
 
-            error_log( 'NEW BAND ADDED: '
-            . ' ID: ' . $bid -> id()
-            . ' BAND NAME ' . $bandname
-            . ', COUNTRY ' . $country);
+                error_log( 'NEW BAND ADDED: '
+                    . ' ID: ' . $bid -> id()
+                    . ' BAND NAME ' . $bandname
+                    . ', COUNTRY ' . $country);
             }
-            return ($bid->id());
 
+            return $bid;
         }
 
 
-- 
cgit v1.2.3


From a851dd35b8ead5e4688062ff0c6e94d83133b006 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Thu, 15 Apr 2021 22:22:40 +0200
Subject: Refactor Band::create into Band::find and ::create

Not sure if it's a good idea to have `create` return an existing band.
Will have to look at callsites to see if it should be renamed back or if
the callsite should be changed.
---
 includes/band.php | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

(limited to 'includes')

diff --git a/includes/band.php b/includes/band.php
index 13a816f..47b663c 100644
--- a/includes/band.php
+++ b/includes/band.php
@@ -22,34 +22,41 @@ if ( !class_exists('GiglogAdmin_Band') ) {
 
         static function create($bandname, $country = 'NO')
         {
-            global $wpdb;
+            $band = GiglogAdmin_Band::find($bandname, $country);
 
-            $bandsql = 'SELECT id FROM wpg_bands WHERE upper(wpgband_name)="' . $bandname . '" and wpgband_country = "'.$country.'"';
-            $results = $wpdb->get_results($bandsql);
-            $attrs = new stdClass();
-            $attrs->bandname = $bandname;
-            $attrs->country = $country;
+            if ( ! $band ) {
+                $band = new GiglogAdmin_Band((object) [
+                    'bandname' => $bandname,
+                    'country' => $country,
+                ]);
 
-            if ($results)
-            {
-                $attrs->id = $results[0]->id;
-                $bid = new GiglogAdmin_Band($attrs);
+                $band->save();
+
+                error_log( 'NEW BAND ADDED: '
+                    . ' ID: ' . $band->id()
+                    . ' BAND NAME ' . $band->bandname()
+                    . ', COUNTRY ' . $band->country());
             }
-            else
-            {
-                $attrs->id = '';
 
-                $bid = new GiglogAdmin_Band($attrs);
-                $bid->save();
+            return $band;
+        }
 
+        static function find($name, $country)
+        {
+            global $wpdb;
 
-                error_log( 'NEW BAND ADDED: '
-                    . ' ID: ' . $bid -> id()
-                    . ' BAND NAME ' . $bandname
-                    . ', COUNTRY ' . $country);
-            }
+            $q = 'SELECT * FROM wpg_bands '
+                . 'WHERE upper(wpgband_name)="' . $name
+                . '" and wpgband_country = "' . $country.'"';
 
-            return $bid;
+            $results = $wpdb->get_results($q);
+
+            if ($results) {
+                return new GiglogAdmin_Band($results[0]);
+            }
+            else {
+                return NULL;
+            }
         }
 
 
-- 
cgit v1.2.3