Merge pull request #92 from Agomik/master

Single-Layer Teams update
di-unipi-socc · May 7, 2024 · fcd9896 · fcd9896
2 parents 9f1ac7a + 26e9929
commit fcd9896
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/client/src/app/refactoring/refactorings/refactoring-factory.service.ts b/client/src/app/refactoring/refactorings/refactoring-factory.service.ts
@@ -169,7 +169,7 @@ export class RefactoringFactoryService {
 
     switch(refactoringName) {
       case REFACTORING_LIBRARY_NAMES.SPLIT_TEAMS_BY_MICROSERVICE:
-        return new SplitTeamsByMicroserviceRefactoring(this.gs.graph, smell);
+        break;//return new SplitTeamsByMicroserviceRefactoring(this.gs.graph, smell);
 
       case REFACTORING_LIBRARY_NAMES.SPLIT_TEAMS_BY_COUPLING:
         return new SplitTeamsByCouplingRefactoring(this.gs.graph, smell);

diff --git a/client/src/app/refactoring/smells/single-layer-teams.ts b/client/src/app/refactoring/smells/single-layer-teams.ts
@@ -13,6 +13,7 @@ export class SingleLayerTeamsSmellObject extends GroupSmell {
     getDescription(): string {
         let services = new Set<joint.shapes.microtosca.Service>();
         this.getLinkBasedCauses().forEach(link => { services.add(<joint.shapes.microtosca.Service>link.getSourceElement()); console.debug(`${(<joint.shapes.microtosca.Node> link.getSourceElement()).getName()} added`) });
-        return `Data related to ${Array.from(services).map((service) => service.getName()).join(", ")} is being managed by other teams.\n`;
+        return super.getGroup()?.getName() + " may be designed basing on technology layers.";
+        //return `Data related to ${Array.from(services).map((service) => service.getName()).join(", ")} is being managed by other teams.\n`;
     }
 }
diff --git a/client/src/app/refactoring/smells/smell-factory.service.ts b/client/src/app/refactoring/smells/smell-factory.service.ts
@@ -127,7 +127,7 @@ export class SmellFactoryService {
       let refactoringName = refactoringJson['name'];
       console.debug("Analysing refactoring", refactoringName);
       let refactoring: GroupRefactoring = <GroupRefactoring> this.refactoring.getRefactoring(refactoringName, smell);
-      smell.addRefactoring(refactoring);
+      if(refactoring) smell.addRefactoring(refactoring);
     });
     smell.addRefactoring(this.refactoring.getIgnoreRefactoring(group, smell));
 

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -15,9 +15,9 @@ idna==2.8
 itypes==1.1.0
 Jinja2==2.10.1
 MarkupSafe==1.1.1
-microfreshener-core==1.4.0
-#microfreshener-core @ git+https://github.com/di-unipi-socc/microFreshener-core.git@master
-#../../microFreshener-core
+microfreshener-core==1.5.0
+#../../microFreshener-core # Dev only
+#microfreshener-core @ git+https://github.com/di-unipi-socc/microFreshener-core.git@master # Dev only
 nested-lookup==0.2.19
 openapi-codec==1.3.2
 pbr==5.4.2