From 29052ca981303bfac876cb7a2af8e2d66acea15d Mon Sep 17 00:00:00 2001 From: amit-kumaryadav Date: Fri, 17 Sep 2021 10:53:21 +0530 Subject: [PATCH] Revert "Merge pull request #20 from sunbird-cb/wat_telemetry" This reverts commit 5d13c5b3232595581b2a18b4fd14865cdf17464d, reversing changes made to 74690ade11254a83707d62819f815b70006b49d2. --- Jenkinsfile-sun | 22 +- README.md | 9 - .../common/util/CbExtServerProperties.java | 257 +++++++---------- .../controller/AllocationControllerV2.java | 5 - .../model/CompetencyDetails.java | 267 +++++++++--------- .../model/PropertyFilterMixIn.java | 8 - .../model/UserWorkAllocationMapping.java | 53 ---- .../UserWorkAllocationPrimaryKeyModel.java | 34 --- .../model/telemetryEvent/Actor.java | 22 -- .../model/telemetryEvent/Context.java | 31 -- .../model/telemetryEvent/Event.java | 83 ------ .../model/telemetryEvent/Flags.java | 22 -- .../model/telemetryEvent/ObjectData.java | 24 -- .../model/telemetryEvent/Pdata.java | 31 -- .../repo/UserWorkAllocationMappingRepo.java | 16 -- .../repo/WorkAllocationRepo.java | 6 - .../service/AllocationServiceV2.java | 63 +---- .../service/EnrichmentService.java | 12 +- .../workallocation/service/WATConsumer.java | 177 ------------ .../util/WorkAllocationConstants.java | 30 -- src/main/resources/application.properties | 5 - 21 files changed, 250 insertions(+), 927 deletions(-) delete mode 100644 src/main/java/org/sunbird/workallocation/model/PropertyFilterMixIn.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/UserWorkAllocationMapping.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/UserWorkAllocationPrimaryKeyModel.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/Actor.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/Context.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/Event.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/Flags.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/ObjectData.java delete mode 100644 src/main/java/org/sunbird/workallocation/model/telemetryEvent/Pdata.java delete mode 100644 src/main/java/org/sunbird/workallocation/repo/UserWorkAllocationMappingRepo.java delete mode 100644 src/main/java/org/sunbird/workallocation/service/WATConsumer.java diff --git a/Jenkinsfile-sun b/Jenkinsfile-sun index 35b4301cc..534aa697f 100644 --- a/Jenkinsfile-sun +++ b/Jenkinsfile-sun @@ -1,5 +1,5 @@ @Library('deploy-conf') _ -node() { +node('build-slave') { try { String ANSI_GREEN = "\u001B[32m" String ANSI_NORMAL = "\u001B[0m" @@ -15,19 +15,21 @@ node() { } else println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL) } + cleanWs() checkout scm commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim() - build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim() + build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim() echo "build_tag: " + build_tag - + stage('docker-pre-build') { sh ''' - docker build -f ./Dockerfile.build -t $docker_pre_build . - docker run --name $docker_pre_build $docker_pre_build:latest && docker cp $docker_pre_build:/opt/target/sb-cb-ext-0.0.1-SNAPSHOT.jar . - sleep 30 - docker rm -f $docker_pre_build - docker rmi -f $docker_pre_build + + docker build -f ./Dockerfile.build -t $docker_pre_build . + docker run --name $docker_pre_build $docker_pre_build:latest && docker cp $docker_pre_build:/opt/target/sb-cb-ext-0.0.1-SNAPSHOT.jar . + sleep 30 + docker rm -f $docker_pre_build + docker rmi -f $docker_pre_build ''' } stage('Build') { @@ -36,13 +38,13 @@ node() { sh('chmod 777 build.sh') sh("bash -x build.sh ${build_tag} ${env.NODE_NAME} ${docker_server}") } - stage('ArchiveArtifacts') { + stage('ArchiveArtifacts') { archiveArtifacts "metadata.json" currentBuild.description = "${build_tag}" } } - + } catch (err) { currentBuild.result = "FAILURE" diff --git a/README.md b/README.md index 4c8674676..27b9113aa 100644 --- a/README.md +++ b/README.md @@ -234,12 +234,3 @@ CREATE TABLE work_allocation( PRIMARY KEY (id) ); ``` -```sh -CREATE TABLE user_work_allocation_mapping( - userid text, - workallocationid text, - workorderid text, - status text, - PRIMARY KEY (userid, workallocationid) -); -``` diff --git a/src/main/java/org/sunbird/common/util/CbExtServerProperties.java b/src/main/java/org/sunbird/common/util/CbExtServerProperties.java index c76336d55..35ca99682 100644 --- a/src/main/java/org/sunbird/common/util/CbExtServerProperties.java +++ b/src/main/java/org/sunbird/common/util/CbExtServerProperties.java @@ -65,45 +65,45 @@ public class CbExtServerProperties { @Value("${kafka.topics.org.creation}") private String orgCreationKafkaTopic; - + @Value("${km.base.host}") private String kmBaseHost; - + @Value("${km.base.framework.path}") private String kmFrameWorkPath; - + @Value("${frac.host}") private String fracHost; - + @Value("${frac.node.path}") private String fracNodePath; - + @Value("${frac.activity.path}") private String fracActivityPath; - + @Value("${frac.node.source}") private String fracSource; - + @Value("${frac.node.source.useDeptName}") private boolean fracSourceUseDeptName; - + @Value("${igot.taxonomy.framework.name}") private String taxonomyFrameWorkName; - + @Value("${igot.taxonomy.category.name}") private String taxonomyCategoryName; @Value("${kafka.topics.userrole.audit}") private String userRoleAuditTopic; - + @Value("${content-service-host}") - private String contentHost; + private String contentHost; - @Value("${content-hierarchy-endpoint}") - private String hierarchyEndPoint; - - @Value("${participants.api.endpoint}") - private String participantsEndPoint; + @Value("${content-hierarchy-endpoint}") + private String hierarchyEndPoint; + + @Value("${participants.api.endpoint}") + private String participantsEndPoint; @Value("${course.batch.create.endpoint}") private String courseBatchCreateEndpoint; @@ -126,37 +126,24 @@ public class CbExtServerProperties { @Value("${content.default.orgId}") private String contentDefaultOrgId; - - @Value("${kafka.topics.wat.telemetry.event}") - private String kafkaTopicWatEvent; - - @Value("${sunbird.telemetry.base.url}") - private String telemetryBaseUrl; - - @Value("${sunbird.telemetry.endpoint}") - private String telemetryEndpoint; - - @Value("${wat.telemetry.env}") - private String watTelemetryEnv; - - + public String getContentHost() { - return contentHost; - } + return contentHost; + } - public void setContentHost(String contentHost) { - this.contentHost = contentHost; - } + public void setContentHost(String contentHost) { + this.contentHost = contentHost; + } - public String getHierarchyEndPoint() { - return hierarchyEndPoint; - } + public String getHierarchyEndPoint() { + return hierarchyEndPoint; + } - public void setHierarchyEndPoint(String hierarchyEndPoint) { - this.hierarchyEndPoint = hierarchyEndPoint; - } + public void setHierarchyEndPoint(String hierarchyEndPoint) { + this.hierarchyEndPoint = hierarchyEndPoint; + } - public String getWfServiceHost() { + public String getWfServiceHost() { return wfServiceHost; } @@ -315,78 +302,78 @@ public String getOrgCreationKafkaTopic() { public void setOrgCreationKafkaTopic(String orgCreationKafkaTopic) { this.orgCreationKafkaTopic = orgCreationKafkaTopic; } - + public String getKmBaseHost() { - return kmBaseHost; - } - - public void setKmBaseHost(String kmBaseHost) { - this.kmBaseHost = kmBaseHost; - } - - public String getKmFrameWorkPath() { - return kmFrameWorkPath; - } - - public void setKmFrameWorkPath(String kmFrameWorkPath) { - this.kmFrameWorkPath = kmFrameWorkPath; - } - - public String getFracHost() { - return fracHost; - } - - public void setFracHost(String fracHost) { - this.fracHost = fracHost; - } - - public String getFracNodePath() { - return fracNodePath; - } - - public void setFracNodePath(String fracNodePath) { - this.fracNodePath = fracNodePath; - } - - public String getFracActivityPath() { - return fracActivityPath; - } - - public void setFracActivityPath(String fracActivityPath) { - this.fracActivityPath = fracActivityPath; - } - - public String getFracSource() { - return fracSource; - } - - public void setFracSource(String fracSource) { - this.fracSource = fracSource; - } - - public boolean isFracSourceUseDeptName() { - return fracSourceUseDeptName; - } - - public void setFracSourceUseDeptName(boolean fracSourceUseDeptName) { - this.fracSourceUseDeptName = fracSourceUseDeptName; - } - - public String getTaxonomyFrameWorkName() { - return taxonomyFrameWorkName; - } - - public void setTaxonomyFrameWorkName(String taxonomyFrameWorkName) { - this.taxonomyFrameWorkName = taxonomyFrameWorkName; - } - - public String getTaxonomyCategoryName() { - return taxonomyCategoryName; - } - - public void setTaxonomyCategoryName(String taxonomyCategoryName) { - this.taxonomyCategoryName = taxonomyCategoryName; - } + return kmBaseHost; + } + + public void setKmBaseHost(String kmBaseHost) { + this.kmBaseHost = kmBaseHost; + } + + public String getKmFrameWorkPath() { + return kmFrameWorkPath; + } + + public void setKmFrameWorkPath(String kmFrameWorkPath) { + this.kmFrameWorkPath = kmFrameWorkPath; + } + + public String getFracHost() { + return fracHost; + } + + public void setFracHost(String fracHost) { + this.fracHost = fracHost; + } + + public String getFracNodePath() { + return fracNodePath; + } + + public void setFracNodePath(String fracNodePath) { + this.fracNodePath = fracNodePath; + } + + public String getFracActivityPath() { + return fracActivityPath; + } + + public void setFracActivityPath(String fracActivityPath) { + this.fracActivityPath = fracActivityPath; + } + + public String getFracSource() { + return fracSource; + } + + public void setFracSource(String fracSource) { + this.fracSource = fracSource; + } + + public boolean isFracSourceUseDeptName() { + return fracSourceUseDeptName; + } + + public void setFracSourceUseDeptName(boolean fracSourceUseDeptName) { + this.fracSourceUseDeptName = fracSourceUseDeptName; + } + + public String getTaxonomyFrameWorkName() { + return taxonomyFrameWorkName; + } + + public void setTaxonomyFrameWorkName(String taxonomyFrameWorkName) { + this.taxonomyFrameWorkName = taxonomyFrameWorkName; + } + + public String getTaxonomyCategoryName() { + return taxonomyCategoryName; + } + + public void setTaxonomyCategoryName(String taxonomyCategoryName) { + this.taxonomyCategoryName = taxonomyCategoryName; + } public String getUserRoleAuditTopic() { return userRoleAuditTopic; @@ -395,14 +382,14 @@ public String getUserRoleAuditTopic() { public void setUserRoleAuditTopic(String userRoleAuditTopic) { this.userRoleAuditTopic = userRoleAuditTopic; } - + public String getParticipantsEndPoint() { - return participantsEndPoint; - } + return participantsEndPoint; + } - public void setParticipantsEndPoint(String participantsEndPoint) { - this.participantsEndPoint = participantsEndPoint; - } + public void setParticipantsEndPoint(String participantsEndPoint) { + this.participantsEndPoint = participantsEndPoint; + } public String getCourseBatchCreateEndpoint() { return courseBatchCreateEndpoint; @@ -470,36 +457,4 @@ public String getContentDefaultOrgId() { public void setContentDefaultOrgId(String contentDefaultOrgId) { this.contentDefaultOrgId = contentDefaultOrgId; } - - public String getKafkaTopicWatEvent() { - return kafkaTopicWatEvent; - } - - public void setKafkaTopicWatEvent(String kafkaTopicWatEvent) { - this.kafkaTopicWatEvent = kafkaTopicWatEvent; - } - - public String getTelemetryBaseUrl() { - return telemetryBaseUrl; - } - - public void setTelemetryBaseUrl(String telemetryBaseUrl) { - this.telemetryBaseUrl = telemetryBaseUrl; - } - - public String getTelemetryEndpoint() { - return telemetryEndpoint; - } - - public void setTelemetryEndpoint(String telemetryEndpoint) { - this.telemetryEndpoint = telemetryEndpoint; - } - - public String getWatTelemetryEnv() { - return watTelemetryEnv; - } - - public void setWatTelemetryEnv(String watTelemetryEnv) { - this.watTelemetryEnv = watTelemetryEnv; - } } \ No newline at end of file diff --git a/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java b/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java index 77ce570c6..7aa0f49c2 100644 --- a/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java +++ b/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java @@ -72,9 +72,4 @@ public ResponseEntity getUserBasicInfo(@PathVariable("userId") String return new ResponseEntity<>(allocationServiceV2.getUserBasicDetails(userId), HttpStatus.OK); } - @GetMapping("/user/competencies/{userId}") - public ResponseEntity getUserCompetencies(@PathVariable("userId") String userId) throws IOException { - return new ResponseEntity<>(allocationServiceV2.getUserCompetencies(userId), HttpStatus.OK); - } - } diff --git a/src/main/java/org/sunbird/workallocation/model/CompetencyDetails.java b/src/main/java/org/sunbird/workallocation/model/CompetencyDetails.java index d20df8d91..2bd70c499 100644 --- a/src/main/java/org/sunbird/workallocation/model/CompetencyDetails.java +++ b/src/main/java/org/sunbird/workallocation/model/CompetencyDetails.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -10,127 +9,127 @@ import org.springframework.util.StringUtils; public class CompetencyDetails { - private String type; - private String id; - private String name; - private String description; - private String source; - private String status; - private String level; - private AdditionalProperties additionalProperties; - private List children; - - public String getType() { - return type; - } - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - public void setType(String type) { - this.type = type; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public AdditionalProperties getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(AdditionalProperties additionalProperties) { - this.additionalProperties = additionalProperties; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - } - - public FracRequest getFracRequest(String source, Child child) { - FracRequest req = new FracRequest(); - req.setSource(source); - req.setName(name); - req.setType("COMPETENCY"); - req.setDescription(description); - if ("".equals(id)) { - req.setId(null); - } else { - req.setId(id); - } - req.setAdditionalProperties(additionalProperties); - - List childNodeList = new ArrayList<>(); - if (child != null) { - ChildNode newCN = new ChildNode(); - newCN.setName(child.getName()); - newCN.setType(child.getType()); - newCN.setSource(source); - newCN.setLevel(child.getLevel()); - childNodeList.add(newCN); - req.setChildren(childNodeList); - } else { - if (!CollectionUtils.isEmpty(children)) { - for (Child cn : children) { - ChildNode newCN = new ChildNode(); - if (!StringUtils.isEmpty(cn.getId())) - newCN.setId(cn.getId()); - newCN.setName(cn.getName()); - newCN.setType(cn.getType()); - newCN.setSource(source); - newCN.setDescription(cn.getDescription()); - newCN.setLevel(cn.getLevel()); - childNodeList.add(newCN); - req.setChildren(childNodeList); - } - } - } - + private String type; + private String id; + private String name; + private String description; + private String source; + private String status; + private String level; + private AdditionalProperties additionalProperties; + private List children; + + public String getType() { + return type; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public void setType(String type) { + this.type = type; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public AdditionalProperties getAdditionalProperties() { + return additionalProperties; + } + + public void setAdditionalProperties(AdditionalProperties additionalProperties) { + this.additionalProperties = additionalProperties; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public FracRequest getFracRequest(String source, Child child) { + FracRequest req = new FracRequest(); + req.setSource(source); + req.setName(name); + req.setType("COMPETENCY"); + req.setDescription(description); + if ("".equals(id)) { + req.setId(null); + } else { + req.setId(id); + } + req.setAdditionalProperties(additionalProperties); + + List childNodeList = new ArrayList<>(); + if (child != null) { + ChildNode newCN = new ChildNode(); + newCN.setName(child.getName()); + newCN.setType(child.getType()); + newCN.setSource(source); + newCN.setLevel(child.getLevel()); + childNodeList.add(newCN); + req.setChildren(childNodeList); + } else { + if (!CollectionUtils.isEmpty(children)) { + for (Child cn : children) { + ChildNode newCN = new ChildNode(); + if (!StringUtils.isEmpty(cn.getId())) + newCN.setId(cn.getId()); + newCN.setName(cn.getName()); + newCN.setType(cn.getType()); + newCN.setSource(source); + newCN.setDescription(cn.getDescription()); + newCN.setLevel(cn.getLevel()); + childNodeList.add(newCN); + req.setChildren(childNodeList); + } + } + } + // if (req.getChildren() != null && req.getChildren().size() < 5) { // Set levelSet = children.stream().map(Child::getLevel).collect(Collectors.toSet()); // // We need to add more children @@ -147,23 +146,9 @@ public FracRequest getFracRequest(String source, Child child) { // childNodeList.add(newCN); // } // } - - req.setChildren(childNodeList); - - return req; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - CompetencyDetails that = (CompetencyDetails) o; - return Objects.equals(id, that.id) && - Objects.equals(name, that.name); - } - - @Override - public int hashCode() { - return Objects.hash(id, name); - } + + req.setChildren(childNodeList); + + return req; + } } diff --git a/src/main/java/org/sunbird/workallocation/model/PropertyFilterMixIn.java b/src/main/java/org/sunbird/workallocation/model/PropertyFilterMixIn.java deleted file mode 100644 index 1dc4ee635..000000000 --- a/src/main/java/org/sunbird/workallocation/model/PropertyFilterMixIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.sunbird.workallocation.model; - -import com.fasterxml.jackson.annotation.JsonFilter; - -@JsonFilter("PropertyFilter") -public class PropertyFilterMixIn { - -} \ No newline at end of file diff --git a/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationMapping.java b/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationMapping.java deleted file mode 100644 index 234d84188..000000000 --- a/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationMapping.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.sunbird.workallocation.model; - -import org.springframework.data.cassandra.core.mapping.Column; -import org.springframework.data.cassandra.core.mapping.PrimaryKey; -import org.springframework.data.cassandra.core.mapping.Table; - -@Table("user_work_allocation_mapping") -public class UserWorkAllocationMapping { - - public UserWorkAllocationMapping() { - super(); - } - - public UserWorkAllocationMapping(String userId, String workAllocationId, String workOrderId, String status) { - this.primaryKey = new UserWorkAllocationPrimaryKeyModel(); - this.primaryKey.setUserId(userId); - this.primaryKey.setWorkAllocationId(workAllocationId); - this.workOrderId = workOrderId; - this.status = status; - } - - @PrimaryKey - private UserWorkAllocationPrimaryKeyModel primaryKey; - - @Column("workorderid") - private String workOrderId; - - @Column("status") - private String status; - - public UserWorkAllocationPrimaryKeyModel getPrimaryKey() { - return primaryKey; - } - - public void setPrimaryKey(UserWorkAllocationPrimaryKeyModel primaryKey) { - this.primaryKey = primaryKey; - } - - public String getStatus() { - return status; - } - - public String getWorkOrderId() { - return workOrderId; - } - public void setWorkOrderId(String workOrderId) { - this.workOrderId = workOrderId; - } - - public void setStatus(String status) { - this.status = status; - } -} diff --git a/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationPrimaryKeyModel.java b/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationPrimaryKeyModel.java deleted file mode 100644 index 12fb648b3..000000000 --- a/src/main/java/org/sunbird/workallocation/model/UserWorkAllocationPrimaryKeyModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.sunbird.workallocation.model; - -import org.springframework.data.cassandra.core.cql.PrimaryKeyType; -import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; -import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn; - -@PrimaryKeyClass -public class UserWorkAllocationPrimaryKeyModel { - - private static final long serialVersionUID = 1L; - @PrimaryKeyColumn(name = "userid", ordinal = 0, type = PrimaryKeyType.PARTITIONED) - private String userId; - - - @PrimaryKeyColumn(name = "workallocationid", ordinal = 0, type = PrimaryKeyType.PARTITIONED) - private String workAllocationId; - - public String getWorkAllocationId() { - return workAllocationId; - } - - public void setWorkAllocationId(String workAllocationId) { - this.workAllocationId = workAllocationId; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - -} \ No newline at end of file diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Actor.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Actor.java deleted file mode 100644 index 37b300810..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Actor.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -public class Actor { - private String id; - private String type; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } -} diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Context.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Context.java deleted file mode 100644 index 36c4888d1..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Context.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -public class Context { - private String channel; - private Pdata pdata; - private String env; - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel; - } - - public Pdata getPdata() { - return pdata; - } - - public void setPdata(Pdata pdata) { - this.pdata = pdata; - } - - public String getEnv() { - return env; - } - - public void setEnv(String env) { - this.env = env; - } -} diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Event.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Event.java deleted file mode 100644 index 496be4bf6..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Event.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.Map; - -public class Event { - private Actor actor; - private String eid; - private Map edata; - private String ver; - private long ets; - private Context context; - private String mid; - private ObjectData object; - - public Actor getActor() { - return actor; - } - - public void setActor(Actor actor) { - this.actor = actor; - } - - public String getEid() { - return eid; - } - - public void setEid(String eid) { - this.eid = eid; - } - - - public String getVer() { - return ver; - } - - public void setVer(String ver) { - this.ver = ver; - } - - - public long getEts() { - return ets; - } - - public void setEts(long ets) { - this.ets = ets; - } - - public Context getContext() { - return context; - } - - public void setContext(Context context) { - this.context = context; - } - - - public String getMid() { - return mid; - } - - public void setMid(String mid) { - this.mid = mid; - } - - public ObjectData getObject() { - return object; - } - - public void setObject(ObjectData object) { - this.object = object; - } - - public Map getEdata() { - return edata; - } - - public void setEdata(Map edata) { - this.edata = edata; - } -} diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Flags.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Flags.java deleted file mode 100644 index ee428a733..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Flags.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -public class Flags { - private boolean pp_duplicate_skipped; - private boolean pp_validation_processed; - - public boolean isPp_duplicate_skipped() { - return pp_duplicate_skipped; - } - - public void setPp_duplicate_skipped(boolean pp_duplicate_skipped) { - this.pp_duplicate_skipped = pp_duplicate_skipped; - } - - public boolean isPp_validation_processed() { - return pp_validation_processed; - } - - public void setPp_validation_processed(boolean pp_validation_processed) { - this.pp_validation_processed = pp_validation_processed; - } -} diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/ObjectData.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/ObjectData.java deleted file mode 100644 index 3dbc243c2..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/ObjectData.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -public class ObjectData { - private String id; - private String type; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - -} diff --git a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Pdata.java b/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Pdata.java deleted file mode 100644 index da8676a60..000000000 --- a/src/main/java/org/sunbird/workallocation/model/telemetryEvent/Pdata.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.sunbird.workallocation.model.telemetryEvent; - -public class Pdata { - private String id; - private String pid; - private String ver; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - - public String getVer() { - return ver; - } - - public void setVer(String ver) { - this.ver = ver; - } -} diff --git a/src/main/java/org/sunbird/workallocation/repo/UserWorkAllocationMappingRepo.java b/src/main/java/org/sunbird/workallocation/repo/UserWorkAllocationMappingRepo.java deleted file mode 100644 index 9bbd424ea..000000000 --- a/src/main/java/org/sunbird/workallocation/repo/UserWorkAllocationMappingRepo.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.sunbird.workallocation.repo; - -import org.springframework.data.cassandra.repository.CassandraRepository; -import org.springframework.data.cassandra.repository.Query; -import org.springframework.stereotype.Repository; -import org.sunbird.workallocation.model.UserWorkAllocationMapping; -import org.sunbird.workallocation.model.UserWorkAllocationPrimaryKeyModel; - -import java.util.List; - -@Repository -public interface UserWorkAllocationMappingRepo extends CassandraRepository { - - @Query("SELECT * FROM user_work_allocation_mapping where userid=?0;") - List findByUserId(String userId); -} diff --git a/src/main/java/org/sunbird/workallocation/repo/WorkAllocationRepo.java b/src/main/java/org/sunbird/workallocation/repo/WorkAllocationRepo.java index 06703ab2f..7d64ab8c2 100644 --- a/src/main/java/org/sunbird/workallocation/repo/WorkAllocationRepo.java +++ b/src/main/java/org/sunbird/workallocation/repo/WorkAllocationRepo.java @@ -1,17 +1,11 @@ package org.sunbird.workallocation.repo; import org.springframework.data.cassandra.repository.CassandraRepository; -import org.springframework.data.cassandra.repository.Query; import org.springframework.stereotype.Repository; import org.sunbird.workallocation.model.WorkAllocationCassandraModel; import org.sunbird.workallocation.model.WorkAllocationPrimaryKeyModel; -import java.util.List; - @Repository public interface WorkAllocationRepo extends CassandraRepository { - @Query("SELECT * FROM work_allocation where id IN ?0") - List findByIdIn(List userId); - } \ No newline at end of file diff --git a/src/main/java/org/sunbird/workallocation/service/AllocationServiceV2.java b/src/main/java/org/sunbird/workallocation/service/AllocationServiceV2.java index 3dd08bcb5..79ac6e4a6 100644 --- a/src/main/java/org/sunbird/workallocation/service/AllocationServiceV2.java +++ b/src/main/java/org/sunbird/workallocation/service/AllocationServiceV2.java @@ -1,7 +1,6 @@ package org.sunbird.workallocation.service; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchResponse; @@ -27,17 +26,14 @@ import org.sunbird.common.util.Constants; import org.sunbird.core.exception.ApplicationLogicError; import org.sunbird.core.exception.BadRequestException; -import org.sunbird.core.producer.Producer; import org.sunbird.workallocation.model.*; import org.sunbird.workallocation.repo.WorkAllocationRepo; import org.sunbird.workallocation.repo.WorkOrderRepo; -import org.sunbird.workallocation.repo.UserWorkAllocationMappingRepo; import org.sunbird.workallocation.util.Validator; import org.sunbird.workallocation.util.WorkAllocationConstants; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; @Service public class AllocationServiceV2 { @@ -85,19 +81,11 @@ public class AllocationServiceV2 { @Value("${workallocation.index.type}") public String workAllocationIndexType; - @Autowired - private UserWorkAllocationMappingRepo userWorkAllocationMappingRepo; - - @Autowired - Producer producer; - ObjectMapper mapper = new ObjectMapper(); private Logger logger = LoggerFactory.getLogger(AllocationServiceV2.class); - final String[] includeFields = { "roleCompetencyList.competencyDetails"}; - /** * * @param userId user Id of the user @@ -123,9 +111,6 @@ public Response addWorkOrder(String userId, WorkOrderDTO workOrder) { } else { response.put(Constants.MESSAGE, Constants.FAILED); } - HashMap watEventData = new HashMap<>(); - watEventData.put("workorderId", workOrder.getId()); - producer.push(cbExtServerProperties.getKafkaTopicWatEvent(), watEventData); HashMap data = new HashMap<>(); data.put("id", workOrder.getId()); response.put(Constants.DATA, data); @@ -160,9 +145,6 @@ public Response updateWorkOrder(String userId, WorkOrderDTO workOrder, String xA logger.error("Exception occurred while updating the work order", ex); throw new ApplicationLogicError("Exception occurred while updating the work order", ex); } - HashMap watEventData = new HashMap<>(); - watEventData.put("workorderId", workOrder.getId()); - producer.push(cbExtServerProperties.getKafkaTopicWatEvent(), watEventData); Response response = new Response(); if (!ObjectUtils.isEmpty(restStatus)) { response.put(Constants.MESSAGE, Constants.SUCCESSFUL); @@ -215,9 +197,7 @@ public Response addWorkAllocation(String authUserToken, String userId, WorkAlloc logger.error("Exception occurred while saving the work allocation!!", ex); throw new ApplicationLogicError("Exception occurred while saving the work allocation!!", ex); } - HashMap watEventData = new HashMap<>(); - watEventData.put("workorderId", workAllocationDTO.getWorkOrderId()); - producer.push(cbExtServerProperties.getKafkaTopicWatEvent(), watEventData); + Response response = new Response(); if (!ObjectUtils.isEmpty(restStatus)) { response.put(Constants.MESSAGE, Constants.SUCCESSFUL); @@ -268,9 +248,6 @@ public Response updateWorkAllocation(String authUserToken, String userId, WorkAl logger.error("Exception occurred while saving the work allocation!!", ex); throw new ApplicationLogicError("Exception occurred while saving the work allocation!!", ex); } - HashMap watEventData = new HashMap<>(); - watEventData.put("workorderId", workAllocationDTO.getWorkOrderId()); - producer.push(cbExtServerProperties.getKafkaTopicWatEvent(), watEventData); Response response = new Response(); if (!ObjectUtils.isEmpty(restStatus)) { response.put(Constants.MESSAGE, Constants.SUCCESSFUL); @@ -483,9 +460,6 @@ public Response copyWorkOrder(String userId, WorkOrderDTO workOrderDTO) { } else { response.put(Constants.MESSAGE, Constants.FAILED); } - HashMap watEventData = new HashMap<>(); - watEventData.put("workorderId", workOrder.getId()); - producer.push(cbExtServerProperties.getKafkaTopicWatEvent(), watEventData); HashMap data = new HashMap<>(); data.put("id", workOrder.getId()); response.put(Constants.DATA, data); @@ -623,39 +597,4 @@ private String uploadPdfAndgetArtifactURL(String identifier, String xAuthUser, S return downloadableLink; } - public Response getUserCompetencies(String userId) { - HashSet competencyDetails = new HashSet<>(); - List userWorkAllocationMappings = userWorkAllocationMappingRepo.findByUserId(userId); - if (!CollectionUtils.isEmpty(userWorkAllocationMappings)) { - List workAllocationIds = userWorkAllocationMappings.stream(). - filter(allocationDetails -> WorkAllocationConstants.PUBLISHED_STATUS.equals(allocationDetails.getStatus())). - map(userWorkAllocationMapping -> userWorkAllocationMapping.getPrimaryKey().getWorkAllocationId()).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(workAllocationIds)) { - final BoolQueryBuilder query = QueryBuilders.boolQuery(); - query.must(QueryBuilders.termsQuery("id.keyword", workAllocationIds)); - SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(query); - sourceBuilder.fetchSource(includeFields, new String[]{}); - try { - SearchResponse searchResponse = indexerService.getEsResult(workAllocationIndex, workAllocationIndexType, sourceBuilder); - for (SearchHit hit : searchResponse.getHits()) { - Map sourceAsMap = hit.getSourceAsMap(); - List roleCompetencies = mapper.convertValue(sourceAsMap.get("roleCompetencyList"), new TypeReference>() { - }); - if (!CollectionUtils.isEmpty(roleCompetencies)) { - List competencyDetailsList = roleCompetencies.stream().map(roleCompetency -> roleCompetency.getCompetencyDetails()). - flatMap(competencyList -> competencyList.stream()).collect(Collectors.toList()); - competencyDetails.addAll(competencyDetailsList); - } - } - } catch (IOException e) { - logger.error("Elastic Search Exception", e); - } - } - } - Response response = new Response(); - response.put(Constants.MESSAGE, Constants.SUCCESSFUL); - response.put(Constants.DATA, competencyDetails); - response.put(Constants.STATUS, HttpStatus.OK); - return response; - } } \ No newline at end of file diff --git a/src/main/java/org/sunbird/workallocation/service/EnrichmentService.java b/src/main/java/org/sunbird/workallocation/service/EnrichmentService.java index fb2816436..fd9019a8f 100644 --- a/src/main/java/org/sunbird/workallocation/service/EnrichmentService.java +++ b/src/main/java/org/sunbird/workallocation/service/EnrichmentService.java @@ -5,18 +5,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import org.sunbird.workallocation.model.UserBasicInfo; -import org.sunbird.workallocation.model.WorkAllocationDTOV2; -import org.sunbird.workallocation.model.WorkOrderDTO; +import org.sunbird.common.util.Constants; +import org.sunbird.workallocation.model.*; import org.sunbird.workallocation.util.WorkAllocationConstants; import java.io.IOException; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; +import java.util.stream.Collectors; @Service public class EnrichmentService { diff --git a/src/main/java/org/sunbird/workallocation/service/WATConsumer.java b/src/main/java/org/sunbird/workallocation/service/WATConsumer.java deleted file mode 100644 index 2532340c2..000000000 --- a/src/main/java/org/sunbird/workallocation/service/WATConsumer.java +++ /dev/null @@ -1,177 +0,0 @@ -package org.sunbird.workallocation.service; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ser.FilterProvider; -import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; -import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.kafka.annotation.KafkaListener; -import org.springframework.kafka.annotation.TopicPartition; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; -import org.sunbird.common.service.OutboundRequestHandlerServiceImpl; -import org.sunbird.common.util.CbExtServerProperties; -import org.sunbird.core.logger.CbExtLogger; -import org.sunbird.core.producer.Producer; -import org.sunbird.workallocation.model.*; -import org.sunbird.workallocation.model.telemetryEvent.*; -import org.sunbird.workallocation.repo.WorkAllocationRepo; -import org.sunbird.workallocation.repo.WorkOrderRepo; -import org.sunbird.workallocation.repo.UserWorkAllocationMappingRepo; -import org.sunbird.workallocation.util.WorkAllocationConstants; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.*; - -@Service -public class WATConsumer { - - @Autowired - private WorkOrderRepo workOrderRepo; - - @Autowired - private WorkAllocationRepo workAllocationRepo; - - @Autowired - private OutboundRequestHandlerServiceImpl outboundRequestHandlerService; - - @Autowired - private CbExtServerProperties cbExtServerProperties; - - @Autowired - private Producer producer; - - @Autowired - private UserWorkAllocationMappingRepo userWorkAllocationMappingRepo; - - @Value("${kafka.topics.parent.telemetry.event}") - public String telemetryEventTopicName; - - private CbExtLogger logger = new CbExtLogger(getClass().getName()); - - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-ddXHH:mm:ss.ms", Locale.getDefault()); - - private static final String[] ignorableFieldsForPublishedState = {"userName", "userEmail", "submittedFromName", "submittedFromEmail", "submittedToName", "submittedToEmail", "createdByName", "updatedByName"}; - - @KafkaListener(id = "id2", groupId = "watTelemetryTopic-consumer", topicPartitions = { - @TopicPartition(topic = "${kafka.topics.wat.telemetry.event}", partitions = {"0", "1", "2", "3"})}) - public void processMessage(ConsumerRecord data) { - try { - logger.info("Consuming the audit records for WAT ....."); - ObjectMapper mapper = new ObjectMapper(); - Map workAllocationObj = mapper.readValue(String.valueOf(data.value()), Map.class); - WorkOrderPrimaryKeyModel primaryKeyModel = new WorkOrderPrimaryKeyModel(); - primaryKeyModel.setId((String) workAllocationObj.get("workorderId")); - Optional workOrderCassandraModelOptional = workOrderRepo.findById(primaryKeyModel); - if (workOrderCassandraModelOptional.isPresent()) { - WorkOrderCassandraModel workOrderCassandraModel = workOrderCassandraModelOptional.get(); - Map watObj = mapper.readValue(workOrderCassandraModel.getData(), Map.class); - logger.info("consumed record for WAT ..."); - logger.info(mapper.writeValueAsString(watObj)); - List userIds = (List) watObj.get("userIds"); - if (!CollectionUtils.isEmpty(userIds)) { - List workAllocationList = workAllocationRepo.findByIdIn(userIds); - List workAllocations = new ArrayList<>(); - workAllocationList.forEach(workAllocationCassandraModel -> { - try { - workAllocations.add(mapper.readValue(workAllocationCassandraModel.getData(), WorkAllocationDTOV2.class)); - } catch (IOException e) { - logger.error(e); - } - }); - watObj.put("users", workAllocations); - - //update the user_workorder_mapping table - updateUserWorkOrderMappings(watObj, workAllocations); - } - watObj = getFilterObject(watObj); - Event event = getTelemetryEvent(watObj); - logger.info("Posting WAT event to telemetry ..."); - logger.info(mapper.writeValueAsString(event)); - //postTelemetryEvent(event); - producer.push(telemetryEventTopicName, event); - } - } catch (IOException e) { - logger.error(e); - } - } - - private Map getFilterObject(Map watObj) throws IOException { - ObjectMapper mapper1 = new ObjectMapper(); - mapper1.addMixIn(Object.class, PropertyFilterMixIn.class); - FilterProvider filters = new SimpleFilterProvider().addFilter("PropertyFilter", SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldsForPublishedState)); - String writer = mapper1.writer(filters).writeValueAsString(watObj); - watObj = mapper1.readValue(writer, Map.class); - return watObj; - } - - private void postTelemetryEvent(Event event) { - outboundRequestHandlerService.fetchResultUsingPost(cbExtServerProperties.getTelemetryBaseUrl() + cbExtServerProperties.getTelemetryEndpoint(), - event); - } - - private Event getTelemetryEvent(Map watObject) { - HashMap eData = new HashMap<>(); - eData.put("state", watObject.get("status")); - eData.put("props", WorkAllocationConstants.PROPS); - HashMap cbObject = new HashMap<>(); - cbObject.put("id", watObject.get("id")); - cbObject.put("type", WorkAllocationConstants.TYPE); - cbObject.put("ver", String.valueOf(1.0)); - cbObject.put("name", watObject.get("name")); - cbObject.put("org", watObject.get("deptName")); - eData.put("cb_object", cbObject); - HashMap data = new HashMap<>(); - data.put("data", watObject); - eData.put("cb_data", data); - Event event = new Event(); - Actor actor = new Actor(); - actor.setId((String) watObject.get("id")); - actor.setType(WorkAllocationConstants.USER_CONST); - event.setActor(actor); - event.setEid(WorkAllocationConstants.EID); - event.setEdata(eData); - event.setVer(WorkAllocationConstants.VERSION); - event.setEts((Long) watObject.get("updatedAt")); - event.setMid(WorkAllocationConstants.CB_NAME + "." + UUID.randomUUID()); - Context context = new Context(); - context.setChannel((String) watObject.get("deptId")); - context.setEnv(WorkAllocationConstants.WAT_NAME); - Pdata pdata = new Pdata(); - pdata.setId(cbExtServerProperties.getWatTelemetryEnv()); - pdata.setPid(WorkAllocationConstants.MDO_NAME_CONST); - pdata.setVer(WorkAllocationConstants.VERSION_TYPE); - context.setPdata(pdata); - event.setContext(context); - ObjectData objectData = new ObjectData(); - objectData.setId((String) watObject.get("id")); - objectData.setType(WorkAllocationConstants.WORK_ORDER_ID_CONST); - event.setObject(objectData); -// event.setType(WorkAllocationConstants.EVENTS_NAME); - return event; - } - - public void updateUserWorkOrderMappings(Map workOrderMap, List workAllocationDTOV2List) { - try { - String workOrderId = (String) workOrderMap.get("id"); - String status = (String) workOrderMap.get("status"); - if (!CollectionUtils.isEmpty(workAllocationDTOV2List) && !StringUtils.isEmpty(status)) { - List userWorkAllocationMappings = new ArrayList<>(); - workAllocationDTOV2List.forEach(workAllocationDTOV2 -> { - if (!StringUtils.isEmpty(workAllocationDTOV2.getUserId()) && !StringUtils.isEmpty(workAllocationDTOV2.getId())) { - UserWorkAllocationMapping userWorkAllocationMapping = new UserWorkAllocationMapping(workAllocationDTOV2.getUserId(), workAllocationDTOV2.getId(), workOrderId, status); - userWorkAllocationMappings.add(userWorkAllocationMapping); - } - }); - userWorkAllocationMappingRepo.saveAll(userWorkAllocationMappings); - } - } catch (Exception ex) { - logger.error(ex); - } - } - -} diff --git a/src/main/java/org/sunbird/workallocation/util/WorkAllocationConstants.java b/src/main/java/org/sunbird/workallocation/util/WorkAllocationConstants.java index 86d7131a4..caff36903 100644 --- a/src/main/java/org/sunbird/workallocation/util/WorkAllocationConstants.java +++ b/src/main/java/org/sunbird/workallocation/util/WorkAllocationConstants.java @@ -1,6 +1,5 @@ package org.sunbird.workallocation.util; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -16,33 +15,4 @@ public class WorkAllocationConstants { .unmodifiableList(Arrays.asList(DRAFT_STATUS, PUBLISHED_STATUS, ARCHIVED_STATUS)); public static final String ADD = "add"; public static final String UPDATE = "update"; - - //WAT telemetry const - - public static final String AUDIT_CONST = "AUDIT"; - - public static final String USER_CONST = "User"; - - public static final String VERSION = "3.0"; - - public static final String WAT_NAME = "WAT"; - - public static final String EVENTS_NAME = "events"; - - public static final String WORK_ORDER_ID_CONST = "WorkOrder"; - - public static final String MDO_NAME_CONST = "mdo"; - - public static final String VERSION_TYPE = "1.0"; - - public static final String EID = "CB_AUDIT"; - - public static final String CB_NAME = "CB"; - - - public static final String TYPE = "WorkOrder"; - - public static List PROPS = Collections.unmodifiableList(Arrays.asList("WAT")); - - } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 38bfcd3c1..ef1564bcd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -59,8 +59,6 @@ workorder.index.type=_doc #Kafka Topics kafka.topics.org.creation=orgCreation kafka.topics.userrole.audit=userRoleAuditTopic -kafka.topics.wat.telemetry.event=watTelemetryTopic -kafka.topics.parent.telemetry.event=dev.telemetry.raw #Kafka Server spring.kafka.bootstrap.servers=localhost:9092 @@ -105,6 +103,3 @@ pdf.draft.template.name=workallocationdraft pdf.published.template.name=workallocationpublished content.default.channelId=0131397178949058560 content.default.orgId=igot-karmayogi -sunbird.telemetry.base.url=http://telemetry-service:9001/ -sunbird.telemetry.endpoint=v1/telemetry -wat.telemetry.env=dev.mdo.portal \ No newline at end of file