Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
LaMartin-Webomagic
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Arnab Sen
LaMartin-Webomagic
Commits
432b8c71
Commit
432b8c71
authored
Jul 01, 2024
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add filtering for get all api
parent
0ae5bb11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
11 deletions
+53
-11
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
...aMartin/admission/controller/AdmissionFormController.java
+14
-6
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
.../admission/dao/controller/AdmissionFormDAOController.java
+12
-2
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
...admission/dao/repository/AdmissionFormDataRepository.java
+27
-3
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
View file @
432b8c71
...
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
...
@@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
java.util.stream.Stream
;
...
@@ -79,9 +78,13 @@ public class AdmissionFormController {
...
@@ -79,9 +78,13 @@ public class AdmissionFormController {
@ApiResponse
(
code
=
500
,
message
=
"Exception Occurred"
)
@ApiResponse
(
code
=
500
,
message
=
"Exception Occurred"
)
})
})
@ApiOperation
(
value
=
""
)
@ApiOperation
(
value
=
""
)
public
Object
addNewAdmission
(
public
Object
getAdmissionForms
(
HttpServletRequest
request
,
HttpServletRequest
request
,
@RequestHeader
(
"apikey"
)
String
apiKey
@RequestHeader
(
"apikey"
)
String
apiKey
,
@RequestParam
(
required
=
false
,
defaultValue
=
""
)
String
schoolName
,
@RequestParam
(
required
=
false
,
defaultValue
=
""
)
String
className
,
@RequestParam
(
required
=
false
,
defaultValue
=
""
)
String
interactionDate
,
// 2022-01-01
@RequestParam
(
required
=
false
,
defaultValue
=
""
)
String
interactionTime
// 10:00 AM
)
throws
Exception
{
)
throws
Exception
{
// TODO: validation of api key using redis
// TODO: validation of api key using redis
...
@@ -90,7 +93,12 @@ public class AdmissionFormController {
...
@@ -90,7 +93,12 @@ public class AdmissionFormController {
true
,
true
,
AppConstants
.
RESPONSE_SUCCESS_STATUS_CODE
,
AppConstants
.
RESPONSE_SUCCESS_STATUS_CODE
,
"Data Fetched Successfully"
,
"Data Fetched Successfully"
,
this
.
admissionFormDAOController
.
getAdmissionFormDataList
()
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
className
,
interactionDate
,
interactionTime
)
),
),
HttpStatus
.
OK
);
HttpStatus
.
OK
);
}
}
...
@@ -107,8 +115,8 @@ public class AdmissionFormController {
...
@@ -107,8 +115,8 @@ public class AdmissionFormController {
public
void
downloadAdmissionForm
(
public
void
downloadAdmissionForm
(
HttpServletRequest
request
,
HttpServletRequest
request
,
HttpServletResponse
response
,
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
(
"formIds"
)
String
formIds
@RequestParam
(
"formIds"
)
String
formIds
)
throws
Exception
{
)
throws
Exception
{
// TODO: validation of api key using redis
// TODO: validation of api key using redis
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
View file @
432b8c71
...
@@ -46,8 +46,18 @@ public class AdmissionFormDAOController {
...
@@ -46,8 +46,18 @@ public class AdmissionFormDAOController {
return
admissionFormDataRepository
.
saveAdmissionFormData
(
formData
)
>
0
;
return
admissionFormDataRepository
.
saveAdmissionFormData
(
formData
)
>
0
;
}
}
public
List
<
AdmissionFormData
>
getAdmissionFormDataList
()
{
public
List
<
AdmissionFormData
>
getAdmissionFormDataList
(
return
admissionFormDataRepository
.
getAdmissionFormDataList
();
String
schoolName
,
String
className
,
String
interactionDate
,
String
interactionTime
)
{
return
admissionFormDataRepository
.
getAdmissionFormDataList
(
schoolName
,
className
,
interactionDate
,
interactionTime
);
}
}
public
List
<
AdmissionFormData
>
getAdmissionFormDataListByIds
(
List
<
Long
>
idList
)
{
public
List
<
AdmissionFormData
>
getAdmissionFormDataListByIds
(
List
<
Long
>
idList
)
{
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
View file @
432b8c71
...
@@ -115,9 +115,33 @@ public class AdmissionFormDataRepository {
...
@@ -115,9 +115,33 @@ public class AdmissionFormDataRepository {
}
}
}
}
public
List
<
AdmissionFormData
>
getAdmissionFormDataList
()
{
public
List
<
AdmissionFormData
>
getAdmissionFormDataList
(
String
sql
=
"SELECT * FROM admission_form_data"
;
String
schoolName
,
return
namedParameterJdbcTemplate
.
query
(
sql
,
new
AdmissionFormMapper
());
String
className
,
String
interactionDate
,
String
interactionTime
)
{
StringBuilder
sql
=
new
StringBuilder
(
"SELECT * FROM admission_form_data WHERE 1 = 1"
);
MapSqlParameterSource
parameters
=
new
MapSqlParameterSource
();
if
(
schoolName
!=
null
&&
!
schoolName
.
isEmpty
())
{
sql
.
append
(
" AND school = :schoolName"
);
parameters
.
addValue
(
"schoolName"
,
schoolName
);
}
if
(
className
!=
null
&&
!
className
.
isEmpty
())
{
sql
.
append
(
" AND admission_class = :className"
);
parameters
.
addValue
(
"className"
,
className
);
}
if
(
interactionDate
!=
null
&&
!
interactionDate
.
isEmpty
())
{
sql
.
append
(
" AND interaction_date = :interactionDate"
);
parameters
.
addValue
(
"interactionDate"
,
interactionDate
);
}
if
(
interactionTime
!=
null
&&
!
interactionTime
.
isEmpty
())
{
sql
.
append
(
" AND interaction_time = :interactionTime"
);
parameters
.
addValue
(
"interactionTime"
,
interactionTime
);
}
return
namedParameterJdbcTemplate
.
query
(
sql
.
toString
(),
parameters
,
new
AdmissionFormMapper
());
}
}
public
List
<
AdmissionFormData
>
getAdmissionFormDataListByIds
(
List
<
Long
>
ids
)
{
public
List
<
AdmissionFormData
>
getAdmissionFormDataListByIds
(
List
<
Long
>
ids
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment