From 73bd5701ad648bea55d9911b75d46fc794a0405c Mon Sep 17 00:00:00 2001
From: karthika <karthikag1810@gmail.com>
Date: Thu, 13 Jun 2024 17:53:30 +0530
Subject: [PATCH 1/3] Bug fix conan and debian

---
 src/LCT.PackageIdentifier/ConanProcessor.cs  | 4 ++--
 src/LCT.PackageIdentifier/DebianProcessor.cs | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs
index f57d4f3f..e05126d5 100644
--- a/src/LCT.PackageIdentifier/ConanProcessor.cs
+++ b/src/LCT.PackageIdentifier/ConanProcessor.cs
@@ -126,8 +126,8 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             foreach (var component in componentsForBOM)
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component);
-                string jfrogpackageName = $"{component.Name}-{component.Version}";
-                var hashes = aqlResultList.FirstOrDefault(x => x.Name == jfrogpackageName);
+                string jfrogpackageName = $"{component.Name}/{component.Version}";
+                var hashes = aqlResultList.FirstOrDefault(x => x.Path.Contains(jfrogpackageName, StringComparison.OrdinalIgnoreCase));            
                 Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName };
                 Component componentVal = component;
 
diff --git a/src/LCT.PackageIdentifier/DebianProcessor.cs b/src/LCT.PackageIdentifier/DebianProcessor.cs
index b23e1a68..388e3888 100644
--- a/src/LCT.PackageIdentifier/DebianProcessor.cs
+++ b/src/LCT.PackageIdentifier/DebianProcessor.cs
@@ -104,8 +104,10 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             foreach (var component in componentsForBOM)
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component, bomhelper);
-                string jfrogpackageName = $"{component.Name}-{component.Version}{ApiConstant.DebianExtension}";
-                var hashes = aqlResultList.FirstOrDefault(x => x.Name == jfrogpackageName);
+                string jfrogpackageName = $"{component.Name}_{component.Version}";
+                var hashes = aqlResultList.FirstOrDefault(x => x.Name.Contains(
+                    jfrogpackageName, StringComparison.OrdinalIgnoreCase));
+           
                 Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName };
                 Component componentVal = component;
 

From 44432dca3ce94fab492ce6cb2b020eb9dec4a83a Mon Sep 17 00:00:00 2001
From: karthika <karthikag1810@gmail.com>
Date: Fri, 14 Jun 2024 11:18:33 +0530
Subject: [PATCH 2/3] logs added

---
 src/LCT.PackageIdentifier/ConanProcessor.cs  | 1 +
 src/LCT.PackageIdentifier/DebianProcessor.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/LCT.PackageIdentifier/ConanProcessor.cs b/src/LCT.PackageIdentifier/ConanProcessor.cs
index e05126d5..97152911 100644
--- a/src/LCT.PackageIdentifier/ConanProcessor.cs
+++ b/src/LCT.PackageIdentifier/ConanProcessor.cs
@@ -127,6 +127,7 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component);
                 string jfrogpackageName = $"{component.Name}/{component.Version}";
+                Logger.Debug($"Repo Name for the package {jfrogpackageName} is {repoName}");
                 var hashes = aqlResultList.FirstOrDefault(x => x.Path.Contains(jfrogpackageName, StringComparison.OrdinalIgnoreCase));            
                 Property artifactoryrepo = new() { Name = Dataconstant.Cdx_ArtifactoryRepoUrl, Value = repoName };
                 Component componentVal = component;
diff --git a/src/LCT.PackageIdentifier/DebianProcessor.cs b/src/LCT.PackageIdentifier/DebianProcessor.cs
index 388e3888..199d8739 100644
--- a/src/LCT.PackageIdentifier/DebianProcessor.cs
+++ b/src/LCT.PackageIdentifier/DebianProcessor.cs
@@ -208,7 +208,7 @@ private static string GetArtifactoryRepoName(List<AqlResult> aqlResultList, Comp
                 jfrogcomponentName, StringComparison.OrdinalIgnoreCase));
 
             string repoName = CommonIdentiferHelper.GetRepodetailsFromPerticularOrder(aqlResults);
-
+            Logger.Debug($"Repo Name for the package {jfrogcomponentName} is {repoName}");
             string fullName = bomHelper.GetFullNameOfComponent(component);
             string fullNameVersion = $"{fullName}";
 

From 18c1f2a530cf2b96a610676837eba118811012c3 Mon Sep 17 00:00:00 2001
From: karthika <karthikag1810@gmail.com>
Date: Fri, 14 Jun 2024 11:20:17 +0530
Subject: [PATCH 3/3] logs added

---
 src/LCT.PackageIdentifier/DebianProcessor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/LCT.PackageIdentifier/DebianProcessor.cs b/src/LCT.PackageIdentifier/DebianProcessor.cs
index 199d8739..5f064391 100644
--- a/src/LCT.PackageIdentifier/DebianProcessor.cs
+++ b/src/LCT.PackageIdentifier/DebianProcessor.cs
@@ -105,6 +105,7 @@ public async Task<List<Component>> GetJfrogRepoDetailsOfAComponent(List<Componen
             {
                 string repoName = GetArtifactoryRepoName(aqlResultList, component, bomhelper);
                 string jfrogpackageName = $"{component.Name}_{component.Version}";
+                Logger.Debug($"Repo Name for the package {jfrogpackageName} is {repoName}");
                 var hashes = aqlResultList.FirstOrDefault(x => x.Name.Contains(
                     jfrogpackageName, StringComparison.OrdinalIgnoreCase));