#104 Fixed stackoverflow error, removed debug messages

Author: tehalexf

athena/src/main/java/org/dcsc/athena/controllers/TutoringTest2Controller.java athena/src/main/java/org/dcsc/athena/controllers/TutoringIndexController.java

@@ -177,7 +177,7 @@ public synchronized Status tutorQuit(TutorExtension tr) {
     	}
 
     	currentTutors.remove(tr);
-        System.out.println("TUTOR QUITTTT\n\n\n\n\n\n\n\n");
+
 
         removeCurrentTutor(tr.getTutor().getId());
 

athena/src/main/java/org/dcsc/athena/objects/AxisQueue.java

@@ -49,7 +49,6 @@ public TutoringSession(LocalDateTime startDateTime, LocalDateTime endDateTime, T
 
     @Override
     public boolean equals(Object obj) {
-    	System.out.println("COMPARISONNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN");
     	if (obj == null) 
             return false;
         final TutoringSession other = (TutoringSession) obj;
@@ -58,7 +57,6 @@ public boolean equals(Object obj) {
         return other.id == this.id;
     }
 
-
     public long getId() {
         return id;
     }
@@ -71,14 +69,6 @@ public LocalDateTime getStartDateTime() {
         return startDateTime;
     }
 
-    public String toString() {
-        System.out.println(id);
-        System.out.println(startDateTime);
-        System.out.println(endDateTime);
-        System.out.println(tutor);
-    	return startDateTime.toString();
-    }
-
     public void setStartDateTime(LocalDateTime startDateTime) {
         this.startDateTime = startDateTime;
     }
@@ -89,8 +79,6 @@ public LocalDateTime getEndDateTime() {
 
     public void setEndDateTime(LocalDateTime endDateTime) {
         this.endDateTime = endDateTime;
-
-
     }
 
     public Tutor getTutor() {

athena/src/main/java/org/dcsc/athena/objects/TutoringSession.java

@@ -18,8 +18,11 @@ public class Tutor {
     @Column(name = "is_active")
     private boolean isActive;
 
-    @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "common_id")
+    
+    @Column(name = "common_id")
+    private long dcscId;
+
+    @Transient
     private DcscUser dcscUser;
 
     @Transient
@@ -68,7 +71,6 @@ public List<AcademicCourse> getCurrentTermCourses() {
     public TreeSet<String> getCurrentTermCourseStrings() {
         TreeSet<String> courseStrings = new TreeSet<String>();
         for (AcademicCourse a : getCurrentTermCourses()) {
-            System.out.println(a.getCode());
             courseStrings.add(a.getCode());
         }
         return courseStrings;

core/src/main/java/org/dcsc/core/tutor/Tutor.java

@@ -6,5 +6,5 @@
 
 @Repository
 public interface TutorRepository extends JpaRepository<Tutor, Long> {
-    Tutor findByDcscUser(DcscUser dcscUser);
+    Tutor findByDcscId(Long id);
 }

core/src/main/java/org/dcsc/core/tutor/TutorRepository.java

@@ -51,7 +51,7 @@ public Tutor getTutor(Authentication authentication) {
 
     @Transactional(readOnly = true)
     public Tutor getTutor(DcscUser dcscUser) {
-        Tutor tutor = tutorRepository.findByDcscUser(dcscUser);
+        Tutor tutor = tutorRepository.findByDcscId(dcscUser.getId());
 
         try {
             AcademicTerm currentTerm = academicTermService.getCurrentTerm();

core/src/main/java/org/dcsc/core/tutor/TutorService.java

@@ -33,7 +33,6 @@ public void onApplicationEvent(SessionDisconnectEvent sessionDisconnectEvent) {
         if (thisSession != null) {
             thisSession.setEndDateTime(LocalDateTime.now());
             tutoringSessionService.save(thisSession);
-        	System.out.println(thisSession.getId());
         }
 
 		axisQueue.removePersonAndMappingByID(headerAccessor.getSessionId());

src/main/java/org/dcsc/listeners/SessionDisconnectedEventListener.java

@@ -17,6 +17,5 @@ public void onApplicationEvent(SessionConnectedEvent sessionConnectedEvent) {
 		StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(sessionConnectedEvent.getMessage());
 		logger.info(headerAccessor.toString());
 		System.out.println(headerAccessor.getSessionId());
-		System.out.println("AAAAAAAAAAAAAAAAAAAA\n\n\n\n\n\n" + (headerAccessor.toString()) + " \n\n\n\n\nAAAAAAAAAAAAAAAAAAAAAAAAAA");
 	}
 }