Skip to content

Fix crash en cas de nom de dossier incorrect dans specs #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexisszmundy merged 3 commits into from
Mar 19, 2025
Merged

Fix crash en cas de nom de dossier incorrect dans specs #183

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcdfd30
fix: crash when unknown mode spec folder fix
alexisszmundy Mar 19, 2025
1ecd681
fix: Log spam with long responses
alexisszmundy Mar 19, 2025
d325142
refactor: Removed response body in logs
alexisszmundy Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/main/java/fr/insee/genesis/controller/utils/ControllerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Collections;
import java.util.List;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand All @@ -12,6 +13,7 @@
import fr.insee.genesis.infrastructure.utils.FileUtils;

@Component
@Slf4j
public class ControllerUtils {

private final FileUtils fileUtils;
Expand All @@ -30,11 +32,17 @@ public List<Mode> getModesList(String campaign, Mode modeSpecified) throws Genes
}
List<Mode> modes = new ArrayList<>();
String specFolder = fileUtils.getSpecFolder(campaign);
List<String> specFolders = fileUtils.listFolders(specFolder);
if (specFolders.isEmpty()) {
List<String> modeSpecFolders = fileUtils.listFolders(specFolder);
if (modeSpecFolders.isEmpty()) {
throw new GenesisException(404, "No specification folder found " + specFolder);
}
specFolders.forEach(modeLabel -> modes.add(Mode.getEnumFromModeName(modeLabel)));
for(String modeSpecFolder : modeSpecFolders){
if(Mode.getEnumFromModeName(modeSpecFolder) == null) {
log.warn("There is an invalid mode folder name in spec folder : {}", modeSpecFolder);
continue;
}
modes.add(Mode.getEnumFromModeName(modeSpecFolder));
}
if (modes.contains(Mode.F2F) && modes.contains(Mode.TEL)) {
throw new GenesisException(409, "Cannot treat simultaneously TEL and FAF modes");
}
Expand Down
Loading