fix swagger error

src/main/java/org/isf/accounting/rest/BillController.java

@@ -57,6 +57,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
@@ -200,8 +202,8 @@ public ResponseEntity<FullBillDTO> updateBill(@PathVariable Integer id, @Request
 	 * @throws OHServiceException
 	 */
 	@GetMapping(value = "/bills", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value = "datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateFrom,
-			@RequestParam(value = "dateto") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateTo,
+	public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value = "datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateFrom,
+			@RequestParam(value = "dateto") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateTo,
 			@RequestParam(value = "patient_code", required = false, defaultValue = "") Integer code) throws OHServiceException {
 
 		List<Bill> bills;
@@ -236,8 +238,8 @@ public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value = "datefrom
 	 */
 	@GetMapping(value = "/bills/payments", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<BillPaymentsDTO>> searchBillsPayments(
-			@RequestParam(value="datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateFrom,
-			@RequestParam(value="dateto") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateTo, 
+			@RequestParam(value="datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateFrom,
+			@RequestParam(value="dateto") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateTo, 
 			@RequestParam(value="patient_code", required=false, defaultValue="") Integer code) throws OHServiceException {
 		LOGGER.info("Get Payments datefrom: {}  dateTo: {} patient: {}", dateFrom, dateTo, code);
 
@@ -372,8 +374,8 @@ public ResponseEntity<List<BillDTO>> getPendingBills(@RequestParam(value="patien
 	 * @throws OHServiceException
 	 */
 	@PostMapping(value = "/bills/search/by/item", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value="datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateFrom,
-			@RequestParam(value="dateto")@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") LocalDateTime dateTo,
+	public ResponseEntity<List<BillDTO>> searchBills(@RequestParam(value="datefrom") @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateFrom,
+			@RequestParam(value="dateto")@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") @Schema(implementation = String.class) LocalDateTime dateTo,
 			@RequestBody BillItemsDTO billItemDTO) throws OHServiceException {
 
 		BillItems billItem = billItemsMapper.map2Model(billItemDTO);

src/main/java/org/isf/admission/rest/AdmissionController.java

@@ -76,7 +76,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -207,8 +207,8 @@ public ResponseEntity<AdmissionDTO> getCurrentAdmission(@RequestParam("patientCo
 	@GetMapping(value = "/admissions/admittedPatients", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<AdmittedPatientDTO>> getAdmittedPatients(
 					@RequestParam(name = "searchterms", defaultValue = "", required = false) String searchTerms,
-					@RequestParam(name = "admissionrange", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Parameter(schema = @Schema(type = "String[]")) LocalDateTime[] admissionRange,
-					@RequestParam(name = "dischargerange", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Parameter(schema = @Schema(type = "String[]")) LocalDateTime[] dischargeRange)
+					@RequestParam(name = "admissionrange", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @ArraySchema(schema = @Schema(implementation = String.class)) LocalDateTime[] admissionRange,
+					@RequestParam(name = "dischargerange", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @ArraySchema(schema = @Schema(implementation = String.class)) LocalDateTime[] dischargeRange)
 					throws OHServiceException {
 		LOGGER.info("Get admitted patients search terms: {}", searchTerms);
 		if (admissionRange != null && admissionRange.length == 2) {
@@ -235,7 +235,7 @@ public ResponseEntity<List<AdmittedPatientDTO>> getAdmittedPatients(
 	 */
 	@GetMapping(value = "/admissions", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<AdmissionDTO>> getAdmissions(
-					@RequestParam(name = "admissionrange") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime[] admissionRange,
+					@RequestParam(name = "admissionrange") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @ArraySchema(schema = @Schema(implementation = String.class)) LocalDateTime[] admissionRange,
 					@RequestParam(value = "page", required = false, defaultValue = "0") int page,
 					@RequestParam(value = "size", required = false, defaultValue = DEFAULT_PAGE_SIZE) int size,
 					@RequestParam(value = "paged", required = false, defaultValue = "false") boolean paged)
@@ -269,7 +269,7 @@ public ResponseEntity<Page<AdmissionDTO>> getAdmissions(
 	 */
 	@GetMapping(value = "/discharges", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<AdmissionDTO>> getDischarges(
-					@RequestParam(name = "dischargerange") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime[] dischargeRange,
+					@RequestParam(name = "dischargerange") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @ArraySchema(schema = @Schema(implementation = String.class)) LocalDateTime[] dischargeRange,
 					@RequestParam(value = "page", required = false, defaultValue = "0") int page,
 					@RequestParam(value = "size", required = false, defaultValue = DEFAULT_PAGE_SIZE) int size)
 					throws OHServiceException {

src/main/java/org/isf/config/SpringFoxConfig.java → src/main/java/org/isf/config/OpenAPIConfiguration.java

@@ -29,6 +29,7 @@
 
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
 import io.swagger.v3.oas.annotations.security.SecurityScheme;
+import io.swagger.v3.oas.annotations.security.SecuritySchemes;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
@@ -40,18 +41,20 @@
 import io.swagger.v3.oas.models.servers.Server;
 
 @Configuration
-@SecurityScheme(
+@SecuritySchemes({
+	@SecurityScheme(
 	    name = "bearerAuth",
 	    type = SecuritySchemeType.HTTP,
 	    bearerFormat = "JWT",
 	    scheme = "bearer"
 	)
-public class SpringFoxConfig {
+})
+public class OpenAPIConfiguration {
 
 	@Bean
 	public OpenAPI springShopOpenAPI() {
 		return new OpenAPI().addSecurityItem(
-			new SecurityRequirement().addList("Bearer Authentication"))
+			new SecurityRequirement().addList("bearerAuth"))
 								     .info(new Info().title("OH 2.0 Api Documentation")
 								     .description("OH 2.0 Api Documentation")
 								     .version("1.0").contact(new Contact().name("ApiInfo.DEFAULT_CONTACT"))

src/main/java/org/isf/lab/dto/LaboratoryDTO.java

@@ -37,7 +37,7 @@ public class LaboratoryDTO {
 	@Schema(description = "Laboratory Code")
 	private Integer code;
 
-	@Schema(description = "Laboratory Material", ref = "Blood")
+	@Schema(description = "Laboratory Material", example = "Blood")
 	private String material;
 
 	@Schema(description = "Laboratory Exam")
@@ -56,7 +56,7 @@ public class LaboratoryDTO {
 	@Schema(description = "lock", example = "0")
 	private int lock;
 
-	@Schema(description = "Laboratory Note", ref = "Note by laboratorist")
+	@Schema(description = "Laboratory Note", example = "Note by laboratorist")
 	private String note;
 
 	@Schema(description = "Laboratory Patient Code")

src/main/java/org/isf/malnutrition/rest/MalnutritionController.java

@@ -45,6 +45,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -134,18 +135,19 @@ public ResponseEntity<MalnutritionDTO> updateMalnutrition(@RequestBody @Valid Ma
 
 	/**
 	 * Deletes a given {@link Malnutrition}.
-	 * @param malnutritionDTO - the malnutrition to delete.
+	 * @param code - the code of malnutrition to delete.
 	 * @return {@code true} if the malnutrition has been deleted, {@code false} otherwise.
 	 * @throws OHServiceException 
 	 */
 	@DeleteMapping(value = "/malnutritions", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Boolean> deleteMalnutrition(@RequestBody @Valid MalnutritionDTO malnutritionDTO) throws OHServiceException{
-		List<Malnutrition> malnutritions = manager.getMalnutrition(String.valueOf(malnutritionDTO.getAdmission().getId()));
+	public ResponseEntity<Boolean> deleteMalnutrition(@RequestParam int code) throws OHServiceException{
+		Malnutrition  malNutri = manager.getMalnutrition(code);
+		List<Malnutrition> malnutritions = manager.getMalnutrition(String.valueOf(malNutri.getAdmission().getId()));
 		List<Malnutrition> matchedMalnutritions = new ArrayList<>();
 		if (malnutritions != null) {
 			matchedMalnutritions = malnutritions
 					.stream()
-					.filter(malnutrition -> malnutrition.getCode() == malnutritionDTO.getCode())
+					.filter(malnutrition -> malnutrition.getCode() == code)
 					.collect(Collectors.toList());
 		}
 		if (matchedMalnutritions.isEmpty()) {

src/main/java/org/isf/opd/rest/OpdController.java

@@ -61,6 +61,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
@@ -282,8 +283,8 @@ public ResponseEntity<List<OpdDTO>> getOpdToDayOrWeek(@RequestParam(name="oneWee
 	 */
 	@GetMapping(value = "/opds/search", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Page<OpdDTO>> getOpdByDates(
-			@RequestParam(value = "dateFrom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate dateFrom, 
-			@RequestParam(value = "dateTo") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate dateTo, 
+			@RequestParam(value = "dateFrom") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Schema(implementation = String.class) LocalDate dateFrom, 
+			@RequestParam(value = "dateTo") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Schema(implementation = String.class) LocalDate dateTo, 
 			@RequestParam(value = "diseaseTypeCode", required = false) String diseaseTypeCode,
 			@RequestParam(value = "diseaseCode", required = false) String diseaseCode,
 			@RequestParam(value = "ageFrom", required = false, defaultValue = "0") Integer ageFrom, 

src/main/java/org/isf/patconsensus/rest/PatientConsensusController.java

@@ -57,7 +57,7 @@ public class PatientConsensusController {
 	@Autowired
 	protected PatientConsensusMapper mapper;
 
-	@GetMapping(value = "/{patientId}", produces = MediaType.APPLICATION_JSON_VALUE)
+	@GetMapping(value = "/patientConsensus/{patientId}", produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<PatientConsensusDTO> getPatientConsensus(@PathVariable Integer patientId) throws OHServiceException {
 		LOGGER.info("Retrieving patient consensus: {}", patientId);
 		Optional<PatientConsensus> patientConsensus = manager.getPatientConsensusByUserId(patientId);
@@ -68,7 +68,7 @@ ResponseEntity<PatientConsensusDTO> getPatientConsensus(@PathVariable Integer pa
 		return ResponseEntity.ok(patientDTO);
 	}
 
-	@PutMapping(value = "/{patientId}", produces = MediaType.APPLICATION_JSON_VALUE)
+	@PutMapping(value = "/patientConsensus/{patientId}", produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<PatientConsensusDTO> updatePatientConsensus(@PathVariable Integer patientId, @RequestBody PatientConsensusDTO patientConsensus)
 					throws OHServiceException {
 		LOGGER.info("Update patient consensus by id: {}", patientId);

src/main/java/org/isf/visits/dto/VisitDTO.java

@@ -26,6 +26,7 @@
 import javax.validation.constraints.NotNull;
 
 import org.isf.patient.dto.PatientDTO;
+import org.isf.ward.dto.WardDTO;
 import org.isf.ward.model.Ward;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -51,7 +52,7 @@ public class VisitDTO {
 	private boolean sms;
 
 	@Schema(description = "ward of the visit")
-	private Ward ward;
+	private WardDTO ward;
 
 	@Schema(description = "duration of the visit")
 	private Integer duration;
@@ -72,11 +73,11 @@ public LocalDateTime getDate() {
 		return this.date;
 	}
 
-	public Ward getWard() {
+	public WardDTO getWard() {
 		return ward;
 	}
 
-	public void setWard(Ward ward) {
+	public void setWard(WardDTO ward) {
 		this.ward = ward;
 	}