fix(importCDX): Resolve incorrect package/release count in import sum…

…mary Signed-off-by: sameed.ahmad <[email protected]>
toshiba · Apr 30, 2024 · 219792b · 219792b
1 parent 42ed65e
commit 219792b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java b/backend/src-common/src/main/java/org/eclipse/sw360/cyclonedx/CycloneDxBOMImporter.java
@@ -254,16 +254,17 @@ public RequestSummary importFromBOM(InputStream inputStream, AttachmentContent a
                                     componentsWithoutVcs.add(fullName);
 
                                     if (CommonUtils.isNotNullEmptyOrWhitespace(pkgAddSummary.getId())) {
-                                        project.addToPackageIds(pkgAddSummary.getId());
                                         pkg.setId(pkgAddSummary.getId());
                                         if (AddDocumentRequestStatus.DUPLICATE.equals(pkgAddSummary.getRequestStatus())) {
-                                            pkgReuseCount++;
+                                            if(!CommonUtils.nullToEmptySet(project.getPackageIds()).contains(pkgAddSummary.getId())){
+                                                pkgReuseCount++;
+                                            }
                                             Package dupPkg = packageDatabaseHandler.getPackageById(pkgAddSummary.getId());
                                             if (CommonUtils.isNotNullEmptyOrWhitespace(dupPkg.getReleaseId())) {
                                                 if (!CommonUtils.nullToEmptyMap(project.getReleaseIdToUsage()).containsKey(dupPkg.getReleaseId())) {
                                                     project.putToReleaseIdToUsage(dupPkg.getReleaseId(), getDefaultRelation());
+                                                    relReuseCount++;
                                                 }
-                                                relReuseCount++;
                                             }
                                         } else {
                                             pkgCreationCount++;
@@ -274,11 +275,11 @@ public RequestSummary importFromBOM(InputStream inputStream, AttachmentContent a
                                         duplicatePackages.add(fullName);
                                         continue;
                                     }
+                                    project.addToPackageIds(pkgAddSummary.getId());
                                 } catch (SW360Exception e) {
                                     log.error("An error occured while creating/adding package from SBOM: " + e.getMessage());
                                     continue;
                                 }
-
                             }
                         }
                         RequestStatus updateStatus = projectDatabaseHandler.updateProject(project, user);
@@ -651,7 +652,9 @@ private Map<String, String> importAllComponentsAsPackages(Map<String, List<org.c
                                     dupPkg.setReleaseId(release.getId());
                                     packageDatabaseHandler.updatePackage(dupPkg, user);
                                 }
-                                pkgReuseCount++;
+                                if(!CommonUtils.nullToEmptySet(project.getPackageIds()).contains(pkg.getId())){
+                                    pkgReuseCount++;
+                                }
                             } else {
                                 pkgCreationCount++;
                             }