Commit 5e8e6e51 authored by manishatyagi's avatar manishatyagi
Browse files

add version and created date in quiz result model

parent 31776d07
......@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.mongodb.config.EnableMongoAuditing;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import com.statestreet.dao.RoleRepository;
......@@ -15,7 +16,7 @@ import com.statestreet.utils.CommonUtils;
@ComponentScan("com.statestreet.*")
@EnableMongoRepositories(
basePackageClasses = UserRepository.class)
@EnableMongoAuditing
@SpringBootApplication
public class SBApplication {
......
......@@ -3,6 +3,7 @@
*/
package com.statestreet.model;
import java.time.LocalDateTime;
import java.util.Date;
import javax.validation.constraints.NotBlank;
......@@ -10,6 +11,8 @@ import javax.validation.constraints.NotNull;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Version;
import org.springframework.data.domain.Persistable;
import org.springframework.data.mongodb.core.mapping.Document;
import com.fasterxml.jackson.annotation.JsonFormat;
......@@ -27,10 +30,9 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Document(collection="Quiz_Result")
public class QuizResult {
public class QuizResult implements Persistable<String>{
@Id
private long quizId;
@CreatedDate
@JsonFormat(pattern ="yyyy-MMM-dd")
private Date quizDate;
private boolean hasDiscriptiveQuestion;
......@@ -47,4 +49,21 @@ public class QuizResult {
private String quizDuration;
@NotNull
private QuestionSet questionSet;
@CreatedDate
private LocalDateTime createdDate;
@Version
private Long version;
@Override
public String getId() {
// TODO Auto-generated method stub
return Long.toString(quizId);
}
@Override
public boolean isNew() {
// TODO Auto-generated method stub
return createdDate == null;
}
}
......@@ -134,7 +134,7 @@ public class QuizResultServiceImpl implements QuizResultService {
if(quesMaster.getType().equals(CommonUtils.QuestionType.Maq.name()))
{
totalMarks=totalMarks+quesMaster.getTotalMarks();
if(quesMaster.getCorrectAnswer().size() == quesMaster.getSelectedAnswer().size())
if(quesMaster.getCorrectAnswer().size() >= quesMaster.getSelectedAnswer().size())
{
int marks=0;
for(Option objOption:quesMaster.getSelectedAnswer())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment