From 0b789788da9db90d7b294955c5bd74ff19fe333c Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harshach@users.noreply.github.com>
Date: Tue, 1 Mar 2022 11:19:43 -0800
Subject: [PATCH] Fix #3051: Glossary-term suggest api has fqdn same as name
 (#3052)

---
 .../catalog/elasticsearch/ElasticSearchIndexDefinition.java    | 2 +-
 .../main/resources/elasticsearch/glossary_index_mapping.json   | 3 +++
 ingestion/src/metadata/ingestion/models/table_metadata.py      | 1 +
 ingestion/src/metadata/ingestion/sink/elasticsearch.py         | 3 +--
 .../src/metadata/ingestion/sink/elasticsearch_constants.py     | 3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
index 40cf067cc41..9aa39ddf07b 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
@@ -876,7 +876,7 @@ class GlossaryTermESIndex extends ElasticSearchIndex {
         .name(glossaryTerm.getName())
         .displayName(displayName)
         .description(description)
-        .fqdn(glossaryTerm.getName())
+        .fqdn(glossaryTerm.getFullyQualifiedName())
         .glossaryId(glossaryTerm.getGlossary().getId().toString())
         .glossaryName(glossaryTerm.getGlossary().getName())
         .lastUpdatedTimestamp(updatedTimestamp)
diff --git a/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json b/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json
index 7f64f7abf65..9e999248bc5 100644
--- a/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json
+++ b/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json
@@ -9,6 +9,9 @@
     "owner": {
       "type": "keyword"
     },
+    "fqdn": {
+      "type": "keyword"
+    },
     "last_updated_timestamp": {
       "type": "date",
       "format": "epoch_second"
diff --git a/ingestion/src/metadata/ingestion/models/table_metadata.py b/ingestion/src/metadata/ingestion/models/table_metadata.py
index 6c9664ff075..c4195ebe3fe 100644
--- a/ingestion/src/metadata/ingestion/models/table_metadata.py
+++ b/ingestion/src/metadata/ingestion/models/table_metadata.py
@@ -197,6 +197,7 @@ class GlossaryTermESDocument(BaseModel):
     entity_type: str = "glossaryTerm"
     name: str
     display_name: str
+    fqdn: str
     description: str
     glossary_name: str
     glossary_id: str
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch.py b/ingestion/src/metadata/ingestion/sink/elasticsearch.py
index 7391ea21a1e..a464fd148f6 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch.py
@@ -12,12 +12,10 @@
 import json
 import logging
 import ssl
-import time
 import traceback
 from datetime import datetime
 from typing import List, Optional
 
-from dateutil import parser
 from elasticsearch import Elasticsearch
 from elasticsearch.connection import create_ssl_context
 
@@ -578,6 +576,7 @@ class ElasticsearchSink(Sink[Entity]):
             deleted=glossary_term.deleted,
             name=glossary_term.name.__root__,
             display_name=glossary_term.displayName,
+            fqdn=glossary_term.fullyQualifiedName,
             description=glossary_term.description,
             glossary_id=str(glossary_term.glossary.id.__root__),
             glossary_name=glossary_term.glossary.name,
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py
index 24b8290c2c8..06ddf01c8da 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py
@@ -477,6 +477,9 @@ GLOSSARY_TERM_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
           "display_name": {
             "type": "text"
           },
+           "fqdn": {
+              "type": "keyword"
+            },
           "owner": {
             "type": "keyword"
           },