Added code from end of Day 2 workshop.

app_controller.php

@@ -44,6 +44,10 @@ protected function _setupAuth(){
 			'action' => 'display',
 			'come-back'
 		);
+		$this->Auth->loginRedirect = array(
+			'controller' => 'events',
+			'action' => 'index'
+		);
 	}
 
 	protected function _setupUser() {

controllers/events_controller.php

@@ -2,9 +2,16 @@
 class EventsController extends AppController {
 
 	var $name = 'Events';
+	public $paginate = array(
+		'conditions' => array()
+	);
 
 	function index() {
 		$this->Event->recursive = 0;
+		if (!empty($this->params['named'])) {
+			$this->paginate['conditions'] = isset($this->paginate['conditions']) ? $this->paginate['conditions'] : array();
+			$this->paginate['conditions'] += $this->params['named'];
+		}
 		$this->set('events', $this->paginate());
 	}
 
@@ -19,6 +26,7 @@ function view($id = null) {
 	function add() {
 		if (!empty($this->data)) {
 			$this->Event->create();
+			$this->data['Event']['user_id'] = $this->Auth->user('id');
 			if ($this->Event->save($this->data)) {
 				$this->Session->setFlash(__('The event has been saved', true));
 				$this->redirect(array('action' => 'index'));
@@ -62,5 +70,18 @@ function delete($id = null) {
 		$this->Session->setFlash(__('Event was not deleted', true));
 		$this->redirect(array('action' => 'index'));
 	}
+
+	public function day($day = null, $month = null, $year = null) {
+		if (!$day) {
+			$day = date('d');
+		}
+		$this->paginate = array('coming') + compact('day', 'month', 'year');
+		$this->setAction('index');
+	}
+
+	public function month($month = null, $year = null) {
+		$this->paginate = array('coming') + compact('month', 'year');
+		$this->setAction('index');
+	}
 }
 ?>

models/event.php

@@ -55,5 +55,54 @@ class Event extends AppModel {
 			'order' => ''
 		)
 	);
+
+	public $_findMethods = array('coming' => true);
+
+	public function _findComing($state, $query, $results = array()) {
+		if ($state == 'before') {
+			if (empty($query['month'])){
+				$query['month'] = date('m');
+			}
+			if (empty($query['year'])){
+				$query['year'] = date('Y');
+			}
+			$startDay = '01';
+			$endingDay = 31;
+			if (!empty($query['day'])) {
+				$startDay = $endingDay = $query['day'];
+			}
+			$query['conditions']['Event.date >='] = $query['year'] . '-' . $query['month'] . '-' . $startDay;
+			$query['conditions']['Event.date <='] = $query['year'] . '-' . $query['month'] . '-' . $endingDay;
+
+			if (!empty($query['operation'])) {
+				return $this->_findCount($state, $query, $results);
+			}
+			return $query;
+		}
+			if (!empty($query['operation'])) {
+				return $this->_findCount($state, $query, $results);
+			}
+		return $results;
+	}
+
+	public function paginateCount($conditions = array(), $recursive = 0, $extra = array()) {
+		$parameters = compact('conditions');
+		if (isset($extra['type'])) {
+			$extra['operation'] = 'count';
+			return $this->find($extra['type'], array_merge($parameters, $extra));
+		} else {
+			return $this->find('count',array_merge($parameters, $extra));
+		}
+	}
+
+
+
+
+
+
+
+
+
+
 }
 ?>

tests/cases/models/event.test.php

@@ -34,6 +34,52 @@ public function testValidationWithValidaData() {
 		$this->assertTrue($result);
 		$this->assertEqual(array_keys($this->Event->validationErrors), array());
 	}
-
+
+	public function testFindComing() {
+		$month = date('m');
+		$data = array(
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 1',
+				'date' => "2010-$month-29"
+			),
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 2',
+				'date' => "2010-$month-29"
+			),
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 3',
+				'date' => "2010-$month-29"
+			),
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 4',
+				'date' => "2010-$month-29"
+			),
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 5',
+				'date' => "2010-$month-30"
+			),
+			array(
+				'user_id' => 'user-1',
+				'title' => 'Event 6',
+				'date' => "2011-$month-29"
+			),
+		);
+		$this->assertTrue($this->Event->saveAll($data));
+		$result = $this->Event->find('coming', array(
+			'day' => 29,
+			'month' => $month,
+			'year' => 2010,
+			'order' => 'Event.title'
+		));
+		$this->assertEqual(array('Event 1', 'Event 2', 'Event 3', 'Event 4'), Set::extract('/Event/title', $result));
+
+		$result = $this->Event->find('coming', array('year' => 2011));
+		$this->assertEqual(array('Event 6'), Set::extract('/Event/title', $result));
+	}
 }
 ?>

views/events/add.ctp

@@ -3,7 +3,6 @@
 	<fieldset>
  		<legend><?php __('Add Event'); ?></legend>
 	<?php
-		echo $this->Form->input('user_id');
 		echo $this->Form->input('title');
 		echo $this->Form->input('description');
 		echo $this->Form->input('date');