From 34eaf1e25c283728f8d600b3a9e9798b54371434 Mon Sep 17 00:00:00 2001
From: sarojsingh2021 <saroj.kumarsingh@tarento.com>
Date: Wed, 7 Dec 2022 14:27:13 +0530
Subject: [PATCH] fix
---
.../formservice/controllers/FormsController.java | 5 ++---
.../formservice/models/InstituteFormDataRequest.java | 10 ----------
.../java/com/tarento/formservice/utils/Constants.java | 1 +
3 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 src/main/java/com/tarento/formservice/models/InstituteFormDataRequest.java
diff --git a/src/main/java/com/tarento/formservice/controllers/FormsController.java b/src/main/java/com/tarento/formservice/controllers/FormsController.java
index aba07d5..542db9d 100644
--- a/src/main/java/com/tarento/formservice/controllers/FormsController.java
+++ b/src/main/java/com/tarento/formservice/controllers/FormsController.java
@@ -40,7 +40,6 @@ import com.tarento.formservice.model.Status;
import com.tarento.formservice.model.UserInfo;
import com.tarento.formservice.models.Form;
import com.tarento.formservice.models.FormDetail;
-import com.tarento.formservice.models.InstituteFormDataRequest;
import com.tarento.formservice.service.FormsService;
import com.tarento.formservice.utils.Constants;
import com.tarento.formservice.utils.PathRoutes;
@@ -488,9 +487,9 @@ public class FormsController {
}
@GetMapping(value = PathRoutes.FormServiceApi.GET_INSTITUTE_FORM_DATA_EXCEL)
- public ResponseEntity<Resource> getFile(@RequestBody InstituteFormDataRequest instituteFormDataRequest) {
+ public ResponseEntity<Resource> getFile(@RequestParam(value = Constants.ORG_ID, required = true) Long orgId) {
String filename = "institute.xlsx";
- InputStreamResource file = new InputStreamResource(formsService.getInstituteFormData(instituteFormDataRequest.getOrgId()));
+ InputStreamResource file = new InputStreamResource(formsService.getInstituteFormData(orgId));
return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + filename)
diff --git a/src/main/java/com/tarento/formservice/models/InstituteFormDataRequest.java b/src/main/java/com/tarento/formservice/models/InstituteFormDataRequest.java
deleted file mode 100644
index 43b19c0..0000000
--- a/src/main/java/com/tarento/formservice/models/InstituteFormDataRequest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.tarento.formservice.models;
-
-import lombok.Data;
-
-@Data
-public class InstituteFormDataRequest {
-
- private Long orgId;
-
-}
diff --git a/src/main/java/com/tarento/formservice/utils/Constants.java b/src/main/java/com/tarento/formservice/utils/Constants.java
index 0efbb9f..095d3b8 100644
--- a/src/main/java/com/tarento/formservice/utils/Constants.java
+++ b/src/main/java/com/tarento/formservice/utils/Constants.java
@@ -103,6 +103,7 @@ public interface Constants {
public static final String UP_SMF = "up-smf";
public static final String _ID = "_id";
public static final String ID = "id";
+ public static final String ORG_ID = "orgId";
public static final String FORM_ID = "formId";
public static final String APPLICATION_ID = "applicationId";
public static final String STATUS = "status";
--
GitLab