Merge pull request #22 from iammangod96/master

 Added reasons feature, view request functionality, logout and others

Author: SKrudra

src/main/java/com/sba6/srm/controller/RequestController.java

@@ -21,11 +21,13 @@
 
 import com.sba6.srm.entity.Comment;
 import com.sba6.srm.entity.Employee;
+import com.sba6.srm.entity.Reason;
 import com.sba6.srm.entity.Request;
 
 import com.sba6.srm.service.CommentService;
 import com.sba6.srm.service.EmailService;
 import com.sba6.srm.service.EmployeeService;
+import com.sba6.srm.service.ReasonService;
 import com.sba6.srm.service.RequestService;
 
 import io.swagger.annotations.Api;
@@ -44,6 +46,8 @@ public class RequestController {
 	private EmailService emailService;
 	@Autowired
 	private CommentService commentService;
+	@Autowired
+	private ReasonService reasonService;
 
 
 	//1. GET Requests for manager GET/api/requests/{mgrId}
@@ -65,7 +69,7 @@ public ResponseEntity updateRequestStatus(@RequestBody Request updateRequest) {
 		}
 		req.setTentativeEndDtm(updateRequest.getTentativeEndDtm());
 		requestService.updateRequest(req);
-		emailService.mailRequestStatusUpdate(req, "ps2@gmail.com");
+		emailService.mailRequestStatusUpdate(req, req.getEmployee().getEmail());
 		return new ResponseEntity<>(HttpStatus.OK);
 	}
 
