/*
 * The MIT License
 *
 * Copyright 2014 Mikko Oksa.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 */

package models;

import com.fasterxml.jackson.annotation.JsonIgnore;
import java.util.Date;
import java.util.UUID;

public class DogparkSignup {

	public static final String KG_1_TO_5 = "1-5 kg";
	public static final String KG_5_TO_10 = "5-10 kg";
	public static final String KG_10_TO_15 = "10-15 kg";
	public static final String KG_15_TO_25 = "15-25 kg";
	public static final String KG_25_TO_40 = "25-40 kg";
	public static final String KG_40_PLUS = "40+ kg";

	public Date arrivalTime;

	public String dogBreed;

	public String dogWeightClass;

	public boolean dogIsMale;

	@JsonIgnore
	public String cancellationCode;

	public DogparkSignup() {
	}

	public DogparkSignup(Date arrivalTime, String dogBreed, String dogWeightClass, boolean dogIsMale) {
		this.arrivalTime = arrivalTime;
		this.dogBreed = dogBreed;
		this.dogWeightClass = dogWeightClass;
		this.dogIsMale = dogIsMale;

		this.cancellationCode = UUID.randomUUID().toString();
	}

}

@@ -1190,20 +1190,21 @@
 on.JsonI
-gnor
+nclud
 e;%0Aimpor
@@ -1245,16 +1245,59 @@
 .UUID;%0A%0A
+@JsonInclude(JsonInclude.Include.NON_NULL)%0A
 public c
@@ -1657,24 +1657,50 @@
 rivalTime;%0A%0A
+%09public String dogName;%0A%09%0A
 %09public Stri
@@ -1777,21 +1777,8 @@
 e;%0A%0A
-%09@JsonIgnore%0A
 %09pub
@@ -1876,16 +1876,32 @@
 valTime,
+ String dogName,
  String 
@@ -1988,16 +1988,42 @@
 alTime;%0A
+%09%09this.dogName = dogName;%0A
 %09%09this.d
@@ -2112,16 +2112,62 @@
 IsMale;%0A
+%09%7D%0A%09%0A%09public void generateCancellationCode() %7B
 %0A%09%09this.

Add dog name, ignore null fields, (de)serialize cancellationCode