From ec59649e7f76f05ced163585e0f7595a15164de0 Mon Sep 17 00:00:00 2001
From: drautureau <drautureau@gmail.com>
Date: Tue, 16 Jun 2015 10:04:21 +0200
Subject: [PATCH] Fixes #36 - Disable check for SNAPSHOT when checking for
 promotion

---
 .../grapes/server/core/ModuleHandler.java     | 50 +++++++++----------
 .../webapp/views/PromotionReportView.java     |  7 ---
 .../webapp/views/PromotionReportView.ftl      |  6 +--
 3 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/server/src/main/java/org/axway/grapes/server/core/ModuleHandler.java b/server/src/main/java/org/axway/grapes/server/core/ModuleHandler.java
index 663a9352..81257c20 100644
--- a/server/src/main/java/org/axway/grapes/server/core/ModuleHandler.java
+++ b/server/src/main/java/org/axway/grapes/server/core/ModuleHandler.java
@@ -152,36 +152,34 @@ public PromotionReportView getPromotionReport(final String moduleId) {
         final PromotionReportView report = new PromotionReportView();
         report.setRootModule(DataModelFactory.createModule(module.getName(), module.getVersion()));
 
-        if(!report.isSnapshot()) {
-            // filters initialization
-            final FiltersHolder filters = new FiltersHolder();
-            filters.addFilter(new PromotedFilter(false));
-            filters.addFilter(new CorporateFilter(organization));
-
-            // Checks if each dependency module has been promoted
-            for (Dependency dependency : depHandler.getModuleDependencies(moduleId, filters)) {
-                final DbModule depModule = repositoryHandler.getRootModuleOf(dependency.getTarget().getGavc());
-                if (depModule != null && !depModule.getId().equals(moduleId)) {
-                    if (!depModule.isPromoted()) {
-                        report.addUnPromotedDependency(depModule.getId());
-                        report.addDependencyPromotionReport(depModule.getId(), getPromotionReport(depModule.getId()));
-                    }
+        // filters initialization
+        final FiltersHolder filters = new FiltersHolder();
+        filters.addFilter(new PromotedFilter(false));
+        filters.addFilter(new CorporateFilter(organization));
+
+        // Checks if each dependency module has been promoted
+        for (Dependency dependency : depHandler.getModuleDependencies(moduleId, filters)) {
+            final DbModule depModule = repositoryHandler.getRootModuleOf(dependency.getTarget().getGavc());
+            if (depModule != null && !depModule.getId().equals(moduleId)) {
+                if (!depModule.isPromoted()) {
+                    report.addUnPromotedDependency(depModule.getId());
+                    report.addDependencyPromotionReport(depModule.getId(), getPromotionReport(depModule.getId()));
                 }
             }
+        }
 
-            // Checks if the module has dependencies that shouldn't be used
-            final List<String> treatedArtifacts = new ArrayList<String>();
-            for (DbDependency dependency : DataUtils.getAllDbDependencies(module)) {
-                final DbArtifact artifactDep = repositoryHandler.getArtifact(dependency.getTarget());
+        // Checks if the module has dependencies that shouldn't be used
+        final List<String> treatedArtifacts = new ArrayList<String>();
+        for (DbDependency dependency : DataUtils.getAllDbDependencies(module)) {
+            final DbArtifact artifactDep = repositoryHandler.getArtifact(dependency.getTarget());
 
-                if (artifactDep == null) {
-                    // handle the case of a corporate artifact which is not available in the repository
-                    continue;
-                }
-                if (artifactDep.getDoNotUse() && !treatedArtifacts.contains(artifactDep.getGavc())) {
-                    report.addDoNotUseArtifact(modelMapper.getArtifact(artifactDep));
-                    treatedArtifacts.add(artifactDep.getGavc());
-                }
+            if (artifactDep == null) {
+                // handle the case of a corporate artifact which is not available in the repository
+                continue;
+            }
+            if (artifactDep.getDoNotUse() && !treatedArtifacts.contains(artifactDep.getGavc())) {
+                report.addDoNotUseArtifact(modelMapper.getArtifact(artifactDep));
+                treatedArtifacts.add(artifactDep.getGavc());
             }
         }
 
diff --git a/server/src/main/java/org/axway/grapes/server/webapp/views/PromotionReportView.java b/server/src/main/java/org/axway/grapes/server/webapp/views/PromotionReportView.java
index 1ea32455..d03c3653 100644
--- a/server/src/main/java/org/axway/grapes/server/webapp/views/PromotionReportView.java
+++ b/server/src/main/java/org/axway/grapes/server/webapp/views/PromotionReportView.java
@@ -81,17 +81,10 @@ public List<PromotionReportView> getReportsWithDoNotUseArtifacts() {
     }
 
     public Boolean canBePromoted() {
-        if(isSnapshot()){
-            return false;
-        }
         return unPromotedDependencies.isEmpty() &&
                 doNotUseArtifacts.isEmpty();
     }
 
-    public boolean isSnapshot() {
-        return getRootModule().getVersion().contains("SNAPSHOT");
-    }
-
     public Set<String> getMisMatchModules(){
         return mismatchVersions.keySet();
     }
diff --git a/server/src/main/resources/org/axway/grapes/server/webapp/views/PromotionReportView.ftl b/server/src/main/resources/org/axway/grapes/server/webapp/views/PromotionReportView.ftl
index 54149de0..4bc86394 100644
--- a/server/src/main/resources/org/axway/grapes/server/webapp/views/PromotionReportView.ftl
+++ b/server/src/main/resources/org/axway/grapes/server/webapp/views/PromotionReportView.ftl
@@ -84,11 +84,7 @@
                         </#if>
 
                     <#else>
-                        <#if isSnapshot()>
-                            <div id="promotion_ko"><strong>Snapshot module cannot be promoted!!!</strong><br/></div>
-                        <#else>
-                            <div id="promotion_ko"><strong>The module cannot be promoted!!!</strong><br/></div>
-                        </#if>
+                        <div id="promotion_ko"><strong>The module cannot be promoted!!!</strong><br/></div>
 
                         <#if getMisMatchModules()?has_content >
                             <h3>Warning: some dependencies occurs in different versions</h3>