@@ -77,16 +81,22 @@ public Request getRequest(@PathVariable Long empId) {
 
 	@ApiOperation(value = "Create request for employee")
 	@PostMapping(value = "/api/request")
-	public ResponseEntity createRequest(@RequestBody Request newRequest) {
-		Employee emp = employeeService.getEmployee(newRequest.getEmployee().getId());
-		Request req = newRequest;
-		req.setEmployee(emp);
+	public ResponseEntity createRequest(@RequestBody Request request) {
+		Employee emp = employeeService.getEmployee(request.getEmployee().getId());
+		request.setEmployee(emp);
 		Date dt = new Date();
-		req.setStartDtm(dt);
-		req.setTentativeEndDtm( Date.from( dt.toInstant().plus(10, ChronoUnit.DAYS) ) );
-		requestService.addRequest(req);
-		emailService.mailAddRequest(req, "ps2@gmail.com");
-		return new ResponseEntity<>(HttpStatus.OK);
+		request.setStartDtm(dt);
+		request.setTentativeEndDtm( Date.from( dt.toInstant().plus(10, ChronoUnit.DAYS) ) );
+		requestService.addRequest(request);
+		//add reasons in reason table
+		Request addedReq = requestService.getRequestForEmployee(emp.getId());
+		request.getReasons().forEach(res -> {
+			res.setRequest(addedReq);
+			reasonService.addReason(res);
+		});
+		
+		emailService.mailAddRequest(request, request.getEmployee().getEmail());
+		return new ResponseEntity(HttpStatus.OK);
 	}
 
 	@ApiOperation(value = "Get employee details")

src/main/java/com/sba6/srm/entity/Reason.java

@@ -0,0 +1,27 @@
+package com.sba6.srm.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Entity
+@Table(name = "reason")
+public @Data class Reason {
+	
+	@Id @GeneratedValue
+	@Column(name = "ID")
+	private Long id;
+	
+	@ManyToOne
+	@JoinColumn(name = "REQ_ID")
+	private Request request;
+	
+	@Column(name = "REASON_ID")
+	private Long reasonId;
+}

src/main/java/com/sba6/srm/entity/Request.java

@@ -2,6 +2,7 @@
 
 
 import java.util.Date;
+import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,11 +13,11 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.sba6.srm.enumsconstants.RequestStatus;
@@ -55,5 +56,8 @@
 
 	@Column(name="TENTATIVE_END_DTM")
 	private Date tentativeEndDtm;
+	
+	@OneToMany(mappedBy="request")
+	private List<Reason> reasons;
 
 }

src/main/java/com/sba6/srm/repository/ReasonRepository.java

@@ -0,0 +1,9 @@
+package com.sba6.srm.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.sba6.srm.entity.Reason;
+
+public interface ReasonRepository extends JpaRepository<Reason, Long> {
+
+}

src/main/java/com/sba6/srm/repository/RequestRepository.java

@@ -10,7 +10,8 @@
 
 public interface RequestRepository  extends JpaRepository<Request, Long>{
 
-	@Query("select r from Request r JOIN r.employee e where e.mgrId=:mgrId and r.employee.id=e.id and r.status!= 'INACTIVATED'")
+	@Query("select r from Request r JOIN r.employee e where e.mgrId=:mgrId and r.employee.id=e.id and r.status!= 'INACTIVATED' "
+			+ "order by (case when r.status='OPEN' then 0 else 1 end), (case when r.status='INDISCUSSION' then 0 else 1 end), r.status")
 	public List<Request> getRequestsForManager(@Param("mgrId") Long mgrId);
 
 	@Query("select r from Request r JOIN r.employee e where e.id=:empid and r.employee.id=e.id and (r.status= 'OPEN' or r.status= 'INDISCUSSION')")

src/main/java/com/sba6/srm/service/ReasonService.java

@@ -0,0 +1,19 @@
+package com.sba6.srm.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.sba6.srm.entity.Reason;
+import com.sba6.srm.entity.Request;
+import com.sba6.srm.repository.ReasonRepository;
+
+@Service
+public class ReasonService {
+	
+	@Autowired
+	private ReasonRepository reasonRepository;
+	
+	public void addReason(Reason reason) {
+		reasonRepository.save(reason);
+	}
+}

src/main/web-app/src/app/app-routing.module.ts

@@ -5,8 +5,8 @@ import { BaseViewComponent } from './base-view/base-view.component';
 import { RequestComponent } from './request/request.component';
 import { ManagerDashboardComponent } from './manager-dashboard/manager-dashboard.component';
 import { LoginComponent } from './login/login.component';
-import { AuthGuard } from './auth.guard';
-import { ManagerGuard } from './manager.guard';
+import { AuthGuard } from './auth-guards/auth.guard';
+import { ManagerGuard } from './auth-guards/manager.guard';
 
 
 const routes: Routes = [

src/main/web-app/src/app/app.module.ts

@@ -12,15 +12,15 @@ import { ManagerDashboardComponent } from './manager-dashboard/manager-dashboard
 import { AppRoutingModule } from './app-routing.module';
 
 import { MaterialModules } from './material';
-import { HttpClientModule,HTTP_INTERCEPTORS }    from '@angular/common/http';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 
 import 'hammerjs';
-import { GenericDialogComponent } from './generic-dialog/generic-dialog.component';
-import { DisplayDataDialogComponent } from './display-data-dialog/display-data-dialog.component';
-import { RequestDialogComponent } from './request-dialog/request-dialog.component';
+import { GenericDialogComponent } from './dialog-boxes/generic-dialog/generic-dialog.component';
+import { DisplayDataDialogComponent } from './dialog-boxes/display-data-dialog/display-data-dialog.component';
+import { RequestDialogComponent } from './dialog-boxes/request-dialog/request-dialog.component';
 import { LoginComponent } from './login/login.component';
-import { DiscussionDialogComponent } from './discussion-dialog/discussion-dialog.component';
-import {TokenInterceptorService} from './token-interceptor.service';
+import { DiscussionDialogComponent } from './dialog-boxes/discussion-dialog/discussion-dialog.component';
+import {TokenInterceptorService} from './services/token-interceptor.service';
 
 
 
@@ -46,11 +46,11 @@ import {TokenInterceptorService} from './token-interceptor.service';
     ReactiveFormsModule,
     HttpClientModule
   ],
-  entryComponents:[GenericDialogComponent, DisplayDataDialogComponent, RequestDialogComponent, DiscussionDialogComponent],
+  entryComponents: [GenericDialogComponent, DisplayDataDialogComponent, RequestDialogComponent, DiscussionDialogComponent],
   providers: [{
-    provide:HTTP_INTERCEPTORS,
-    useClass:TokenInterceptorService,
-    multi:true
+    provide: HTTP_INTERCEPTORS,
+    useClass: TokenInterceptorService,
+    multi: true
   }],
   bootstrap: [AppComponent]
 })

src/main/web-app/src/app/auth.guard.spec.ts renamed to src/main/web-app/src/app/auth-guards/auth.guard.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, Router,RouterStateSnapshot,ActivatedRouteSnapshot} from '@angular/router';
-import {AuthService} from './auth.service';
+import {AuthService} from '../services/auth.service';
 
 @Injectable({
   providedIn: 'root'