package edu.northwestern.bioinformatics.studycalendar.web.template;

import static org.springframework.validation.ValidationUtils.invokeValidator;
import edu.northwestern.bioinformatics.studycalendar.xml.validators.Schema;
import static edu.northwestern.bioinformatics.studycalendar.xml.validators.XMLValidator.*;
import edu.northwestern.bioinformatics.studycalendar.service.ImportActivitiesService;
import edu.nwu.bioinformatics.commons.spring.Validatable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.validation.Errors;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;

public class ImportActivitiesCommand implements Validatable {
    private static final Logger log = LoggerFactory.getLogger(ImportActivitiesCommand.class);

    private ImportActivitiesService service;
    private MultipartFile activitiesFile;

    public void apply() throws Exception {
        if (activitiesFile.getContentType().contains("xml")) {

            service.loadAndSave(activitiesFile.getInputStream());
        } else if (activitiesFile.getContentType().contains("csv")) {

            service.loadAndSaveCSVFile(activitiesFile.getInputStream());
        }


    }

    public void validate(Errors errors) {
        if (activitiesFile.isEmpty()) {
            errors.reject("error.activities.file.not.specified");
            return;
        }

        try {
            if (activitiesFile.getContentType().contains("xml")) {
                invokeValidator(ACTIVITY_VALIDATOR_INSTANCE, activitiesFile.getInputStream(), errors);
            }
        } catch (IOException ioe) {
            errors.reject("error.problem.reading.file", Schema.activities.title());
            log.debug("Error reading file {} because {}", Schema.activities.title(), ioe.getMessage());
        }

    }

    // Field setters and getters
    public void setActivitiesFile(MultipartFile activitiesFile) {
        this.activitiesFile = activitiesFile;
    }

    public MultipartFile getActivitiesFile() {
        return activitiesFile;
    }

    public void setImportActivitiesService(ImportActivitiesService service) {
        this.service = service;
    }


}

package edu.northwestern.bioinformatics.studycalendar.web.template;

import static org.springframework.validation.ValidationUtils.invokeValidator;
import edu.northwestern.bioinformatics.studycalendar.xml.validators.Schema;
import static edu.northwestern.bioinformatics.studycalendar.xml.validators.XMLValidator.*;
import edu.northwestern.bioinformatics.studycalendar.service.ImportActivitiesService;
import edu.nwu.bioinformatics.commons.spring.Validatable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.validation.Errors;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;

public class ImportActivitiesCommand implements Validatable {
    private static final Logger log = LoggerFactory.getLogger(ImportActivitiesCommand.class);

    private ImportActivitiesService service;
    private MultipartFile activitiesFile;

    public void apply() throws Exception {
        if (activitiesFile.getContentType().contains("xml")) {

            service.loadAndSave(activitiesFile.getInputStream());
        } else if (activitiesFile.getContentType().contains("plain")) {

            service.loadAndSaveCSVFile(activitiesFile.getInputStream());
        }


    }

    public void validate(Errors errors) {
        if (activitiesFile.isEmpty()) {
            errors.reject("error.activities.file.not.specified");
            return;
        }

        try {
            if (activitiesFile.getContentType().contains("xml")) {
                invokeValidator(ACTIVITY_VALIDATOR_INSTANCE, activitiesFile.getInputStream(), errors);
            }
        } catch (IOException ioe) {
            errors.reject("error.problem.reading.file", Schema.activities.title());
            log.debug("Error reading file {} because {}", Schema.activities.title(), ioe.getMessage());
        }

    }

    // Field setters and getters
    public void setActivitiesFile(MultipartFile activitiesFile) {
        this.activitiesFile = activitiesFile;
    }

    public MultipartFile getActivitiesFile() {
        return activitiesFile;
    }

    public void setImportActivitiesService(ImportActivitiesService service) {
        this.service = service;
    }


}

Change content type of csv file from "csv" to "plain". Updated ImportActivitiesCommand. Closes #481