/*
 * Copyright (c) 2004-2018, University of Oslo
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
 * list of conditions and the following disclaimer.
 *
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * Neither the name of the HISP project nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.hisp.dhis.android.core.datavalue;

import android.database.Cursor;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.gabrielittner.auto.value.cursor.ColumnAdapter;
import com.google.auto.value.AutoValue;

import org.hisp.dhis.android.core.common.BaseDataModel;
import org.hisp.dhis.android.core.common.CursorModelFactory;
import org.hisp.dhis.android.core.data.database.DbDateColumnAdapter;

import java.util.Date;

@AutoValue
@JsonDeserialize(builder = $$AutoValue_DataValue.Builder.class)
public abstract class DataValue extends BaseDataModel {

    @Nullable
    @JsonProperty
    public abstract String dataElement();

    @Nullable
    @JsonProperty
    public abstract String period();

    @Nullable
    @JsonProperty(DataValueFields.ORGANISATION_UNIT)
    public abstract String organisationUnit();

    @Nullable
    @JsonProperty
    public abstract String categoryOptionCombo();

    @Nullable
    @JsonProperty
    public abstract String attributeOptionCombo();

    @Nullable
    @JsonProperty
    public abstract String value();

    @Nullable
    @JsonProperty
    public abstract String storedBy();

    @Nullable
    @JsonProperty
    @ColumnAdapter(DbDateColumnAdapter.class)
    public abstract Date created();

    @Nullable
    @JsonProperty
    @ColumnAdapter(DbDateColumnAdapter.class)
    public abstract Date lastUpdated();

    @Nullable
    @JsonProperty
    public abstract String comment();

    @Nullable
    @JsonProperty()
    public abstract Boolean followUp();

    @Nullable
    @JsonProperty
    public abstract Boolean deleted();

    @NonNull
    public static DataValue create(Cursor cursor) {
        return AutoValue_DataValue.createFromCursor(cursor);
    }

    public static final CursorModelFactory<DataValue> factory =
            new CursorModelFactory<DataValue>() {
                @Override
                public DataValue fromCursor(Cursor cursor) {
                    return create(cursor);
                }
            };

    public abstract DataValue.Builder toBuilder();

    public static DataValue.Builder builder() {
        return new $$AutoValue_DataValue.Builder();
    }


    @AutoValue.Builder
    @JsonPOJOBuilder(withPrefix = "")
    public abstract static class Builder extends BaseDataModel.Builder<DataValue.Builder> {

        public abstract DataValue.Builder dataElement(@NonNull String dataElement);

        public abstract DataValue.Builder period(@NonNull String period);

        @JsonProperty(DataValueFields.ORGANISATION_UNIT)
        public abstract DataValue.Builder organisationUnit(@NonNull String organisationUnit);

        public abstract DataValue.Builder categoryOptionCombo(@NonNull String categoryOptionCombo);

        public abstract DataValue.Builder attributeOptionCombo(@NonNull String attributeOptionCombo);

        public abstract DataValue.Builder value(@NonNull String value);

        public abstract DataValue.Builder storedBy(@Nullable String storedBy);

        public abstract DataValue.Builder created(@NonNull Date created);

        public abstract DataValue.Builder lastUpdated(@NonNull Date lastUpdated);

        public abstract DataValue.Builder comment(@NonNull String comment);

        @JsonProperty(DataValueFields.FOLLOW_UP)
        public abstract DataValue.Builder followUp(@NonNull Boolean followUp);

        public abstract DataValue.Builder deleted(@NonNull Boolean deleted);

        public abstract DataValue build();
    }
}

@@ -2120,16 +2120,64 @@
 actory;%0A
+import org.hisp.dhis.android.core.common.State;%0A
 import o
@@ -4135,24 +4135,95 @@
 Builder%3E %7B%0A%0A
+        public Builder() %7B%0A            state(State.SYNCED);%0A        %7D%0A%0A
         publ

Fix missing default state value for DataValue