BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts while syncing with master

Browse Source
This commit is contained in:
nisha
2025-04-29 13:57:57 +05:30
parent 9990dc349e f931edcdfd
commit 21158b0ee4
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -1,8 +1,15 @@
package net.gepafin.tendermanagement.dao;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.itextpdf.text.BaseColor;
import com.itextpdf.text.Font;
import com.itextpdf.text.FontFactory;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.criteria.*;
import jakarta.servlet.http.HttpServletResponse;
import net.gepafin.tendermanagement.config.Translator;
import net.gepafin.tendermanagement.constants.GepafinConstant;
import net.gepafin.tendermanagement.entities.*;
@@ -49,10 +56,13 @@ import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.regex.Matcher;
@@ -195,6 +205,10 @@ public class ApplicationDao {
@Autowired
private FormRepository formRepository;
@Autowired
private ApplicationEvaluationDao applicationEvaluationDao;
public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) {
FormEntity formEntity = formService.validateForm(formId);
// callService.validatePublishedCall(formEntity.getCall().getId());

3
src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
View File

@@ -720,9 +720,11 @@ public class AppointmentDao {
// Build the appointment request body
AppointmentCreationRequest appointmentCreationRequest = buildAppointmentCreationRequest(applicationId, createAppointmentRequest, appointmentTemplateId,
templateRichiestaData);
log.info("AppointmentCreationRequest : {}", appointmentCreationRequest);
String appointmentRequestBody = Utils.convertObjectToJson(appointmentCreationRequest);
// Make API call to create the appointment
log.info("Context:{}, Authorization Token : {}, RequestBody : {}", context, authorizationToken, appointmentRequestBody);
ResponseEntity<Object> appointmentResponse = appointmentApiService.createAppointment(authorizationToken, context, appointmentRequestBody);
String appointmentId = extractAppointmentIdFromResponse(appointmentResponse);
@@ -751,6 +753,7 @@ public class AppointmentDao {
private String extractAppointmentIdFromResponse(ResponseEntity<Object> appointmentResponse) {
if (appointmentResponse.getBody() != null) {
log.info("Appointment API Response : {}", appointmentResponse.getBody());
Map<String, Object> responseBody = (Map<String, Object>) appointmentResponse.getBody();
if (responseBody.containsKey(GepafinConstant.DATA_STRING)) {
Map<String, Object> data = (Map<String, Object>) responseBody.get(GepafinConstant.DATA_STRING);

19
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -2674,6 +2674,15 @@
<column name="source" value="PDF_FALSE"></column>
</insert>
</changeSet>
<changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_14_04_2025.sql"/>
</changeSet>
<changeSet id="09-04-2025_NK_172550" author="Nisha Kashyap">
<sqlFile
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="25-03-2025_NK_160730" author="Nisha Kashyap">
<sqlFile dbms="postgresql"
@@ -2722,21 +2731,11 @@
</insert>
</changeSet>
<changeSet id="09-04-2025_NK_172550" author="Nisha Kashyap">
<sqlFile
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="08-04-2025_PK_160730" author="Piyush kag">
<sqlFile dbms="postgresql"
path="db/dump/create_assigned_application_view.sql"/>
</changeSet>
<changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_14_04_2025.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_154315" author="Piyush Kag">
<sqlFile dbms="postgresql"