Skip to content

Commit 16c9f9d

Browse files
committed
#723 - minor text change
1 parent e61088d commit 16c9f9d

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

avni-server-api/src/main/java/org/avni/server/web/EntityApprovalStatusController.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public PagedResources<Resource<EntityApprovalStatus>> getEntityApprovals(
7878
@RequestParam(value = "entityType", required = false) SyncEntityName entityName,
7979
@RequestParam(value = "entityTypeUuid", required = false) String entityTypeUuid,
8080
Pageable pageable) {
81-
if(entityName == null) {
81+
if (entityName == null) {
8282
return wrap(entityApprovalStatusRepository
8383
.findByLastModifiedDateTimeIsBetweenOrderByLastModifiedDateTimeAscIdAsc(
8484
CHSEntity.toDate(lastModifiedDateTime), CHSEntity.toDate(now), pageable));
@@ -112,15 +112,17 @@ public Resource<EntityApprovalStatus> process(Resource<EntityApprovalStatus> res
112112

113113
private String fetchSubjectTypeForEntityNameAndUuid(SyncEntityName entityName, String entityTypeUuid) {
114114
switch (entityName) {
115-
case Subject: return entityTypeUuid.isEmpty() ? null : entityTypeUuid;
115+
case Subject:
116+
return entityTypeUuid.isEmpty() ? null : entityTypeUuid;
116117
case Encounter:
117118
return getSubjectTypeUuidFromEncounterTypeUuid(entityTypeUuid, FormType.Encounter);
118119
case ProgramEncounter:
119120
return getSubjectTypeUuidFromEncounterTypeUuid(entityTypeUuid, FormType.ProgramEncounter);
120121
case ProgramEnrolment:
121122
case ChecklistItem:
122123
return getSubjectTypeUuidFromProgramTypeUuid(entityTypeUuid, FormType.ProgramEnrolment);
123-
default: return null;
124+
default:
125+
return null;
124126
}
125127
}
126128

avni-server-api/src/main/resources/api/external-api.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ paths:
12871287
schema:
12881288
type: string
12891289
nullable: true
1290-
enum: [Subject,ProgramEnrolment,ProgramEncounter,Encounter,ChecklistItem]
1290+
enum: [ Subject,ProgramEnrolment,ProgramEncounter,Encounter,ChecklistItem ]
12911291
- name: entityTypeId
12921292
in: query
12931293
description: "Allows filtering results by entity type id"
@@ -1870,13 +1870,13 @@ components:
18701870
properties:
18711871
Entity ID:
18721872
type: string
1873-
description: ID of the entity for which the approval status is being returned
1873+
description: ID of the entity for which the approval action was done.
18741874
Entity type:
18751875
type: string
1876-
description: Type of the entity for which the approval status is being returned i.e. Subject / Encounter etc
1876+
description: Type of the entity which the approval action was done.
18771877
Entity type ID:
18781878
type: string
1879-
description: ID of the entity type for which the approval status is being returned
1879+
description: ID of the entity type of the entity for which the approval action was done. This will be the ID of the subject type, program, or encounter type - for the entity for which approval action was taken.
18801880
Approval status:
18811881
type: string
18821882
description: Approval status for the entity
@@ -1925,18 +1925,18 @@ components:
19251925
- $ref: '#/components/schemas/Task'
19261926
- $ref: '#/components/schemas/TaskBody'
19271927
inline_response_200_locations:
1928-
properties:
1929-
content:
1930-
type: array
1931-
items:
1932-
$ref: '#/components/schemas/Location'
1933-
allOf:
1934-
- $ref: '#/components/schemas/ResponsePage'
1928+
properties:
1929+
content:
1930+
type: array
1931+
items:
1932+
$ref: '#/components/schemas/Location'
1933+
allOf:
1934+
- $ref: '#/components/schemas/ResponsePage'
19351935
inline_response_200_eas:
1936-
properties:
1937-
content:
1938-
type: array
1939-
items:
1940-
$ref: '#/components/schemas/EntityApprovalStatusBody'
1941-
allOf:
1942-
- $ref: '#/components/schemas/ResponsePage'
1936+
properties:
1937+
content:
1938+
type: array
1939+
items:
1940+
$ref: '#/components/schemas/EntityApprovalStatusBody'
1941+
allOf:
1942+
- $ref: '#/components/schemas/ResponsePage'

0 commit comments

Comments
 (0)