From ca1ce40547a79ef6b877dfb556632a8e7bbf87c8 Mon Sep 17 00:00:00 2001
From: Florian Semm <florian.semm@gmx.de>
Date: Sat, 31 Mar 2012 20:25:25 +0200
Subject: [PATCH] solve #5

---
 Doctrine/Annotation/Field.php          |  4 ++++
 Doctrine/Mapper/MetaInformation.php    |  4 +++-
 Event/DeleteLogListener.php            | 30 --------------------------
 Event/InsertLogListener.php            | 30 --------------------------
 Event/Listener/AbstractLogListener.php | 26 ++++++++++++++++++++++
 Event/Listener/DeleteLogListener.php   | 19 ++++++++++++++++
 Event/Listener/InsertLogListener.php   | 19 ++++++++++++++++
 Event/Listener/UpdateLogListener.php   | 20 +++++++++++++++++
 Event/UpdateLogListener.php            | 30 --------------------------
 Resources/config/services.xml          |  6 +++---
 10 files changed, 94 insertions(+), 94 deletions(-)
 delete mode 100644 Event/DeleteLogListener.php
 delete mode 100644 Event/InsertLogListener.php
 create mode 100644 Event/Listener/AbstractLogListener.php
 create mode 100644 Event/Listener/DeleteLogListener.php
 create mode 100644 Event/Listener/InsertLogListener.php
 create mode 100644 Event/Listener/UpdateLogListener.php
 delete mode 100644 Event/UpdateLogListener.php

diff --git a/Doctrine/Annotation/Field.php b/Doctrine/Annotation/Field.php
index 3727f972..8fc0efa7 100644
--- a/Doctrine/Annotation/Field.php
+++ b/Doctrine/Annotation/Field.php
@@ -25,4 +25,8 @@ public function getNameWithAlias() {
 		
 		throw new \RuntimeException('unsupported type'. $this->type);
 	}
+	
+	public function __toString() {
+		return $this->name;
+	}
 }
diff --git a/Doctrine/Mapper/MetaInformation.php b/Doctrine/Mapper/MetaInformation.php
index d7acd518..3313fcc7 100644
--- a/Doctrine/Mapper/MetaInformation.php
+++ b/Doctrine/Mapper/MetaInformation.php
@@ -1,6 +1,8 @@
 <?php
 namespace FS\SolrBundle\Doctrine\Mapper;
 
