From b6dc26c5987637e1d6b6394f5b5466bc18ff8373 Mon Sep 17 00:00:00 2001
From: Gnyani <gnyani007@gmail.com>
Date: Mon, 30 Jul 2018 15:33:07 +0530
Subject: [PATCH] getting user details

---
 .../teachernetwork/api/QuestionSet.groovy     |  8 ++++---
 .../api/converters/CreateAssignment.groovy    |  3 +++
 .../api/converters/user/UserDetails.groovy    | 22 ++++++++++++-------
 ...ateAssignmentToQuestionSetConverter.groovy |  4 ++--
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/QuestionSet.groovy b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/QuestionSet.groovy
index c22657a..865aeb6 100644
--- a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/QuestionSet.groovy
+++ b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/QuestionSet.groovy
@@ -3,6 +3,7 @@ package com.beyondclass.common.teachernetwork.api
 import com.beyondclass.common.teachernetwork.api.Constants.DifficultyLevel
 import com.beyondclass.common.teachernetwork.api.Constants.QuestionSetType
 import com.beyondclass.common.teachernetwork.api.converters.AssignmentType
+import com.beyondclass.common.teachernetwork.api.converters.user.UserDetails
 import com.fasterxml.jackson.annotation.JsonProperty
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
@@ -36,8 +37,7 @@ class QuestionSet {
     @Indexed
     String email
 
-    @JsonProperty
-    String organizationName
+    UserDetails postedUser
 
     @JsonProperty
      List<String> likedBy = new ArrayList<String>()
@@ -46,9 +46,11 @@ class QuestionSet {
     List<Comment> comments = new ArrayList<Comment>()
 
     @JsonProperty
-    String secondaryId
+    String referenceAssignmentId
 
     @JsonProperty
     AssignmentType previousAssignmentType
 
+    List<String> referenceAssignmentIds = new ArrayList<String>()
+
 }
diff --git a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/CreateAssignment.groovy b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/CreateAssignment.groovy
index 881dcc0..e3ec770 100644
--- a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/CreateAssignment.groovy
+++ b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/CreateAssignment.groovy
@@ -1,5 +1,6 @@
 package com.beyondclass.common.teachernetwork.api.converters
 
+import com.beyondclass.common.teachernetwork.api.converters.user.UserDetails
 import com.fasterxml.jackson.annotation.JsonProperty
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
@@ -70,6 +71,8 @@ class CreateAssignment {
     @NotNull
     int numberOfQuesPerStudent
 
+    UserDetails postedUser
+
     @JsonProperty
     List<String []> inputs
 
diff --git a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/user/UserDetails.groovy b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/user/UserDetails.groovy
index c45b54a..8e8940d 100644
--- a/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/user/UserDetails.groovy
+++ b/teachernetwork-api/src/main/groovy/com/beyondclass/common/teachernetwork/api/converters/user/UserDetails.groovy
@@ -10,19 +10,25 @@ import groovy.transform.TupleConstructor;
 @TupleConstructor
 public class UserDetails {
 
-     String email;
+     String email
 
-     String firstName;
+     String firstName
 
-     String lastName;
+     String lastName
 
-     String mobilenumber;
+     String mobilenumber
 
-     String userrole;
+     String userrole
 
-     String uniqueclassId;
+     String uniqueclassId
 
-     String googlepicUrl;
+     String googlepicUrl
 
-     String normalpicUrl;
+     String normalpicUrl
+
+     String college
+
+     String university
+
+     String branch
 }
diff --git a/teachernetwork-core/src/main/groovy/com/beyondclass/common/teachernetwork/Service/CreateAssignmentToQuestionSetConverter.groovy b/teachernetwork-core/src/main/groovy/com/beyondclass/common/teachernetwork/Service/CreateAssignmentToQuestionSetConverter.groovy
index 0a08487..52543fb 100644
--- a/teachernetwork-core/src/main/groovy/com/beyondclass/common/teachernetwork/Service/CreateAssignmentToQuestionSetConverter.groovy
+++ b/teachernetwork-core/src/main/groovy/com/beyondclass/common/teachernetwork/Service/CreateAssignmentToQuestionSetConverter.groovy
@@ -30,14 +30,14 @@ class CreateAssignmentToQuestionSetConverter {
         QuestionSet questionSet = new QuestionSet()
 
         questionSet.with {
+            postedUser = createAssignment ?. postedUser
             questionSetDescription = createAssignment.message
             questionsList = generateQuestionsList(createAssignment)
             questionSetType = QuestionSetType.ASSIGNMENT
             createdAt = createAssignment.createDate
             email = createAssignment.email
-            secondaryId = createAssignment.assignmentid
+            referenceAssignmentId = createAssignment.assignmentid
             previousAssignmentType = createAssignment.assignmentType
-            //organizationName = getOrganizationName(createAssignment.email)
         }
 
         questionSet
-- 
GitLab