4.8.26 dev v4 (#50)

* Network Hub Enhancements. (#47)

* KB-10186 | Learner Portal | If user has Primary details, in the Service history default data is not calculating for Profile page percentage. (#45)

1. If user has Professional details and the Service history  data is not there then we need to add the profile completion percentage based on the professiona details

* Network Hub Enhancments

1. Implemented the Redis with the jedispool as per current functionality that is available in the cb-ext service.

* Redis client dependency added

* Test cases added for profile service

* 4.8.26 dev v2 (#48)

* KB-10186 | Learner Portal | If user has Primary details, in the Service history default data is not calculating for Profile page percentage. (#45)

1. If user has Professional details and the Service history  data is not there then we need to add the profile completion percentage based on the professiona details

* added the update additional fields and get additional field api

* removed un-used code

---------

Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>

* Null Pointer Exception in Profile Service (#49)

---------

Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com>
Co-authored-by: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com>

Author: 3 people

pom.xml

@@ -48,6 +48,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -65,6 +69,10 @@
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -196,6 +204,11 @@
             <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>4.4.3</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/igot/cb/profile/controller/ProfileController.java

@@ -91,4 +91,21 @@ public ResponseEntity<Object> getCompetencies(@PathVariable(Constants.USER_ID_RQ
         ApiResponse response = profileService.listCompetencies(userId, authToken);
         return new ResponseEntity<>(response, HttpStatus.valueOf(response.getResponseCode().value()));
     }
+
+    @PostMapping(value = "/update/additionalFields")
+    public ResponseEntity<ApiResponse> updateAdditionalFields(
+            @RequestHeader(Constants.X_AUTH_TOKEN) String authToken,
+            @RequestBody Map<String, Object> requestBody) {
+        ApiResponse response = profileService.updateAdditionalFields(requestBody, authToken);
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
+
+    @GetMapping("/getAdditionalFields/{userId}/{orgId}")
+    public ResponseEntity<Object> getAdditionalFieldsByOrg(
+            @PathVariable String userId,
+            @PathVariable String orgId,
+            @RequestHeader(value = Constants.X_AUTH_TOKEN) String authToken) {
+        ApiResponse response = profileService.getAdditionalFieldsByOrg(userId, orgId, authToken);
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
 }

src/main/java/com/igot/cb/profile/entity/CustomFieldEntity.java

@@ -0,0 +1,40 @@
+package com.igot.cb.profile.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.vladmihalcea.hibernate.type.json.JsonType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.Type;
+
+import java.sql.Timestamp;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "custom_fields")
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Entity
+public class CustomFieldEntity {
+    @Id
+    private String customFiledId;
+
+    @Type(JsonType.class)
+    @Column(columnDefinition = "jsonb")
+    private JsonNode customFieldData;
+
+    private Boolean isMandatory;
+
+    private Boolean isActive;
+
+    private Timestamp createdOn;
+
+    private Timestamp updatedOn;
+}

src/main/java/com/igot/cb/profile/repository/CustomFieldRepository.java

@@ -0,0 +1,13 @@
+package com.igot.cb.profile.repository;
+
+
+import com.igot.cb.profile.entity.CustomFieldEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface CustomFieldRepository extends JpaRepository<CustomFieldEntity, String> {
+    Optional<CustomFieldEntity> findByCustomFiledIdAndIsActiveTrue(String customFiledId);
+}

src/main/java/com/igot/cb/profile/service/ProfileService.java

@@ -19,4 +19,8 @@ public interface ProfileService {
     ApiResponse getBasicProfile(String userId, String userToken);
 
     ApiResponse listCompetencies(String userId, String userToken);
+
+    ApiResponse updateAdditionalFields(Map<String, Object> request, String userToken);
+
+    ApiResponse getAdditionalFieldsByOrg(String userId, String orgId, String authToken);
 }