+use FS\SolrBundle\Doctrine\Annotation\Field;
+
 class MetaInformation {
 	private $identifier = '';
 	
@@ -46,7 +48,7 @@ public function getDocumentName() {
 	}
 
 	/**
-	 * @return the $fields
+	 * @return array With instances of FS\SolrBundle\Doctrine\Annotation\Field
 	 */
 	public function getFields() {
 		return $this->fields;
diff --git a/Event/DeleteLogListener.php b/Event/DeleteLogListener.php
deleted file mode 100644
index 4279ccda..00000000
--- a/Event/DeleteLogListener.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace FS\SolrBundle\Event;
-
-use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
-
-class DeleteLogListener implements EventListenerInterface {
-
-	/**
-	 * 
-	 * @var LoggerInterface
-	 */
-	private $logger = null;
-	
-	public function __construct(LoggerInterface $logger) {
-		$this->logger = $logger;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
-	 */
-	public function notify(MetaInformation $metaInformation) {
-		$this->logger->info('document was deleted');
-		
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/Event/InsertLogListener.php b/Event/InsertLogListener.php
deleted file mode 100644
index 894ee7ef..00000000
--- a/Event/InsertLogListener.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace FS\SolrBundle\Event;
-
-use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
-
-class InsertLogListener implements EventListenerInterface {
-
-	/**
-	 * 
-	 * @var LoggerInterface
-	 */
-	private $logger = null;
-	
-	public function __construct(LoggerInterface $logger) {
-		$this->logger = $logger;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
-	 */
-	public function notify(MetaInformation $metaInformation) {
-		$this->logger->info('document was add to the index');
-		
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/Event/Listener/AbstractLogListener.php b/Event/Listener/AbstractLogListener.php
new file mode 100644
index 00000000..e49567bd
--- /dev/null
+++ b/Event/Listener/AbstractLogListener.php
@@ -0,0 +1,26 @@
+<?php
+namespace FS\SolrBundle\Event\Listener;
+
+use FS\SolrBundle\Event\EventListenerInterface;
+use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
+
+abstract class AbstractLogListener implements EventListenerInterface {
+	/**
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger = null;
+	
+	public function __construct(LoggerInterface $logger) {
+		$this->logger = $logger;
+	}
+	
+	protected function createDocumentNameWithId(MetaInformation $metaInformation) {
+		return $metaInformation->getDocumentName().':'.$metaInformation->getEntityId();
+	}
+	
+	protected function createFieldList(MetaInformation $metaInformation) {
+		return implode(', ', $metaInformation->getFields());
+	}
+}
diff --git a/Event/Listener/DeleteLogListener.php b/Event/Listener/DeleteLogListener.php
new file mode 100644
index 00000000..6b4d75e1
--- /dev/null
+++ b/Event/Listener/DeleteLogListener.php
@@ -0,0 +1,19 @@
+<?php
+namespace FS\SolrBundle\Event\Listener;
+
+use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
+
+class DeleteLogListener extends AbstractLogListener {
+	
+	/* (non-PHPdoc)
+	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
+	 */
+	public function notify(MetaInformation $metaInformation) {
+		$nameWithId = $this->createDocumentNameWithId($metaInformation);
+		$fieldList = $this->createFieldList($metaInformation);
+		
+		$this->logger->info(sprintf('%s with fields %s was deleted', $nameWithId, $fieldList));
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/Event/Listener/InsertLogListener.php b/Event/Listener/InsertLogListener.php
new file mode 100644
index 00000000..b9fc9d81
--- /dev/null
+++ b/Event/Listener/InsertLogListener.php
@@ -0,0 +1,19 @@
+<?php
+namespace FS\SolrBundle\Event\Listener;
+
+use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
+
+class InsertLogListener extends AbstractLogListener {
+	
+	/* (non-PHPdoc)
+	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
+	 */
+	public function notify(MetaInformation $metaInformation) {
+		$nameWithId = $this->createDocumentNameWithId($metaInformation);
+		$fieldList = $this->createFieldList($metaInformation);
+		
+		$this->logger->info(sprintf('%s with fields %s was added', $nameWithId, $fieldList));
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/Event/Listener/UpdateLogListener.php b/Event/Listener/UpdateLogListener.php
new file mode 100644
index 00000000..c2e85cfc
--- /dev/null
+++ b/Event/Listener/UpdateLogListener.php
@@ -0,0 +1,20 @@
+<?php
+namespace FS\SolrBundle\Event\Listener;
+
+use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
+use FS\SolrBundle\Event\Listener\AbstractLogListener;
+
+class UpdateLogListener extends AbstractLogListener  {
+	
+	/* (non-PHPdoc)
+	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
+	 */
+	public function notify(MetaInformation $metaInformation) {
+		$nameWithId = $this->createDocumentNameWithId($metaInformation);
+		$fieldList = $this->createFieldList($metaInformation);
+		
+		$this->logger->info(sprintf('%s with fields %s was updated', $nameWithId, $fieldList));
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/Event/UpdateLogListener.php b/Event/UpdateLogListener.php
deleted file mode 100644
index ac61687a..00000000
--- a/Event/UpdateLogListener.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace FS\SolrBundle\Event;
-
-use FS\SolrBundle\Doctrine\Mapper\MetaInformation;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
-
-class UpdateLogListener implements EventListenerInterface {
-
-	/**
-	 * 
-	 * @var LoggerInterface
-	 */
-	private $logger = null;
-	
-	public function __construct(LoggerInterface $logger) {
-		$this->logger = $logger;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see FS\SolrBundle\Event.EventListenerInterface::notify()
-	 */
-	public function notify(MetaInformation $metaInformation) {
-		$this->logger->info('document was updated');
-		
-	}
-
-
-}
-
-?>
\ No newline at end of file
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 442551ea..cc51ef29 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -15,9 +15,9 @@
         <parameter key="solr.mapping.all.class">FS\SolrBundle\Doctrine\Mapper\Mapping\MapAllFieldsCommand</parameter>
         <parameter key="solr.mapping.identifier.class">FS\SolrBundle\Doctrine\Mapper\Mapping\MapIdentifierCommand</parameter>
         <parameter key="solr.event_manager.class">FS\SolrBundle\Event\EventManager</parameter>
-        <parameter key="solr.log_listener.insert.class">FS\SolrBundle\Event\InsertLogListener</parameter>
-        <parameter key="solr.log_listener.update.class">FS\SolrBundle\Event\UpdateLogListener</parameter>
-        <parameter key="solr.log_listener.delete.class">FS\SolrBundle\Event\DeleteLogListener</parameter>
+        <parameter key="solr.log_listener.insert.class">FS\SolrBundle\Event\Listener\InsertLogListener</parameter>
+        <parameter key="solr.log_listener.update.class">FS\SolrBundle\Event\Listener\UpdateLogListener</parameter>
+        <parameter key="solr.log_listener.delete.class">FS\SolrBundle\Event\Listener\DeleteLogListener</parameter>
     </parameters>
 
     <services>