Resolved conflicts.

src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java

@@ -122,10 +122,40 @@ public class CompanyDao {
 		userWithCompanyEntity.setPec(companyRequest.getPec());
 		userWithCompanyEntity.setContactName(companyRequest.getContactName());
 		userWithCompanyEntity.setContactEmail(companyRequest.getContactEmail());
-		userWithCompanyEntity.setJson(Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()) );
 		UserWithCompanyEntity userWithCompany = userWithCompanyRepository.save(userWithCompanyEntity);
 		/** This code is responsible for adding a version history log for the "adding user with company" operation. **/
 		loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(null).newData(userWithCompany).build());
+		if (StringUtils.isEmpty(companyEntity.getJson())) {
+			companyEntity.setJson(Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()));
+			Map<String, Object> vatCheckResponse = companyRequest.getVatCheckResponse();
+			Map<String, Object> data = (Map<String, Object>) vatCheckResponse.get("data");
+			if (data != null) {
+				if (data.containsKey("dettaglio")) {
+					Map<String, Object> dettaglio = (Map<String, Object>) data.get("dettaglio");
+					if (dettaglio != null) {
+						if (dettaglio.containsKey("codice_ateco")) {
+							Object codiceAtecoObj = dettaglio.get("codice_ateco");
+							String codiceAteco = (codiceAtecoObj != null) ? codiceAtecoObj.toString() : null;
+
+							if (codiceAteco != null) {
+								companyEntity.setCodiceAteco(codiceAteco);
+							}
+						}
+					}
+				}
+			}
+
+			companyEntity = companyRepository.save(companyEntity);
+
+			/** This code is responsible for adding a version history log for "updating company json field" operation. **/
+			loggingUtil.addVersionHistory(VersionHistoryRequest.builder()
+					.request(request)
+					.actionType(VersionActionTypeEnum.INSERT)
+					.oldData(null)
+					.newData(companyEntity)
+					.build());
+		}
+
 		return userWithCompany;
 	}
 
@@ -143,6 +173,7 @@ public class CompanyDao {
 		entity.setNumberOfEmployees(request.getNumberOfEmployees());
 		entity.setAnnualRevenue(request.getAnnualRevenue());
 		entity.setHub(userEntity.getHub());
+		entity.setJson(Utils.convertMapIntoJsonString(request.getVatCheckResponse()));
 		if (request.getVatCheckResponse() != null) {
 			Map<String, Object> vatCheckResponse = request.getVatCheckResponse();
 			Map<String, Object> data = (Map<String, Object>) vatCheckResponse.get("data");
@@ -226,10 +257,10 @@ public class CompanyDao {
 		UserWithCompanyEntity userWithCompanyEntity = getUserWithCompany(userEntity.getId(), companyId);
 		//cloned entity for old data
 		UserWithCompanyEntity oldUserWithCompanyData = Utils.getClonedEntityForData(userWithCompanyEntity);
-		if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
+//		if(StringUtils.isNotBlank(companyRequest.getVatNumber())) {
-			String responseJson = companyRequest.getVatCheckResponse() != null ? Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()) : null;
+//			String responseJson = companyRequest.getVatCheckResponse() != null ? Utils.convertMapIntoJsonString(companyRequest.getVatCheckResponse()) : null;
-			setIfUpdated(userWithCompanyEntity::getJson, userWithCompanyEntity::setJson, responseJson);
+//			setIfUpdated(companyEntity::getJson, companyEntity::setJson, responseJson);
-		}
+//		}
 		setIfUpdated(userWithCompanyEntity::getPec, userWithCompanyEntity::setPec, companyRequest.getPec());
 		setIfUpdated(userWithCompanyEntity::getEmail, userWithCompanyEntity::setEmail, companyRequest.getEmail());
 		setIfUpdated(userWithCompanyEntity::getContactName, userWithCompanyEntity::setContactName, companyRequest.getContactName());

src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java

@@ -59,4 +59,7 @@ public class CompanyEntity extends BaseEntity{
 
     @Column(name = "CODICE_ATECO")
     private String codiceAteco;
+
+    @Column(name = "JSON")
+    private String json;
 }

src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java

@@ -35,9 +35,6 @@ public class UserWithCompanyEntity extends BaseEntity{
 	@Column(name = "EMAIL")
 	private String email;
 
-	@Column(name = "JSON")
-	private String json;
-
 	@Column(name = "IS_DELETED")
 	private Boolean isDeleted = false;
 

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2423,5 +2423,16 @@
                       oldColumnName="product_id"
                       newColumnName="appointment_template_id"/>
     </changeSet>
+    
+    <changeSet id="14-02-2025_PK_124000" author="Piyush Kag">
+
+        <addColumn tableName="COMPANY">
+            <column name="JSON" type="TEXT"/>
+        </addColumn>
+        <sqlFile dbms="postgresql"
+                 path="db/dump/insert_json_column_in_company_data_06_02_2025.sql"/>
+        <dropColumn tableName="USER_WITH_COMPANY" columnName="JSON"/>
+
+    </changeSet>
 
 </databaseChangeLog>

src/main/resources/db/dump/insert_json_column_in_company_data_06_02_2025.sql

@@ -0,0 +1,18 @@
+UPDATE COMPANY C
+SET JSON = (
+    SELECT U.JSON
+    FROM USER_WITH_COMPANY U
+    WHERE U.COMPANY_ID = C.ID
+    AND U.IS_DELETED = false
+    AND U.JSON IS NOT NULL
+    AND U.JSON <> ''
+    ORDER BY U.ID ASC
+    LIMIT 1
+)
+WHERE EXISTS (
+    SELECT 1 FROM USER_WITH_COMPANY U
+    WHERE U.COMPANY_ID = C.ID
+    AND U.IS_DELETED = false
+    AND U.JSON IS NOT NULL
+    AND U.JSON <> ''
+);