diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d37de842847fa28b9ed9e6dc728054cb92600c8f..8facd4cd26ed4f122d39fcf6f5ccba5dfccd2cf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,19 +3,22 @@ include:
ref: master
file: gitlab/gitlab-ci-java-template.yml
-build-v1:
+build-docker:
image: maven:3.8.3-adoptopenjdk-11
stage: build
- before_script:
- - cd legacy-submission-code-server
+ needs: ["build"]
+ tags:
+ - caascad
script:
- - mvn -B -s .mvn/settings-ci.xml $CI_MAVEN_OPTS deploy
- artifacts:
- paths:
- - "**/target/"
- reports:
- junit:
- - "**/target/*-reports/TEST-*.xml"
+ # Build image and push to container registry
+ - mvn -B spring-boot:build-image
+ -Dmaven.test.skip=true
+ -Dspring-boot.build-image.imageName=$K8S_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+ -Dspring-boot.build-image.publish=true
+ -Dspring-boot.build-image.publishRegistry.username=$K8S_REGISTRY_USER
+ -Dspring-boot.build-image.publishRegistry.password=$K8S_REGISTRY_PASSWORD
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "develop"'
deploy-int:
stage: deploy
@@ -27,3 +30,35 @@ deploy-int:
strategy: depend
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
+
+deployment:
+ image:
+ name: alpine
+ stage: deploy
+ tags:
+ - caascad
+ variables:
+ KUSTOMIZE_VER: "4.5.7"
+ ENVIRONMENT: "int"
+ before_script:
+ - apk add --no-cache openssh-client-default git
+ - wget -O - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VER}/kustomize_v${KUSTOMIZE_VER}_linux_amd64.tar.gz | tar xz -C /usr/local/bin
+ - eval $(ssh-agent -s)
+ - echo "$GIT_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - >/dev/null
+ - mkdir -p ~/.ssh
+ - cp $SSH_KNOWN_HOSTS ~/.ssh/known_hosts
+ - chmod 700 ~/.ssh
+ - chmod 600 ~/.ssh/known_hosts
+ script:
+ - git config --global user.name "$CI_COMMIT_SHORT_SHA"
+ - git config --global user.email "$CI_COMMIT_SHORT_SHA"
+ - git clone --branch master git@${GIT_REPOSITORY_URL} /tmp/submission-app
+ - cd ./src/k8s
+ - kustomize edit set image submission-server=$K8S_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+ - kustomize build . > /tmp/submission-app/deployment-$ENVIRONMENT.yml
+ - cd /tmp/submission-app
+ - git add ./deployment-$ENVIRONMENT.yml
+ - git commit -m "$ENVIRONMENT $CI_COMMIT_SHORT_SHA"
+ - git push origin master
+ rules:
+ - if: $CI_COMMIT_BRANCH == 'develop'
diff --git a/legacy-submission-code-server/.etc/eclipse-formatter-java.xml b/legacy-submission-code-server/.etc/eclipse-formatter-java.xml
deleted file mode 100644
index c3d2416724e49007cd4cd5400bc89031f4350e7c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.etc/eclipse-formatter-java.xml
+++ /dev/null
@@ -1,1542 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<profiles version="20">
- <profile kind="CodeFormatterProfile" name="tac" version="20">
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indentation.size"
- value="4"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.align_with_spaces"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.continuation_indentation"
- value="2"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_after_package"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.indent_root_tags"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.enabling_tag"
- value="@formatter:on"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_record_components"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_block"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.text_block_indentation"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.align_type_members_on_columns"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_assignment"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_module_statements"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines"
- value="2147483647"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try"
- value="80"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_source_code"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_field"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_method"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_html"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_compact_if"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_empty_lines"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_label"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.indent_tag_description"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor"
- value="next_line_on_wrap"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.join_lines_in_comments"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation"
- value="separate_lines_if_wrapped"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_after_imports"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.disabling_tag"
- value="@formatter:off"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants"
- value="17"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_imports"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.line_length"
- value="80"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.use_on_off_tags"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.compact_else_if"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_line_comments"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression"
- value="80"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.join_wrapped_lines"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.tabulation.size"
- value="4"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer"
- value="2"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_switch"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line"
- value="one_line_if_empty"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method"
- value="49"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type"
- value="1"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.format_block_comments"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration"
- value="16"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration"
- value="common_lines"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line"
- value="one_line_never"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration"
- value="end_of_line"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.blank_lines_before_package"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
- value="true"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional"
- value="insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description"
- value="false"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block"
- value="0"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.tabulation.char"
- value="space"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation"
- value="true"
- />
- <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120" />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
- value="do not insert"
- />
- <setting
- id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch"
- value="insert"
- />
- </profile>
-</profiles>
diff --git a/legacy-submission-code-server/.etc/eclipse.importorder b/legacy-submission-code-server/.etc/eclipse.importorder
deleted file mode 100644
index 08b2327bc01de340c8913e40d4042ad3f38de600..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.etc/eclipse.importorder
+++ /dev/null
@@ -1,6 +0,0 @@
-#Organize Import Order
-#Tue Jun 08 16:57:09 CEST 2021
-0=
-1=javax
-2=java
-3=\#
diff --git a/legacy-submission-code-server/.etc/git-hooks/pre-commit b/legacy-submission-code-server/.etc/git-hooks/pre-commit
deleted file mode 100755
index 288a3d6a8e58e03a14a232b983c8fcf8a59590ce..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.etc/git-hooks/pre-commit
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# check prettier is installed
-if ! command -v prettier &> /dev/null ; then
- echo '🙠Please, install prettier so we can check yaml/xml/md/json files'
- echo '📠`npm install -g prettier @prettier/plugin-xml`'
- echo ''
- echo 'Have you read this? â˜'
- echo ''
-fi
-
-FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
-[ -z "$FILES" ] && exit 0
-
-# Prettify all selected files
-echo "$FILES" | xargs prettier --ignore-unknown --write
-
-# Spotlessify java source files
-mvn spotless:apply
-
-# Add back the modified/prettified files to staging
-echo "$FILES" | xargs git add
-
-exit 0
-
diff --git a/legacy-submission-code-server/.etc/git-hooks/pre-push b/legacy-submission-code-server/.etc/git-hooks/pre-push
deleted file mode 100755
index 3a8349aaf27ed56cf44a3cc8f20a20f6819c795f..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.etc/git-hooks/pre-push
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-# <local ref> <local oid> <remote ref> <remote oid>
-
-# This hook prevent push of commits where the author or commiter isn't pseudonymised
-
-ALLOW_LIST="
-Ananas Orange <12847-x-AOrang@users.noreply.gitlab.inria.fr>
-Bergamote Orange <13178-x-BOrang@users.noreply.gitlab.inria.fr>
-Combava Orange <13340-x-CoOrang@users.noreply.gitlab.inria.fr>
-Framboise Orange <12541-x-FrOrang@users.noreply.gitlab.inria.fr>
-Jujube Orange <13631-x-JOrang@users.noreply.gitlab.inria.fr>
-Kiwi Orange <13476-x-KOrang@users.noreply.gitlab.inria.fr>
-Cacaoyer Tac <99999-Cacaoyer.tac@users.noreply.gitlab.inria.fr>
-Cafeier Tac <99999-Cafeier.tac@users.noreply.gitlab.inria.fr>
-Caladium Tac <99999-Caladium.tac@users.noreply.gitlab.inria.fr>
-Calamagrostis Tac <99999-Calamagrostis.tac@users.noreply.gitlab.inria.fr>
-Calament Tac <99999-Calament.tac@users.noreply.gitlab.inria.fr>
-Calamondin Tac <99999-Calamondin.tac@users.noreply.gitlab.inria.fr>
-Calanthe Tac <99999-Calanthe.tac@users.noreply.gitlab.inria.fr>
-Calibrachoa Tac <99999-Calibrachoa.tac@users.noreply.gitlab.inria.fr>
-Jenkins Tac <99999-Jenkins.tac@users.noreply.gitlab.inria.fr>
-Figue Orange <12540-x-FOrang@users.noreply.gitlab.inria.fr>
-Jamalac Orange <14492-x-JaOrang@users.noreply.gitlab.inria.fr>
-Renovate Bot <tac-renovate-bot-request@inria.fr>
-Sapotille Orange <15519-x-SaOrang@users.noreply.gitlab.inria.fr>
-"
-
-remote="$1"
-url="$2"
-
-zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
-
-while read local_ref local_oid remote_ref remote_oid
-do
- if test "$local_oid" = "$zero"
- then
- # Nothing to to on branch deletion
- :
- else
- if test "$remote_oid" = "$zero"
- then
- # New branch, examine all commits
- range="5bb417c3..$local_oid"
- else
- # Update to existing branch, examine new commits
- range="$remote_oid..$local_oid"
- fi
- echo -n "Checking the author/commiter is in the allowed list ($0) "
- for format in '%an <%ae>' '%cn <%ce>'
- do
- while read -r user
- do
- allowed_user=$(grep "^$user$" <<<$ALLOW_LIST)
- if test ! -n "$allowed_user"
- then
- echo "âŒ"
- echo >&2 "'$user' is not allowed in $local_ref, not pushing"
- exit 1
- fi
- done <<<$(git log --format="format:$format" $range | sort | uniq)
- done
- echo "✅"
- fi
-done
-
-exit 0
diff --git a/legacy-submission-code-server/.mvn/extensions.xml b/legacy-submission-code-server/.mvn/extensions.xml
deleted file mode 100644
index b29a395ac6983f3d20e74c705aa40244620e584b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.mvn/extensions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<extensions
- xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd"
->
- <extension>
- <groupId>me.qoomon</groupId>
- <artifactId>maven-git-versioning-extension</artifactId>
- <version>6.4.4</version>
- </extension>
-</extensions>
diff --git a/legacy-submission-code-server/.mvn/jvm.config b/legacy-submission-code-server/.mvn/jvm.config
deleted file mode 100644
index 66862e17851fff9a31932d23f6a3ccf7a9a5ea88..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xms128m -Xmx256m -Djava.awt.headless=true
diff --git a/legacy-submission-code-server/.mvn/maven-git-versioning-extension.xml b/legacy-submission-code-server/.mvn/maven-git-versioning-extension.xml
deleted file mode 100644
index 5595112217c093c726c4ce8659f86dce030ab602..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.mvn/maven-git-versioning-extension.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<configuration
- xmlns="https://github.com/qoomon/maven-git-versioning-extension"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-6.4.0.xsd"
->
- <disable>true</disable>
- <preferTags>true</preferTags>
- <tag>
- <pattern>(.+)</pattern>
- <versionFormat>${tag}</versionFormat>
- </tag>
- <branch>
- <pattern>(develop|master)</pattern>
- <versionFormat>${1}-SNAPSHOT</versionFormat>
- </branch>
- <branch>
- <pattern>(feature|hotfix)/(.+)</pattern>
- <versionFormat>${2.slug}-SNAPSHOT</versionFormat>
- </branch>
- <branch>
- <pattern>(.+)</pattern>
- <versionFormat>${version}</versionFormat>
- </branch>
-</configuration>
diff --git a/legacy-submission-code-server/.mvn/settings-ci.xml b/legacy-submission-code-server/.mvn/settings-ci.xml
deleted file mode 100644
index e84b9319099900fdfc0065ab1da062818f7a9ca9..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/.mvn/settings-ci.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<settings>
- <servers>
- <server>
- <id>gitlab-maven</id>
- <configuration>
- <httpHeaders>
- <property>
- <name>Job-Token</name>
- <value>${env.CI_JOB_TOKEN}</value>
- </property>
- </httpHeaders>
- </configuration>
- </server>
- </servers>
-</settings>
diff --git a/legacy-submission-code-server/AUTHORS.md b/legacy-submission-code-server/AUTHORS.md
deleted file mode 100644
index b0dc067b62d5906a58d73c6602b7e784f7629992..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/AUTHORS.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Ce composant à été écrit par
-
-- Groupe Capgemini (Capgemini, Idean, Sogeti)
-
-Les personnes suivantes ont contribué
-
-- Pour Groupe Capgemini (Capgemini, Idean, Sogeti)
- - redford.stopcovid@idean.com
- - palmer.stopcovid@capgemini.com
- - marley.stopcovid@capgemini.com
- - stanley.stopcovid@capgemini.com
- - begnini.stopcovid@capgemini.com
- - deniro.stopcovid@capgemini.com
diff --git a/legacy-submission-code-server/CHANGELOG-UNRELEASED.md b/legacy-submission-code-server/CHANGELOG-UNRELEASED.md
deleted file mode 100644
index ba5540f7b7f560ab7f3f1bd6eaf1994a18d41414..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/CHANGELOG-UNRELEASED.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Unreleased Changelog
-
-Les changements ne faisant pas encore partie d'une release doivent être
-consignés dans ce fichier.
-
-## [Unreleased]
diff --git a/legacy-submission-code-server/CHANGELOG.md b/legacy-submission-code-server/CHANGELOG.md
deleted file mode 100644
index 8be5302df309a8007638b4ba79e71350f3d55164..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Changelog
-
-Toute modification liée au code exécuté en production sera documenté dans ce fichier.
-
-Le présent format s'appuie sur [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
-
-Ce fichier ne doit pas être mis à jour directement, il faut utiliser le fichier
-`CHANGELOG-UNRELEASED.md`.
-Par la suite les changements de `CHANGELOG-UNRELEASED.md` sont reversé dans ce
-fichier lors de la création d'une nouvelle release.
-
-##
diff --git a/legacy-submission-code-server/LICENSE.md b/legacy-submission-code-server/LICENSE.md
deleted file mode 100644
index 5c672e29259995d6cea762e40eec5ffb52172895..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/LICENSE.md
+++ /dev/null
@@ -1,195 +0,0 @@
-# Mozilla Public License
-
-# Version 2.0
-
-# 1. Definitions
-
-### 1.1. “Contributorâ€
-
-means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
-
-### 1.2. “Contributor Versionâ€
-
-means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.
-
-### 1.3. “Contributionâ€
-
-means Covered Software of a particular Contributor.
-
-### 1.4. “Covered Softwareâ€
-
-means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
-
-### 1.5. “Incompatible With Secondary Licensesâ€
-
-means
-
- a. that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
-
- b. that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
-
-### 1.6. “Executable Formâ€
-
-means any form of the work other than Source Code Form.
-
-### 1.7. “Larger Workâ€
-
-means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
-
-### 1.8. “Licenseâ€
-
-means this document.
-
-### 1.9. “Licensableâ€
-
-means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
-
-### 1.10. “Modificationsâ€
-
-means any of the following:
-
- a. any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
-
- b. any new file in Source Code Form that contains any Covered Software.
-
-### 1.11. “Patent Claims†of a Contributor
-
-means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
-
-### 1.12. “Secondary Licenseâ€
-
-means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
-
-### 1.13. “Source Code Formâ€
-
-means the form of the work preferred for making modifications.
-
-### 1.14. “You†(or “Yourâ€)
-
-means an individual or a legal entity exercising rights under this License. For legal entities, “You†includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control†means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-# 2. License Grants and Conditions
-
-## 2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- a. under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
-
- b. under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
-
-## 2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
-
-## 2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
-
- a. for any code that a Contributor has removed from Covered Software; or
-
- b. for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
-
- c. under Patent Claims infringed by Covered Software in the absence of its Contributions.
-
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
-
-## 2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
-
-## 2.5. Representation
-
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
-
-## 2.6. Fair Use
-
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
-
-## 2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
-
-# 3. Responsibilities
-
-## 3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.
-
-## 3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
- a. such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
-
- b. You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.
-
-### 3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
-
-## 3.4. Notices
-
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
-
-## 3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
-
-# 4. Inability to Comply Due to Statute or Regulation
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-
-# 5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
-
-# 6. Disclaimer of Warranty
-
-_Covered Software is provided under this License on an “as is†basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer._
-
-# 7. Limitation of Liability
-
-_Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You._
-
-# 8. Litigation
-
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.
-
-# 9. Miscellaneous
-
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
-
-# 10. Versions of the License
-
-## 10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
-
-## 10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
-
-## 10.3. Modified Versions
-
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
-
-## 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
-
-# Exhibit A - Source Code Form License Notice
-
-> This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-# Exhibit B - “Incompatible With Secondary Licenses†Notice
-
-> This Source Code Form is “Incompatible With Secondary Licensesâ€, as defined by the Mozilla Public License, v. 2.0.
diff --git a/legacy-submission-code-server/README.md b/legacy-submission-code-server/README.md
deleted file mode 100644
index 9cae565805dc963f94204cb1336b9cf0876bfb31..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Submission Code Server
-
-Ce projet gitlab.inria.fr est un des composants de la solution plus globale [StopCovid](https://gitlab.inria.fr/stopcovid19/accueil/-/blob/master/README.md).
-
-Ce composant propose les services suivants :
-
-- génération de codes courts et longs : pour les professionnels de santé (laboratoires, médecins...)
-- vérification et consommation de codes par la partie de la plateforme StopCovid
-
-## Quickstart
-
-Démarrer une base postgres en local :
-
- docker run -d --name db-scs -p 5432:5432 -e POSTGRES_PASSWORD=1234 -e POSTGRES_DB=dev-submission-code-server-schema postgres:13
-
-L'application peut être démarrée depuis l'IDE.
diff --git a/legacy-submission-code-server/USAGE.md b/legacy-submission-code-server/USAGE.md
deleted file mode 100644
index fb3f94dfe7667e956ea513314b2013b758056995..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/USAGE.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Description du fonctionnement de l'outil de génération des codes longs
-
-## Cinématique
-
-Pour générer 300 000 codes un opérateur réalisera l'opération suivante :
-Il ne peut générer plus de 40 000 codes d'un coup (limitation due au code).
-Il va donc découper ces appels et réaliser (7 _ 40 000) + (1 _ 20 000) = 300 000.
-
-Les appels se font via une requête POST sur la route `/api/v1/back-office/codes/generate/request`.
-En passant en paramètre les informations suivantes dans le Body :
-
-```
-{
- "from":"2021-07-01T00:00:00.000Z",
- "to":"2021-07-09T23:59:59.000Z",
- "dailyAmount":40000
-}
-```
-
-from : correspond à la date du début de validité des codes.
-to : correspond à la fin de validité des codes et doit être postérieure à la date from.
-
-L'opérateur effectuera donc 7 appels avec le paramètre dailyAmount à 40000 et un appel avec le paramètre dailyAmount à 20000.
-Tous les appels auront les mêmes paramères from et to qui correspondent au début et à la fin de validité des codes.
-
-Chaque appel donne lieu à la création de deux fichiers (voir § ci-dessous).
-
-Une exécution du script est finie quand ce message s'affiche dans les logs.
-
-```
-INFO fr.gouv.stopc.submission.code.server.ws.service.impl.FileServiceImpl [task-{}] It took {} seconds to generate {} codes
-```
-
-## Fichiers de sortie
-
-### Fichiers
-
-Deux fichiers par appels sont générés :
-
-- Un fichier `.tgz` contenant la liste des codes
-- Un fichier de contrôle `.sha256` (somme de contrôle) permettant de contrôler l'intégrité du fichier .tgz
-
-### Nomenclature
-
-Les noms des fichiers sont générés de la manière suivante :
-Pour le premier fichier, le nom est composé de la date de génération au format `yyyyMMddHHmmss` (en zone "Europe/Paris") concaténé avec `%s_stopcovid_qrcode_batch.tgz` ce qui donne pour mon exemple
-`20210819092922_stopcovid_qrcode_batch.tgz`
-La nomenclature est la même pour le second fichier seule l'extention diffère `.sha256`.
-`20210819092922_stopcovid_qrcode_batch.sha256`
-
-### Contenu
-
-#### Premier fichier (yyyyMMddHHmmss_stopcovid_qrcode_batch.tgz)
-
-Le fichier contenant la liste des codes est une archive `tgz` contenant une seconde archive `tar` contenant un `csv` qui est la liste des codes.
-La nomenclature du nom du fichier csv est la suivante `(séquence) + AAMMdd.csv ==> 25210825.csv`
-La séquence correspond à un incrément lié à un triptyque temporel (AAMMdd) pour éviter de générer deux fichiers de même nom.
-Voici un exemple avec un seul code généré
-
-| code_pour_qr | code_brut | validite_debut | validite_fin |
-| ------------- | :-----------: | -----------------------: | -----------------------: |
-| ...41 char... | ...36 char... | 2021-08-25T22:00:00.000Z | 2021-09-02T21:59:00.000Z |
-
-Le séparateur de ce csv est une virgule `,` et il y a un retour chariot à la fin du fichier (LF).
-
-#### Second fichier (yyyyMMddHHmmss_stopcovid_qrcode_batch.sha256)
-
-Ce fichier est un fichier plat contenant une empreinte de 65 caractères du fichier tgz.
-Ce fichier ne contient pas de retour chariot à la fin du fichier.
-
-## Gestion des différents cas fonctionnels (changement du nb de code, reprise/rejeux …)
-
-### Changement du nombre de codes
-
-S'il faut générer plus ou moins de codes, il faut réaliser plus ou moins de requêtes en réalisant le calcul suivant.
-
-Exemple :
-Je veux générer `500 000` codes :
-`500 000` / 40 000 = 12,5 ==> 12 appels de 40 000 codes
-`500 000` mod 40 000 = 20 000 ==> 1 appel de 20 000 codes
-
-### Reprise / Rejeux
-
-Dans le cas où un problème serait survenu, il faut invalider les codes générés ou lister les codes non sauvegardés en base.
-Pour ce faire, il faut réaliser des requêtes en base de données ou sur le serveur sftp.
-
-```
-# Utile pour repérer s'il n'y a pas de désynchro entre l'indice connu et le dernier fichier envoyé
-select * from seq_fichier where jour = '10' and mois = '08' and annee = '2021';
-
-# Compter le nombre de codes ajoutés (en tenant compte de l'UTC)
-select count(*) from submission_code where date_available between '2021-08-09 22:00:00' and '2021-08-17 22:00:00';
-
-# Lancer le script python de vérification des codes dans la base de données
-python verify-codes.py [dbName] [dbHost] [dbPort] [dbUser] [qrcodes-file-path]
-```
-
-S'il manque des codes, il faut regénérer le nombre de code souhaité.
diff --git a/legacy-submission-code-server/pom.xml b/legacy-submission-code-server/pom.xml
deleted file mode 100644
index caf431c9a026546e04f85890abdf7b89dd775eb7..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/pom.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.4</version>
- <relativePath />
- </parent>
-
- <groupId>fr.gouv.stopc</groupId>
- <artifactId>legacy-submission-code-server</artifactId>
- <name>legacy-submission-code-server</name>
- <packaging>jar</packaging>
- <version>0-SNAPSHOT</version>
- <description>Submission Server</description>
-
- <properties>
- <java.version>11</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>
- UTF-8
- </project.reporting.outputEncoding>
- <org.testcontainers>1.16.0</org.testcontainers>
- <cucumber.version>6.11.0</cucumber.version>
- <cucumber-reporting.version>5.6.0</cucumber-reporting.version>
- <log4j2.version>2.17.0</log4j2.version>
- <spring-framework.version>5.3.18</spring-framework.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>org.modelmapper</groupId>
- <artifactId>modelmapper</artifactId>
- <version>2.4.4</version>
- </dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-registry-prometheus</artifactId>
- </dependency>
- <dependency>
- <groupId>com.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>5.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.21</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.55</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${org.testcontainers}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <version>${org.testcontainers}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-spring</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit-platform-engine</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.masterthought</groupId>
- <artifactId>cucumber-reporting</artifactId>
- <version>${cucumber-reporting.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>42.2.24</version>
- </dependency>
- <!--Dependencies required for openapi generated sources -->
- <dependency>
- <groupId>org.openapitools</groupId>
- <artifactId>jackson-databind-nullable</artifactId>
- <version>0.2.1</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_pushgateway</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-maven-plugin</artifactId>
- <version>${liquibase.version}</version>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>2.2.4</version>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.7</version>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>7.0.4</version>
- </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.9.0.2155</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.openapitools</groupId>
- <artifactId>openapi-generator-maven-plugin</artifactId>
- <version>5.1.0</version>
- <configuration>
- <inputSpec>
- ${project.basedir}/src/main/resources/submission-code-server-api.yml
- </inputSpec>
- <generatorName>spring</generatorName>
- <apiPackage>
- fr.gouv.stopc.submission.code.server.api
- </apiPackage>
- <modelPackage>
- fr.gouv.stopc.submission.code.server.business.model
- </modelPackage>
- <configOptions>
- <dateLibrary>java8-localdatetime</dateLibrary>
- <interfaceOnly>true</interfaceOnly>
- <useTags>true</useTags>
- <additionalModelTypeAnnotations>
- @lombok.Builder
- @lombok.AllArgsConstructor
- @lombok.NoArgsConstructor
- </additionalModelTypeAnnotations>
- <unhandledException>true</unhandledException>
- </configOptions>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.rudikershaw.gitbuildhook</groupId>
- <artifactId>git-build-hook-maven-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <gitConfig>
- <core.hooksPath>.etc/git-hooks</core.hooksPath>
- </gitConfig>
- </configuration>
- <executions>
- <execution>
- <inherited>false</inherited>
- <goals>
- <goal>configure</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.11.1</version>
- <configuration>
- <java>
- <importOrder>
- <file>.etc/eclipse.importorder</file>
- </importOrder>
- <removeUnusedImports />
- <eclipse>
- <file>.etc/eclipse-formatter-java.xml</file>
- </eclipse>
- </java>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <rules>
- <requireReleaseDeps>
- <message>No Snapshots Allowed!</message>
- </requireReleaseDeps>
- </rules>
- <fail>false</fail>
- </configuration>
- <executions>
- <execution>
- <id>enforce-no-snapshots</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.6</version>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>build-info</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>git.tag</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <fail>true</fail>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <distributionManagement>
- <repository>
- <id>gitlab-maven</id>
- <url>
- https://gitlab.inria.fr/api/v4/projects/stopcovid19%2Fsubmission-code-server/packages/maven
- </url>
- </repository>
- <snapshotRepository>
- <id>gitlab-maven</id>
- <url>
- https://gitlab.inria.fr/api/v4/projects/stopcovid19%2Fsubmission-code-server/packages/maven
- </url>
- </snapshotRepository>
- </distributionManagement>
-
- <scm>
- <connection>
- scm:git:git@gitlab.inria.fr:stopcovid19/submission-code-server.git
- </connection>
- <developerConnection>
- scm:git:git@gitlab.inria.fr:stopcovid19/submission-code-server.git
- </developerConnection>
- <url>https://gitlab.inria.fr/stopcovid19/submission-code-server</url>
- <tag>HEAD</tag>
- </scm>
-
-</project>
diff --git a/legacy-submission-code-server/src/main/docker/Dockerfile b/legacy-submission-code-server/src/main/docker/Dockerfile
deleted file mode 100644
index dfba212cc0513f950b7cadac6026965cadea7a79..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Dockerfile is useful to quickly setup a test/dev environment.
-# It should not be used in production.
-
-# mvn package -Dmaven.test.skip=true
-# docker build -f src/main/docker/Dockerfile -t tac/submission-code-server-ws-rest .
-
-FROM registry.gitlab.inria.fr/stemcovid19/tac-server/docker-image/oracle-serverjre:1.8.0_241-b07
-ADD ./target/submission-code-server-*.jar /app.jar
-ADD ./src/main/resources/application.properties /work/config/application.properties
-CMD ["java","-jar", "/app.jar", "--spring.config.location=file:/work/config/application.properties"]
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/SubmissionCodeServerApplication.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/SubmissionCodeServerApplication.java
deleted file mode 100644
index abefa874de4d742d410e0b0d062927dc4af2a308..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/SubmissionCodeServerApplication.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.gouv.stopc.submission.code.server;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-import javax.annotation.PostConstruct;
-
-import java.util.TimeZone;
-
-@ComponentScan(basePackages = "fr.gouv.stopc")
-@EnableAsync
-@SpringBootApplication
-public class SubmissionCodeServerApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SubmissionCodeServerApplication.class, args);
- }
-
- @PostConstruct
- void started() {
- // set JVM timezone as UTC
- TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/GenerateController.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/GenerateController.java
deleted file mode 100644
index d46af0984f5895dde284a760f542098010410844..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/GenerateController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller;
-
-import fr.gouv.stopc.submission.code.server.api.GenerateCodeApi;
-import fr.gouv.stopc.submission.code.server.business.model.CodeSimpleDto;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.inject.Inject;
-
-/**
- * VPN Control is made to access to this end-point. JWT or ApiKey is checked in
- * API Gateway.
- */
-@Slf4j
-@RestController
-@RequestMapping(value = "/api/v1")
-public class GenerateController implements GenerateCodeApi {
-
- private final GenerateService generateService;
-
- @Inject
- public GenerateController(GenerateService generateService) {
- this.generateService = generateService;
- }
-
- /**
- * Generate a new submission code. Codes are one-time use and have a validity
- * date
- *
- * @return ResponseEntity<CodeSimpleDto>
- */
- @Override
- public ResponseEntity<CodeSimpleDto> generate() throws Exception {
- log.info("Trying to generate code with sequential method");
-
- return ResponseEntity.ok(this.generateService.generateShortCode());
- }
-
- @Override
- public ResponseEntity<CodeSimpleDto> generateTest() {
- log.info("Try to generate a test code that is 12 characters long.");
-
- return ResponseEntity.ok(this.generateService.generateTestCode());
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/KpiController.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/KpiController.java
deleted file mode 100644
index 32620f829730d488b42434c7a89a176c8043a317..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/KpiController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller;
-
-import fr.gouv.stopc.submission.code.server.api.KpiApi;
-import fr.gouv.stopc.submission.code.server.business.model.Kpi;
-import fr.gouv.stopc.submission.code.server.business.service.KpiService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.LocalDate;
-import java.util.List;
-
-/**
- * Kpi generation REST controller definition
- *
- * @author plant-stopcovid
- */
-@RestController
-@RequestMapping(value = "/internal/api/v1")
-public class KpiController implements KpiApi {
-
- /**
- * The Kpi generation service
- */
- private KpiService kpiService;
-
- /**
- * Spring Injection constructor
- *
- * @param kpiService the <code>IKpiService</code> bean instance to inject
- */
- public KpiController(KpiService kpiService) {
- this.kpiService = kpiService;
- }
-
- /**
- * Computes the Kpi on a period
- *
- * @param fromDate beginning date of the period
- * @param toDate ending date of the period
- * @return the list of Kpi computed on this period (one per day)
- */
- @Override
- public ResponseEntity<List<Kpi>> kpi(LocalDate fromDate, LocalDate toDate) throws Exception {
- return ResponseEntity.ok(this.kpiService.generateKPI(fromDate, toDate));
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/VerifyController.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/VerifyController.java
deleted file mode 100644
index 04808b1594309447a219d4a2af794646858136a0..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/VerifyController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller;
-
-import fr.gouv.stopc.submission.code.server.api.VerifyCodeApi;
-import fr.gouv.stopc.submission.code.server.business.model.VerifyDto;
-import fr.gouv.stopc.submission.code.server.business.service.VerifyService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.inject.Inject;
-
-/**
- * VPN Control is made to access to this end-point. JWT or ApiKey is checked in
- * API Gateway.
- */
-@Slf4j
-@RestController
-@RequestMapping(value = "/api/v1")
-public class VerifyController implements VerifyCodeApi {
-
- private VerifyService verifyServiceImpl;
-
- @Inject
- public VerifyController(VerifyService verifyServiceImpl) {
- this.verifyServiceImpl = verifyServiceImpl;
- }
-
- /**
- * Check the validity of a submission code (originally provided by the app).
- * This API must be protected and used only by a trusted back-end server over a
- * secure private connection.
- *
- * @param code should respect regexp ([a-zA-Z0-9]{6}) |
- * ([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8}) | ([a-zA-Z0-9]{12})
- * (required) The code value to verify
- * @param type (optional) The type of the provided code If present, should be
- * between (1 to 3)
- * @return VerifyDto A boolean representing the result status
- */
- @Override
- public ResponseEntity<VerifyDto> verify(String code, String type) {
- log.info("Receiving code : {}", code);
- boolean result = verifyServiceImpl.verifyCode(code);
- return ResponseEntity.ok(VerifyDto.builder().valid(result).build());
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/ViewController.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/ViewController.java
deleted file mode 100644
index 8907cf5836c3c7fafd8112a3d855031572048ef0..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/ViewController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.ViewDto;
-import fr.gouv.stopc.submission.code.server.business.service.ViewsService;
-import fr.gouv.stopc.submission.code.server.business.vo.ViewVo;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.inject.Inject;
-import javax.validation.Valid;
-
-/**
- * VPN Control is made to access to this end-point. JWT or ApiKey is checked in
- * API Gateway.
- */
-@RestController
-@RequestMapping(value = "/api/v1/back-office")
-public class ViewController {
-
- private final ViewsService viewsService;
-
- @Inject
- public ViewController(ViewsService viewsService) {
- this.viewsService = viewsService;
- }
-
- /**
- * Returns the information as number of codes
- *
- * @param lotIdentifier The lot identifier
- * @return ViewDto.LotInformation
- */
- @GetMapping(path = "/lots/{lotIdentifier}/information")
- public ResponseEntity<ViewDto.LotInformation> getLotInformation(@PathVariable long lotIdentifier)
- throws SubmissionCodeServerException {
- return ResponseEntity.ok(this.viewsService.getLotInformation(lotIdentifier));
- }
-
- /**
- * The method returns the information as number page, as number elements for
- * page and list of codes.
- *
- * @param lotIdentifier The lot identifier
- * @param page Number of the researched page
- * @param elementByPage Number of elements by page
- * @return ViewDto.CodeValuesForPage
- */
- @GetMapping(path = "/lots/{lotIdentifier}/page/{page}/by/{elementByPage}")
- public ResponseEntity<ViewDto.CodeValuesForPage> getCodeValuesForPage(
- @PathVariable long lotIdentifier,
- @PathVariable int page,
- @PathVariable int elementByPage) throws SubmissionCodeServerException {
- return ResponseEntity.ok(this.viewsService.getViewLotCodeDetailListFor(page, elementByPage, lotIdentifier));
- }
-
- /**
- * The method launch the generation code with the dates from and to and number
- * of codes for day.
- *
- * @param codeGenerationRequestBody Object representing the parameters of the
- * research
- * @return ViewDto.CodeGenerationRequest defining if the request has been
- * successfully or not successfully submitted.
- */
- @PostMapping(path = "/codes/generate/request")
- public ResponseEntity<ViewDto.CodeGenerationRequest> postCodeGenerationRequest(
- @Valid @RequestBody ViewVo.CodeGenerationRequestBody codeGenerationRequestBody)
- throws SubmissionCodeServerException {
- final ViewDto.CodeGenerationRequest codeGenerationRequest = this.viewsService
- .launchGenerationWith(codeGenerationRequestBody);
-
- return ResponseEntity.ok(codeGenerationRequest);
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerException.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerException.java
deleted file mode 100644
index 9d7c27c156ec56a45d0f947e740ef975f42b86ce..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerException.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller.exception;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.modelmapper.ModelMapper;
-
-import java.time.LocalDateTime;
-
-@Getter
-@Setter
-public class SubmissionCodeServerException extends RuntimeException {
-
- private ExceptionEnum serverExceptionEnum;
-
- private final LocalDateTime timestamp;
-
- private final String debugMessage;
-
- public enum ExceptionEnum {
-
- NUMBER_OF_TRIES_REACHED_ERROR("Number of try generating code has been reached."),
- DB_NO_RECORD_FOR_LOT_IDENTIFIER_ERROR("Lot identifier has no record."),
- DB_INVALID_PARAMETERS_ERROR("The given parameter does not allow to give back any further information."),
- CODE_GENERATION_FAILED_ERROR("Server cannot create codes."),
- INVALID_CODE_TYPE_ERROR("The code type is not supported yet."),
- VALIDATION_FIELD_ERROR("Encounters error on field validation control."),
- UNQUALIFIED_ERROR("Unqualified error."),
- PACKAGING_CSV_FILE_ERROR("An error occurs during packaging csv file in zip."),
- CODE_TO_CSV_PARSING_ERROR("Submission codes list has failed to be parsed into CSV format."),
- CODE_TO_CSV_UTF8_ENCODING_ERROR("Submission codes csv file has failed to be encoded in UTF-8."),
- SFTP_CONNECTION_FAILED_ERROR("The attempt at connecting to SFTP server has failed."),
- SFTP_FILE_PUSHING_FAILED_ERROR("The attempt at writing file through SFTP connection has failed."),
- JSCH_SESSION_CREATION_FAILED_ERROR("The attempt at creating JSCH session has failed."),
- INVALID_DATE("The date validation has failed."),
- PARSE_STR_DATE_ERROR("An error occurred when parsing date"),
- DB_SAVE_OPTIONAL_EMPTY("The data save action has not raised error but returned a empty Optional."),
- SFTP_WORKING_DIRECTORY_ERROR("Change default working directory on chanelSFTP failed."),
- MAPPING_CODE_FOR_CSV_FILE_ERROR("An error occurs at mapping code for csv file creation.");
-
- @Getter
- private final String message;
-
- ExceptionEnum(final String message) {
- this.message = message;
- }
-
- }
-
- public SubmissionCodeServerException() {
- this.timestamp = LocalDateTime.now();
- this.debugMessage = null;
- this.serverExceptionEnum = null;
- }
-
- @Override
- public String getLocalizedMessage() {
- return this.serverExceptionEnum.message;
- }
-
- public SubmissionCodeServerException(ExceptionEnum serverExceptionEnum) {
- this(serverExceptionEnum, null);
- }
-
- public SubmissionCodeServerException(ExceptionEnum serverExceptionEnum, Throwable ex) {
- super(serverExceptionEnum.message, ex);
- this.serverExceptionEnum = serverExceptionEnum;
-
- this.debugMessage = ex != null ? ex.getLocalizedMessage() : null;
-
- this.timestamp = LocalDateTime.now();
- }
-
- public SimpleErrorBody body() {
- final SimpleErrorBody body = new SimpleErrorBody();
- new ModelMapper().map(this, body);
- return body;
- }
-
- public SimpleErrorBody body(String detail) {
- final DetailedErrorBody body = new DetailedErrorBody();
- new ModelMapper().map(this, body);
- body.setDetail(detail);
- return body;
- }
-
- @Getter
- @Setter
- public static class SimpleErrorBody {
-
- private LocalDateTime timestamp;
-
- private ExceptionEnum codeException;
- }
-
- @Getter
- @Setter
- public static class DetailedErrorBody extends SimpleErrorBody {
-
- private String detail;
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerExceptionHandler.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerExceptionHandler.java
deleted file mode 100644
index fa6291818ecead502ea0e1df1c27fc51686fb63b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/controller/exception/SubmissionCodeServerExceptionHandler.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.controller.exception;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.lang.Nullable;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-
-import java.time.OffsetDateTime;
-import java.util.UUID;
-
-@Slf4j
-@RestControllerAdvice
-public class SubmissionCodeServerExceptionHandler extends ResponseEntityExceptionHandler {
-
- @Override
- public ResponseEntity<Object> handleMethodArgumentNotValid(
- MethodArgumentNotValidException ex,
- HttpHeaders headers, HttpStatus status, WebRequest request) {
- return this.handleSubmissionCodeServer(
- new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.VALIDATION_FIELD_ERROR, ex
- ),
- request
- );
- }
-
- @Override
- public ResponseEntity<Object> handleBindException(
- BindException ex,
- HttpHeaders headers, HttpStatus status, WebRequest request) {
- return this.handleSubmissionCodeServer(
- new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.VALIDATION_FIELD_ERROR, ex
- ),
- request
- );
- }
-
- @ExceptionHandler(SubmissionCodeServerException.class)
- public ResponseEntity<Object> handleSubmissionCodeServer(
- SubmissionCodeServerException submissionCodeServerException,
- WebRequest request) {
- log.error("handleSubmissionCodeServer", submissionCodeServerException);
- switch (submissionCodeServerException.getServerExceptionEnum()) {
- case INVALID_CODE_TYPE_ERROR:
- case VALIDATION_FIELD_ERROR:
- return super.handleExceptionInternal(
- submissionCodeServerException, submissionCodeServerException.body(),
- new HttpHeaders(), HttpStatus.BAD_REQUEST, request
- );
-
- case DB_INVALID_PARAMETERS_ERROR:
- case DB_NO_RECORD_FOR_LOT_IDENTIFIER_ERROR:
- return super.handleExceptionInternal(
- submissionCodeServerException, submissionCodeServerException.body(),
- new HttpHeaders(), HttpStatus.NOT_FOUND, request
- );
-
- case CODE_GENERATION_FAILED_ERROR:
- case NUMBER_OF_TRIES_REACHED_ERROR:
- return super.handleExceptionInternal(
- submissionCodeServerException, submissionCodeServerException.body(),
- new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR, request
- );
-
- default:
- return this.unHandledException(submissionCodeServerException, request);
- }
-
- }
-
- ResponseEntity<Object> unHandledException(
- SubmissionCodeServerException submissionCodeServerException,
- WebRequest request) {
- final UUID uuid = UUID.randomUUID();
- final OffsetDateTime now = OffsetDateTime.now();
-
- String loggedCodeError = String.format("[%s%s]", now, uuid);
-
- log.error(loggedCodeError, submissionCodeServerException);
-
- return super.handleExceptionInternal(
- submissionCodeServerException, submissionCodeServerException.body(loggedCodeError),
- new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR, request
- );
- }
-
- @Override
- @ExceptionHandler(Exception.class)
- protected ResponseEntity<Object> handleExceptionInternal(
- Exception ex,
- @Nullable Object body,
- HttpHeaders headers, HttpStatus status,
- WebRequest request) {
- return this.handleSubmissionCodeServer(
- new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.UNQUALIFIED_ERROR, ex
- ), request
- );
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/CodeDetailedDto.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/CodeDetailedDto.java
deleted file mode 100644
index 19423f11f1bd3efb1ef54c677c26e8e84151d045..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/CodeDetailedDto.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@SuperBuilder
-public class CodeDetailedDto {
-
- /**
- * TODO rename ? UUIDv4 or 6-alphanum
- */
- private String typeAsString;
-
- /**
- * 1 - > long code 2 - > short code
- */
- private Integer typeAsInt;
-
- /**
- * code generated formatted as long code or short code
- */
- private String code;
-
- /**
- * Format ISO date is : YYYY-MM-DDTHH:mm:ss.sssZ
- */
- private String validFrom;
-
- /**
- * Format ISO date is : YYYY-MM-DDTHH:mm:ss.sssZ
- */
- private String validUntil;
-
- /**
- * Format ISO date is : YYYY-MM-DDTHH:mm:ss.sssZ
- */
- private String dateGenerate;
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeCsvDto.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeCsvDto.java
deleted file mode 100644
index f46e6d7d6356fa4e60548380a8c0f3ac6a09d30c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeCsvDto.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.dto;
-
-import com.opencsv.bean.CsvDate;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Builder
-@Valid
-public class SubmissionCodeCsvDto {
-
- @NotNull
- @NotBlank
- private String qrcode;
-
- @NotNull
- @NotBlank
- private String code;
-
- @NotNull
- @CsvDate(value = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
- private OffsetDateTime dateEndValidity;
-
- @CsvDate(value = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
- @NotNull
- private OffsetDateTime dateAvailable;
-
- @NotNull
- private String type;
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (!(o instanceof SubmissionCodeCsvDto))
- return false;
- SubmissionCodeCsvDto that = (SubmissionCodeCsvDto) o;
- return Objects.equals(getQrcode(), that.getQrcode()) &&
- Objects.equals(getCode(), that.getCode()) &&
- Objects.equals(getDateEndValidity(), that.getDateEndValidity()) &&
- Objects.equals(getDateAvailable(), that.getDateAvailable()) &&
- Objects.equals(getType(), that.getType());
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(getQrcode(), getCode(), getDateEndValidity(), getDateAvailable(), getType());
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeDto.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeDto.java
deleted file mode 100644
index 88a48aba53413802fe8eb1f4fe8783b3eea80ccc..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/SubmissionCodeDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import java.time.OffsetDateTime;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Builder
-@Valid
-public class SubmissionCodeDto {
-
- /*
- * Empty for short codes, required for long codes
- */
- private long lot;
-
- @NotNull
- @NotBlank
- private String code;
-
- @NotNull
- private String type;
-
- @NotNull
- private OffsetDateTime dateEndValidity;
-
- @NotNull
- private OffsetDateTime dateAvailable;
-
- private OffsetDateTime dateUse;
-
- @NotNull
- private OffsetDateTime dateGeneration;
-
- @NotNull
- private Boolean used;
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/ViewDto.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/ViewDto.java
deleted file mode 100644
index 90d1dec2d39540d171f033b8b5283590759d1e28..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/dto/ViewDto.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-public class ViewDto {
-
- private ViewDto() {
- super();
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- public static class CodeGenerationRequest {
-
- private Boolean isSubmitted;
-
- private String message;
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- public static class CodeValuesForPage {
-
- /**
- * number of pages for {@link #maxByPage}
- */
- int lastPage;
-
- /**
- * number of the page displayed started at 1
- */
- int actualPage;
-
- /**
- * maximum of elements to be displayed in page.
- */
- long maxByPage;
-
- /**
- * lot identifier
- */
- long lot;
-
- List<CodeDetail> codes;
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- public static class LotInformation {
-
- long lotIdentifier;
-
- long numberOfCodes;
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- public static class CodeDetail {
-
- String code;
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/DailyGenerateRunnerService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/DailyGenerateRunnerService.java
deleted file mode 100644
index 4d3bbcb81fe2a2a0a3c6ca5d79bb738d959fa811..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/DailyGenerateRunnerService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.service.schedule.DailyGenerateSchedule;
-import lombok.RequiredArgsConstructor;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-@ConditionalOnProperty(name = "spring.main.web-application-type", havingValue = "none")
-public class DailyGenerateRunnerService implements CommandLineRunner {
-
- private final DailyGenerateSchedule dailyGenerateSchedule;
-
- @Override
- public void run(final String... args) {
- dailyGenerateSchedule.dailyProductionCodeScheduler();
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/FileService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/FileService.java
deleted file mode 100644
index f65cabe002ff4faa5c8b304658f198b769b93336..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/FileService.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import com.opencsv.bean.ColumnPositionMappingStrategy;
-import com.opencsv.bean.StatefulBeanToCsv;
-import com.opencsv.bean.StatefulBeanToCsvBuilder;
-import com.opencsv.exceptions.CsvDataTypeMismatchException;
-import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.CodeDetailedDto;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeCsvDto;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SequenceFichier;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-
-import java.io.*;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPOutputStream;
-
-import static org.apache.tomcat.util.http.fileupload.FileUtils.deleteDirectory;
-
-@Slf4j
-@Service
-@Transactional
-public class FileService {
-
- private String HEADER_CSV = "code_pour_qr%s code_brut%s validite_debut%s validite_fin\n";
-
- private SubmissionCodeService submissionCodeService;
-
- private GenerateService generateService;
-
- private SFTPService sftpService;
-
- private SequenceFichierService sequenceFichierService;
-
- @Value("${submission.code.server.cron.url}")
- private String qrCodeBaseUrlToBeFormatted;
-
- /**
- * TargetZoneId is the time zone id (in the java.time.ZoneId way) on which the
- * submission code server should deliver the codes. eg.: for France is
- * "Europe/Paris"
- */
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- /** The separator is the character uses to separate the columns. */
- @Value("${csv.separator}")
- private Character csvSeparator;
-
- /** The delimiter is the character uses to enclose the strings. */
- @Value("${csv.delimiter}")
- private Character csvDelimiter;
-
- @Value("${csv.filename.formatter}")
- private String csvFilenameFormat;
-
- @Value("${submission.code.server.sftp.enableautotransfer}")
- private boolean transferFile;
-
- @Value("${csv.directory.tmp}")
- private String directoryTmpCsv;
-
- @Inject
- public FileService(SubmissionCodeService submissionCodeService, GenerateService generateService,
- SFTPService sftpService,
- SequenceFichierService sequenceFichierService) {
- this.submissionCodeService = submissionCodeService;
- this.generateService = generateService;
- this.sftpService = sftpService;
- this.sequenceFichierService = sequenceFichierService;
- }
-
- @Async
- public Optional<ByteArrayOutputStream> zipExportAsync(Long numberCodeDay, Lot lotObject, String dateFrom,
- String dateTo)
- throws SubmissionCodeServerException {
- final OffsetDateTime start = OffsetDateTime.now();
-
- log.info("Generating long codes with archive method asynchronously");
-
- final Optional<ByteArrayOutputStream> byteArrayOutputStream = this
- .zipExport(numberCodeDay, lotObject, dateFrom, dateTo);
-
- log.info(
- "It took {} seconds to generate {} codes", ChronoUnit.SECONDS.between(start, OffsetDateTime.now()),
- (ChronoUnit.DAYS.between(OffsetDateTime.parse(dateFrom), OffsetDateTime.parse(dateTo)) + 1)
- * numberCodeDay
- );
-
- return byteArrayOutputStream;
- }
-
- /**
- * Method: 1)generate long codes between dateFrom to dateTo 2) export from
- * database 3) create one csv file each day between dateFrom to dateTo 4) create
- * archive with csv files
- *
- * @param numberCodeDay
- * @param lotObject
- * @param dateFrom
- * @param dateTo
- * @return
- */
- public Optional<ByteArrayOutputStream> zipExport(Long numberCodeDay, Lot lotObject, String dateFrom, String dateTo)
- throws SubmissionCodeServerException {
- log.info("Generate {} codes per day from {} to {}", numberCodeDay, dateFrom, dateTo);
- OffsetDateTime dateTimeFrom;
- OffsetDateTime dateTimeTo;
-
- try {
- dateTimeFrom = OffsetDateTime.parse(dateFrom, DateTimeFormatter.ISO_DATE_TIME);
- dateTimeTo = OffsetDateTime.parse(dateTo, DateTimeFormatter.ISO_DATE_TIME);
- } catch (RuntimeException e) {
- log.error(SubmissionCodeServerException.ExceptionEnum.PARSE_STR_DATE_ERROR.getMessage());
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.PARSE_STR_DATE_ERROR
- );
- }
- /*
- * if (!isDateValid(dateTimeFrom, dateTimeTo)) {
- * log.error(SubmissionCodeServerException.ExceptionEnum.INVALID_DATE.getMessage
- * ()); throw new SubmissionCodeServerException(
- * SubmissionCodeServerException.ExceptionEnum.INVALID_DATE ); }
- */
- // STEP 1 - create codes
- // STEP 2 parsing codes to csv dataByFilename
- File tmpDirectory = new File(System.getProperty("java.io.tmpdir") + directoryTmpCsv);
- tmpDirectory.mkdir();
- log.info("Create directory {} and Start generation codes bulk method", tmpDirectory.getAbsolutePath());
- List<String> dataByFilename = this
- .persistLongCodesQuiet(numberCodeDay, lotObject, dateTimeFrom, dateTimeTo, tmpDirectory);
-
- log.info("End generation codes");
- // STEP 3 packaging csv data
- ByteArrayOutputStream zipOutputStream = null;
- try {
- zipOutputStream = packageCsvDataToZipFile(dataByFilename, tmpDirectory);
- } catch (IOException e) {
- log.error(SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR.getMessage(), e);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR,
- e
- );
- }
- if (transferFile) {
- // async method is called here.
- log.info("SFTP transfer is about to be submitted.");
- sftpService.transferFileSFTP(zipOutputStream);
-
- log.info("SFTP transfer have been submitted.");
- } else {
- log.info("No SFTP transfer have been submitted.");
- }
-
- // delete directory
- try {
- log.info("Delete directory {}", tmpDirectory.getAbsolutePath());
- deleteDirectory(tmpDirectory);
- } catch (IOException e) {
- log.error("Delete directory is not good");
- }
-
- return Optional.of(zipOutputStream);
- }
-
- public List<String> persistLongCodesQuiet(Long codePerDays, Lot lotObject, OffsetDateTime from, OffsetDateTime to,
- File tmpDirectory)
- throws SubmissionCodeServerException {
- List<String> listFile = new ArrayList<>();
-
- OffsetDateTime fromWithoutHours = from.truncatedTo(ChronoUnit.DAYS);
- OffsetDateTime toWithoutHours = to.truncatedTo(ChronoUnit.DAYS);
- OffsetDateTime validGenDate = OffsetDateTime.now();
-
- long diffDays = ChronoUnit.DAYS.between(fromWithoutHours, toWithoutHours) + 1;
- int diff = Integer.parseInt(Long.toString(diffDays));
- List<OffsetDateTime> datesFromList = generateService.getListOfValidDatesFor(diff, from);
- for (OffsetDateTime dateFromDay : datesFromList) {
- List<CodeDetailedDto> codeSaves = this.generateService.generateLongCodesWithBulkMethod(
- dateFromDay,
- codePerDays,
- lotObject,
- validGenDate
- );
-
- if (CollectionUtils.isNotEmpty(codeSaves)) {
- final List<SubmissionCodeDto> collect = codeSaves.stream()
- .map(codeDetailedDto -> mapToSubmissionCodeDto(codeDetailedDto, lotObject.getId()))
- .collect(Collectors.toList());
-
- listFile.addAll((this.serializeCodesToCsv(collect, Arrays.asList(dateFromDay), tmpDirectory)));
- }
- }
- return listFile;
- }
-
- /**
- * STEP 2 - [ PARSING DATA TO CSV Data ]
- *
- * @param submissionCodeDtos
- * @param dates
- * @param tmpDirectory
- * @return List of csv dataByFilename
- */
- public List<String> serializeCodesToCsv(
- List<SubmissionCodeDto> submissionCodeDtos,
- List<OffsetDateTime> dates,
- File tmpDirectory)
- throws SubmissionCodeServerException {
- List<String> dataByFilename = new ArrayList<>();
-
- for (OffsetDateTime dateTime : dates) {
- List<SubmissionCodeDto> listForDay = submissionCodeDtos
- .stream().filter(tmp -> dateTime.isEqual(tmp.getDateAvailable()))
- .collect(Collectors.toList());
-
- OffsetDateTime date = dateTime
- .withOffsetSameInstant(OffsetDateTime.now(ZoneId.of(this.targetZoneId)).getOffset());
- Optional<SequenceFichier> seqFichier = this.sequenceFichierService.getSequence(date);
- int sequence = LocalDate.now().getYear() % 100;
- if (seqFichier.isPresent()) {
- sequence = seqFichier.get().getSequence();
- }
-
- if (CollectionUtils.isNotEmpty(listForDay)) {
- byte[] fileByte = createCSV(listForDay, dateTime);
- String filename = this.getCsvFilename(dateTime, sequence);
- log.info("About to create the file : {}", filename);
- dataByFilename.add(filename);
- OutputStream os = null;
- try {
- os = new FileOutputStream(tmpDirectory.getAbsolutePath() + File.separator + filename);
- os.write(fileByte);
- os.close();
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return dataByFilename;
- }
-
- /**
- * STEP 3 - [ Packaging dataByFilename in a Zip ]
- *
- * @param dataByFilename csv data to be zipped.
- * @return ZipOutputStream instance containing csv data.
- */
- public ByteArrayOutputStream packageCsvDataToZipFile(List<String> dataByFilename, File tmpDirectory)
- throws SubmissionCodeServerException, IOException {
- ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
- GZIPOutputStream gzipOutputStream = null;
- TarArchiveOutputStream tarArchiveOutputStream = null;
-
- try {
- gzipOutputStream = new GZIPOutputStream(byteOutputStream);
- tarArchiveOutputStream = new TarArchiveOutputStream(gzipOutputStream);
-
- for (String filename : dataByFilename) {
- TarArchiveEntry entry = new TarArchiveEntry(filename);
- File file = new File(tmpDirectory.getAbsolutePath() + File.separator + filename);
- FileInputStream fileInputStream = new FileInputStream(
- tmpDirectory.getAbsolutePath() + File.separator + filename
- );
- byte[] data = new byte[(int) file.length()];
- fileInputStream.read(data);
- entry.setSize(file.length());
- tarArchiveOutputStream.putArchiveEntry(entry);
- final ByteArrayInputStream inputByteArray = new ByteArrayInputStream(data);
- IOUtils.copy(inputByteArray, tarArchiveOutputStream);
- inputByteArray.close();
- fileInputStream.close();
- tarArchiveOutputStream.closeArchiveEntry();
- }
-
- } catch (IOException ioe) {
- log.error(SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR.getMessage(), ioe);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR,
- ioe
- );
- } finally {
- {
- if (byteOutputStream != null) {
- byteOutputStream.close();
- }
- if (tarArchiveOutputStream != null) {
- tarArchiveOutputStream.close();
- }
- if (gzipOutputStream != null) {
- gzipOutputStream.close();
- }
- }
- }
- return byteOutputStream;
- }
-
- /**
- * Create one file csv for the list of submissionCodes with date of available
- * equal to dateTimeFrom
- *
- * @param submissionCodeDtoList list of submissionCodes for a day specific
- * @param date the date of available of submissionCode
- * @return submissionCodeDtoList parsed into a csv file
- */
- private byte[] createCSV(List<SubmissionCodeDto> submissionCodeDtoList, OffsetDateTime date)
- throws SubmissionCodeServerException {
- String header = HEADER_CSV.replaceAll("%s", Character.toString(csvSeparator));
- // converting list SubmissionCodeDto to SubmissionCodeCsvDto to be proceeded in
- // csv generator
- final List<SubmissionCodeCsvDto> submissionCodeCsvDtos = convert(submissionCodeDtoList);
-
- StringWriter fileWriter = new StringWriter();
- fileWriter.append(header);
-
- ColumnPositionMappingStrategy mappingStrategy = new ColumnPositionMappingStrategy();
- mappingStrategy.setType(SubmissionCodeCsvDto.class);
-
- String[] columns = new String[] { "qrcode", "code", "dateAvailable", "dateEndValidity" };
- mappingStrategy.setColumnMapping(columns);
- StatefulBeanToCsvBuilder<SubmissionCodeDto> builder = new StatefulBeanToCsvBuilder<SubmissionCodeDto>(
- fileWriter
- )
- .withSeparator(csvSeparator).withQuotechar(csvDelimiter);
-
- StatefulBeanToCsv statefulBeanToCsv = builder.withMappingStrategy(mappingStrategy).build();
-
- try {
- statefulBeanToCsv.write(submissionCodeCsvDtos);
-
- return fileWriter.toString().getBytes(StandardCharsets.UTF_8);
-
- } catch (CsvDataTypeMismatchException | CsvRequiredFieldEmptyException e) {
- log.error(SubmissionCodeServerException.ExceptionEnum.CODE_TO_CSV_PARSING_ERROR.getMessage(), e);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.CODE_TO_CSV_PARSING_ERROR,
- e
- );
- }
- }
-
- /**
- * @param from start date
- * @param to end date
- * @throws DateTimeException when end date is less than start date. or if start
- * date is inferior to current time.
- */
-
- protected Boolean isDateValid(OffsetDateTime from, OffsetDateTime to)
- throws DateTimeException {
- return !(OffsetDateTime.now().toLocalDate().compareTo(from.toLocalDate()) > 0 || from.isAfter(to));
- }
-
- /**
- * Method convert list of dao SubmissionCodeDto to csv data SubmissionCodeCsvDto
- *
- * @param listForDay list provided by dao service to be converted to a list of
- * csv DTO
- * @return list of SubmissionCodeCsvDto
- */
- private List<SubmissionCodeCsvDto> convert(List<SubmissionCodeDto> listForDay)
- throws SubmissionCodeServerException {
- final ModelMapper modelMapper = new ModelMapper();
-
- final List<SubmissionCodeCsvDto> submissionCodeCsvDtos = listForDay.stream().map(s -> {
- final SubmissionCodeCsvDto csvDto = modelMapper.map(s, SubmissionCodeCsvDto.class);
- try {
- csvDto.setQrcode(
- String.format(
- this.qrCodeBaseUrlToBeFormatted,
- URLEncoder.encode(csvDto.getCode(), "UTF-8"),
- URLEncoder.encode(csvDto.getType(), "UTF-8")
- )
- );
- return csvDto;
- } catch (UnsupportedEncodingException e) {
- return null;
- }
- }).collect(Collectors.toList());
-
- if (submissionCodeCsvDtos.size() != listForDay.size()) {
- log.error(SubmissionCodeServerException.ExceptionEnum.MAPPING_CODE_FOR_CSV_FILE_ERROR.getMessage());
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.MAPPING_CODE_FOR_CSV_FILE_ERROR
- );
- }
-
- return submissionCodeCsvDtos;
- }
-
- /**
- * Formats csv file name from date and pattern set in application.properties.
- *
- * @param date date of the file to generate
- * @return formatted csv file name from date and pattern set in
- * application.properties.
- */
- private String getCsvFilename(OffsetDateTime date, int sequence) {
- date = date.withOffsetSameInstant(OffsetDateTime.now(ZoneId.of(this.targetZoneId)).getOffset());
- if (sequence > 0) {
- return String.format(
- csvFilenameFormat, sequence,
- date.format(DateTimeFormatter.ofPattern("yyMMdd"))
- );
- }
-
- return date.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- }
-
- private SubmissionCodeDto mapToSubmissionCodeDto(CodeDetailedDto codeDetailedDto, Long idLot) {
- SubmissionCodeDto submissionCodeDto = new SubmissionCodeDto();
- submissionCodeDto.setLot(idLot);
- submissionCodeDto.setUsed(false);
- submissionCodeDto.setType(CodeTypeEnum.LONG.getTypeCode());
- submissionCodeDto.setDateGeneration(
- OffsetDateTime.parse(codeDetailedDto.getDateGenerate(), DateTimeFormatter.ISO_DATE_TIME)
- );
- submissionCodeDto.setDateEndValidity(
- OffsetDateTime.parse(codeDetailedDto.getValidUntil(), DateTimeFormatter.ISO_DATE_TIME)
- );
- submissionCodeDto.setCode(codeDetailedDto.getCode());
- submissionCodeDto.setDateAvailable(
- OffsetDateTime.parse(codeDetailedDto.getValidFrom(), DateTimeFormatter.ISO_DATE_TIME)
- );
- return submissionCodeDto;
- }
-
- /**
- * Method: 1)generate long codes between dateFrom to dateTo 2) export from
- * database 3) create one csv file each day between dateFrom to dateTo 4) create
- * archive with csv files
- *
- * @param numberCodeDay
- * @param lotObject
- * @param dateTimeFrom
- * @param dateTimeTo
- * @return
- */
- public void schedulerZipExport(Long numberCodeDay, Lot lotObject, OffsetDateTime dateTimeFrom,
- OffsetDateTime dateTimeTo)
- throws SubmissionCodeServerException {
- log.info(
- "Generate {} codes per day from {} to {}", numberCodeDay, dateTimeFrom.toString(), dateTimeTo.toString()
- );
-
- // STEP 1 - create codes
- // STEP 2 parsing codes to csv dataByFilename
- File tmpDirectory = new File(System.getProperty("java.io.tmpdir") + directoryTmpCsv);
- tmpDirectory.mkdir();
- log.info("Create directory {} and Start generation codes bulk method", tmpDirectory.getAbsolutePath());
- List<String> dataByFilename = this
- .schedulerPersistLongCodesQuiet(numberCodeDay, lotObject, dateTimeFrom, dateTimeTo, tmpDirectory);
-
- log.info("End generation codes");
- // STEP 3 packaging csv data
- ByteArrayOutputStream zipOutputStream = null;
- try {
- zipOutputStream = packageCsvDataToZipFile(dataByFilename, tmpDirectory);
- } catch (IOException e) {
- log.error(SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR.getMessage(), e);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.PACKAGING_CSV_FILE_ERROR,
- e
- );
- }
- if (transferFile) {
- // async method is called here.
- log.info("SFTP transfer is about to be submitted.");
- sftpService.transferFileSFTP(zipOutputStream);
-
- log.info("SFTP transfer have been submitted.");
- } else {
- log.info("No SFTP transfer have been submitted.");
- }
-
- // delete directory
- try {
- log.info("Delete directory {}", tmpDirectory.getAbsolutePath());
- deleteDirectory(tmpDirectory);
- } catch (IOException e) {
- log.error("Delete directory is not good");
- }
- }
-
- public List<String> schedulerPersistLongCodesQuiet(Long codePerDays,
- Lot lotObject,
- OffsetDateTime from,
- OffsetDateTime to,
- File tmpDirectory)
- throws SubmissionCodeServerException {
- List<String> listFile = new ArrayList<>();
-
- OffsetDateTime validGenDate = OffsetDateTime.now();
-
- while (from.isBefore(to)) {
- List<CodeDetailedDto> codeSaves = this.generateService.generateLongCodesWithBulkMethod(
- from,
- codePerDays,
- lotObject,
- validGenDate
- );
-
- if (CollectionUtils.isNotEmpty(codeSaves)) {
- final List<SubmissionCodeDto> collect = codeSaves.stream()
- .map(codeDetailedDto -> mapToSubmissionCodeDto(codeDetailedDto, lotObject.getId()))
- .collect(Collectors.toList());
-
- listFile.addAll((this.serializeCodesToCsv(collect, Arrays.asList(from), tmpDirectory)));
- }
- from = from.plusDays(1);
- }
- return listFile;
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/GenerateService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/GenerateService.java
deleted file mode 100644
index 31c59eb3be80bd14bc88573e1555c2766d196777..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/GenerateService.java
+++ /dev/null
@@ -1,429 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.CodeDetailedDto;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.business.model.CodeSimpleDto;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.IterableUtils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class GenerateService {
-
- private static final int TEST_CODE_LENGTH = 12;
-
- private final LongCodeService longCodeService;
-
- private final SubmissionCodeService submissionCodeService;
-
- private final ShortCodeService shortCodeService;
-
- /**
- * TargetZoneId is the time zone id (in the java.time.ZoneId way) on which the
- * submission code server should deliver the codes. eg.: for France is
- * "Europe/Paris"
- */
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- /**
- * Number of try to generate a new code in case of the code is already in db it
- * is set in application.properties file
- */
- @Value("${generation.code.maxattempts}")
- private long numberOfTryInCaseOfError;
-
- /**
- * Interval in days of the validity of a long code it is set in
- * application.properties file
- */
- @Value("${generation.code.longcode.validity}")
- private long timeValidityLongCode;
-
- /**
- * Interval in minutes of the validity of a short code it is set in
- * application.properties file
- */
- @Value("${generation.code.shortcode.validity}")
- private long timeValidityShortCode;
-
- @Value("${generation.code.testcode.validity}")
- private long timeValidityTestCode;
-
- /**
- * Default constructor
- *
- * @param longCodeService Spring-injection of the longCodeService
- * generating long codes
- * @param shortCodeService Spring-injection of the shortCodeService
- * generating short codes
- * @param submissionCodeService Spring-injection of the shortCodeService giving
- * access to persistence in db.
- */
- @Inject
- public GenerateService(LongCodeService longCodeService,
- ShortCodeService shortCodeService,
- SubmissionCodeService submissionCodeService) {
- this.shortCodeService = shortCodeService;
- this.longCodeService = longCodeService;
- this.submissionCodeService = submissionCodeService;
- }
-
- private SubmissionCodeDto generateSubmissionCodeDtoForTestCode() {
- OffsetDateTime validGenDate = OffsetDateTime.now();
- OffsetDateTime validUntil = OffsetDateTime.now().truncatedTo(ChronoUnit.DAYS).plusDays(timeValidityTestCode);
-
- return SubmissionCodeDto.builder()
- .code(RandomStringUtils.randomAlphanumeric(TEST_CODE_LENGTH))
- .type(CodeTypeEnum.TEST.getTypeCode())
- .dateAvailable(OffsetDateTime.now())
- .dateEndValidity(validUntil)
- .dateGeneration(validGenDate)
- .used(false)
- .build();
- }
-
- public CodeSimpleDto generateTestCode() throws SubmissionCodeServerException {
- CodeSimpleDto codeSimpleDto = null;
- final SubmissionCodeDto submissionCodeDto = generateSubmissionCodeDtoForTestCode();
-
- final Optional<SubmissionCode> submissionCodeOptional = this.submissionCodeService
- .saveCode(submissionCodeDto);
-
- if (!submissionCodeOptional.isPresent()) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.DB_SAVE_OPTIONAL_EMPTY
- );
- }
-
- final SubmissionCode submissionCodeEntity = submissionCodeOptional.get();
-
- codeSimpleDto = CodeSimpleDto.builder()
- .code(submissionCodeEntity.getCode())
- .dateGenerate(submissionCodeEntity.getDateGeneration().format(DateTimeFormatter.ISO_INSTANT))
- .validFrom(submissionCodeEntity.getDateAvailable().format(DateTimeFormatter.ISO_INSTANT))
- .validUntil(submissionCodeEntity.getDateEndValidity().format(DateTimeFormatter.ISO_INSTANT))
- .build();
-
- return codeSimpleDto;
- }
-
- public CodeSimpleDto generateShortCode()
- throws SubmissionCodeServerException {
- final CodeSimpleDto shortCodeInstance = new CodeSimpleDto();
- new ModelMapper().map(
- this.generateCodeGeneric(1, CodeTypeEnum.SHORT, OffsetDateTime.now(), new Lot()).get(0),
- shortCodeInstance
- );
- return shortCodeInstance;
- }
-
- /**
- * Method used to sequentially generate codes of codeType in parameter
- *
- * @param size the desired number of code to be generated
- * @param cte the code type desired
- * @param validFrom date from the code should be valid.
- * @return list of unique persisted codes
- */
- public List<CodeDetailedDto> generateCodeGeneric(final long size,
- final CodeTypeEnum cte,
- final OffsetDateTime validFrom,
- Lot lotObject)
- throws SubmissionCodeServerException {
-
- final ArrayList<CodeDetailedDto> generateResponseList = new ArrayList<>();
-
- long failCount = 0;
-
- // The date available/validFrom is date of now in this time
- OffsetDateTime validGenDate = OffsetDateTime.now();
-
- log.info("Generating an amount of {} {} codes", size, cte);
-
- for (int i = 0; generateResponseList.size() < size && failCount <= numberOfTryInCaseOfError; i++) {
- SubmissionCodeDto submissionCodeDto = this
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(cte, validFrom)
- .dateGeneration(validGenDate)
- .used(false)
- .build();
- try {
- final Optional<SubmissionCode> submissionCodeOptional = this.submissionCodeService
- .saveCode(submissionCodeDto, lotObject);
-
- if (!submissionCodeOptional.isPresent()) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.DB_SAVE_OPTIONAL_EMPTY
- );
- }
-
- final SubmissionCode sc = submissionCodeOptional.get();
- lotObject = sc.getLotkey();
- generateResponseList.add(
- CodeDetailedDto.builder()
- .code(sc.getCode())
- .typeAsString(cte.getType())
- .typeAsInt(Integer.parseInt(cte.getTypeCode()))
- .validFrom(
- sc != null && sc.getDateAvailable() != null
- ? formatOffsetDateTime(sc.getDateAvailable())
- : ""
- )
- .dateGenerate(
- sc != null && sc.getDateGeneration() != null
- ? formatOffsetDateTime(sc.getDateGeneration())
- : ""
- )
- .validUntil(
- sc != null && sc.getDateEndValidity() != null
- ? formatOffsetDateTime(sc.getDateEndValidity())
- : ""
- )
- .build()
- );
-
- failCount = 0;
- } catch (DataIntegrityViolationException divException) {
- failCount++;
- log.error("code generated is not unique try {}/{}", failCount, numberOfTryInCaseOfError + 1);
- }
- // In case of tries of generating code were exceeded an error should be raised.
- if (failCount > numberOfTryInCaseOfError) {
- final String message = String.format(
- "The code index %s has failed to be generated reaching %s counts of fails",
- i, failCount
- );
- // delete Lot not completed
- submissionCodeService.removeByLot(lotObject);
- log.error(message);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.CODE_GENERATION_FAILED_ERROR
- );
- }
- }
- return generateResponseList;
- }
-
- public SubmissionCodeDto.SubmissionCodeDtoBuilder preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(
- final CodeTypeEnum cte,
- final OffsetDateTime validFrom)
- throws SubmissionCodeServerException {
- switch (cte) {
- case LONG:
- return SubmissionCodeDto.builder()
- .code(this.longCodeService.generateCode())
- .type(cte.getTypeCode())
- .dateAvailable(validFrom)
- .dateEndValidity(this.getExpirationDateForLongCodeStartingFrom(validFrom));
- case SHORT:
- return SubmissionCodeDto.builder()
- .code(this.shortCodeService.generateCode())
- .type(cte.getTypeCode())
- .dateAvailable(validFrom)
- .dateEndValidity(this.getExpirationDateForShortCodeStartingFrom(validFrom));
- case TEST:
- return SubmissionCodeDto.builder()
- .code(RandomStringUtils.randomAlphanumeric(TEST_CODE_LENGTH))
- .type(CodeTypeEnum.TEST.getType())
- .dateAvailable(OffsetDateTime.now())
- .dateEndValidity(OffsetDateTime.now().truncatedTo(ChronoUnit.DAYS).plusDays(3));
- default:
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.INVALID_CODE_TYPE_ERROR
- );
- }
- }
-
- /**
- * Method return List of OffsetDateTime increment by day and truncate to day
- *
- * @param size give size of the list to be returned included
- * validFromFirstValue
- * @param validFromFirstValue seed time from the list should be generated from.
- * @return List of OffsetDateTime increment by day and truncate to day.
- */
- public List<OffsetDateTime> getListOfValidDatesFor(int size, OffsetDateTime validFromFirstValue) {
- final ArrayList<OffsetDateTime> validFromList = new ArrayList<>();
-
- // convert to zulu zoneoffset
- validFromList.add(validFromFirstValue.withOffsetSameInstant(ZoneOffset.of("Z")));
-
- final OffsetDateTime nowInParis = OffsetDateTime.now(ZoneId.of(this.targetZoneId));
- final ZoneOffset offsetInParis = nowInParis.getOffset();
-
- // assuring validFromFirstValue is OffsetInParis
- validFromFirstValue = validFromFirstValue.withOffsetSameInstant(offsetInParis);
-
- for (int i = 1; i < size; i++) {
- // OffsetDateTime is immutable so it can be copy
- OffsetDateTime oft = validFromFirstValue;
-
- // set 00 after day (2020-05-03T23:48:24.830+02:00 -> 2020-05-03T00:00+02:00)
- oft = oft.truncatedTo(ChronoUnit.DAYS);
-
- // add incremental day e.g. : 2020-05-03T00:00+02:00 + (i = 2) ->
- // 2020-05-05T00:00+02:00 + 2
- oft = oft.plusDays(i);
-
- // converting to zulu zone offset
- oft = oft.withOffsetSameInstant(ZoneOffset.of("Z"));
-
- validFromList.add(oft);
- }
- return validFromList;
- }
-
- public List<CodeDetailedDto> generateLongCodesWithBulkMethod(
- final OffsetDateTime validFrom,
- final long dailyAmount,
- final Lot lot,
- final OffsetDateTime validGenDate) throws SubmissionCodeServerException {
-
- final OffsetDateTime validUntil = getExpirationDateForLongCodeStartingFrom(validFrom);
-
- final List<SubmissionCodeDto> submissionCodeDtos = this.longCodeService
- .generateCodes(dailyAmount)
- .stream()
- .map(
- code -> SubmissionCodeDto.builder()
- .code(code)
- .type(CodeTypeEnum.LONG.getTypeCode())
- .dateGeneration(validGenDate)
- .dateAvailable(validFrom)
- .dateEndValidity(validUntil)
- .used(false)
- .build()
- )
- .collect(Collectors.toList());
-
- Iterable<SubmissionCode> submissionCodes = null;
- try {
- submissionCodes = this.submissionCodeService
- .saveAllCodes(submissionCodeDtos, lot);
-
- } catch (DataIntegrityViolationException divException) {
- submissionCodeService.removeByLot(lot);
- log.error("code generated error integration");
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.CODE_GENERATION_FAILED_ERROR
- );
- }
- return this.submissionCodeListToCodeDetailDtoList(submissionCodes);
- }
-
- public List<CodeDetailedDto> submissionCodeListToCodeDetailDtoList(Iterable<SubmissionCode> submissionCodes) {
- if (submissionCodes == null) {
- return Collections.emptyList();
- }
- return IterableUtils.toList(submissionCodes).stream()
- .map(
- sc -> CodeDetailedDto.builder()
- .code(sc.getCode())
- .typeAsString(CodeTypeEnum.LONG.getType())
- .typeAsInt(Integer.parseInt(CodeTypeEnum.LONG.getTypeCode()))
- .validFrom(
- sc != null && sc.getDateAvailable() != null
- ? formatOffsetDateTime(sc.getDateAvailable())
- : ""
- )
- .validUntil(
- sc != null && sc.getDateAvailable() != null
- ? formatOffsetDateTime(sc.getDateEndValidity())
- : ""
- )
- .dateGenerate(
- sc != null && sc.getDateGeneration() != null
- ? formatOffsetDateTime(sc.getDateGeneration())
- : ""
- )
- .build()
- )
- .collect(Collectors.toList());
- }
-
- /**
- * Method formatting date with standard API date pattern "AAAA-MM-ddThh:mm:ssZ"
- *
- * @param date value to be stringified.
- * @return ISO instant formatter of date in parameter
- */
- private String formatOffsetDateTime(OffsetDateTime date) {
- return date.format(DateTimeFormatter.ISO_INSTANT);
- }
-
- /**
- * Method gives the validUntil date of long code from the date given in
- * parameter. It calculates the validity end date of the code using value set in
- * application.properties and inject by Spring. {@link #timeValidityLongCode}
- * The ValidUntil should be hh:mm formatted as 23:59 in paris.
- *
- * @param validFrom the OffsetDateTime start validity applied to calculate end
- * of long code validity
- * @return OffsetDateTime corresponding to the "validFrom" plus days in
- * {@link #timeValidityLongCode} at Zulu Offset
- */
- private OffsetDateTime getExpirationDateForLongCodeStartingFrom(OffsetDateTime validFrom) {
- // ensuring that validFrom is based
- validFrom = validFrom.withOffsetSameInstant(this.getTargetOffset());
- return validFrom
- .withOffsetSameInstant(this.getTargetOffset())
- .plusDays(timeValidityLongCode + 1)
- .truncatedTo(ChronoUnit.DAYS)
- .minusMinutes(1)
- .withOffsetSameInstant(this.getZuluOffset());
- }
-
- /**
- * @return return current offset of targeted zone where the codes should be used
- */
- private ZoneOffset getTargetOffset() {
- return OffsetDateTime.now(ZoneId.of(this.targetZoneId)).getOffset();
- }
-
- /**
- * @return return current offset of zulu
- */
- private ZoneOffset getZuluOffset() {
- return ZoneOffset.of("Z");
- }
-
- /**
- * Method gives the validUntil date of short code from the date given in
- * parameter. It calculates the validity end date of the code using value set in
- * application.properties and inject by Spring. {@link #timeValidityShortCode}
- *
- * @param validFrom the OffsetDateTime start validity applied to calculate end
- * of short code validity
- * @return OffsetDateTime corresponding to the "validFrom" plus minutes in
- * {@link #timeValidityShortCode} at Zulu Offset
- */
- private OffsetDateTime getExpirationDateForShortCodeStartingFrom(OffsetDateTime validFrom) {
-
- return validFrom
- .plusMinutes(timeValidityShortCode)
- .withOffsetSameInstant(this.getZuluOffset());
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/KpiService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/KpiService.java
deleted file mode 100644
index 1a2ae7f24a9bea3a6810737168f0db65264a1e5f..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/KpiService.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.model.Kpi;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import fr.gouv.stopc.submission.code.server.domain.utils.FormatDatesKPI;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class KpiService {
-
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- private SubmissionCodeRepository submissionCodeRepository;
-
- @Autowired
- public KpiService(SubmissionCodeRepository submissionCodeRepository) {
- this.submissionCodeRepository = submissionCodeRepository;
- }
-
- /**
- * Create the KPI for each day from the dateFrom until dateTo. KPI of expired ou
- * used codes (long and short).
- *
- * @param dateFrom
- * @param dateTo
- * @return
- * @throws SubmissionCodeServerException
- */
- public List<Kpi> generateKPI(LocalDate dateFrom, LocalDate dateTo)
- throws SubmissionCodeServerException {
- if (!validationDate(dateFrom, dateTo)) {
- throw new SubmissionCodeServerException(SubmissionCodeServerException.ExceptionEnum.INVALID_DATE);
- }
- List<Kpi> submissionCodeServerKpis = new ArrayList<>();
- LocalDate loopDate;
- for (loopDate = dateFrom; validationDate(loopDate, dateTo); loopDate = loopDate.plusDays(1L)) {
- OffsetDateTime startDateTime = FormatDatesKPI.normaliseDateFrom(loopDate, this.targetZoneId);
- OffsetDateTime endDateTime = FormatDatesKPI.normaliseDateTo(loopDate, this.targetZoneId);
-
- long resultLong = this.submissionCodeRepository
- .countSubmissionCodeUsedByDate(startDateTime, endDateTime, CodeTypeEnum.LONG.getTypeCode());
- long resultShort = this.submissionCodeRepository
- .countSubmissionCodeUsedByDate(startDateTime, endDateTime, CodeTypeEnum.SHORT.getTypeCode());
- long resultLongExpire = calculateExpiredCode(loopDate, CodeTypeEnum.LONG.getTypeCode());
- long resultShortExpire = calculateExpiredCode(loopDate, CodeTypeEnum.SHORT.getTypeCode());
- long nbShortCodesGenerated = countGeneratedCodes(startDateTime, endDateTime, CodeTypeEnum.SHORT);
-
- submissionCodeServerKpis.add(
- buildSubmissionCodeServerKpi(
- loopDate, resultLong, resultShort, resultLongExpire, resultShortExpire,
- nbShortCodesGenerated
- )
- );
- }
- return submissionCodeServerKpis;
- }
-
- private boolean validationDate(LocalDate dateFrom, LocalDate dateTo) {
- return dateFrom.isBefore(dateTo) || dateFrom.isEqual(dateTo);
- }
-
- /**
- * The method creates KPI of expired code, the method searches the expired code
- * for localDate. First it searches the number of expired codes until
- * localDate-1, then it searches the number of expired codes until localDate.
- * The result is the subtraction of these counts.
- *
- * @param localDate
- * @param typeCode
- * @return
- */
- private long calculateExpiredCode(LocalDate localDate, String typeCode) {
- LocalDate dateLeft = localDate.minusDays(1L);
- LocalDate dateRight = localDate;
- long resultExpireLeft = this.submissionCodeRepository
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(dateLeft, this.targetZoneId), typeCode);
- long resultExpireRight = this.submissionCodeRepository
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(dateRight, this.targetZoneId), typeCode);
- return (resultExpireRight - resultExpireLeft);
-
- }
-
- private long countGeneratedCodes(OffsetDateTime startDateTime, OffsetDateTime endDateTime, CodeTypeEnum code) {
- return this.submissionCodeRepository.countGeneratedCodes(startDateTime, endDateTime, code.getTypeCode());
- }
-
- private Kpi buildSubmissionCodeServerKpi(LocalDate loopDate, long nbLongCodesUsed,
- long nbShortCodesUsed,
- long nbLongCodesExpired, long nbShortCodesExpired, long nbShortCodesGenerated) {
-
- return Kpi.builder()
- .date(loopDate)
- .nbShortExpiredCodes(nbShortCodesExpired)
- .nbLongExpiredCodes(nbLongCodesExpired)
- .nbLongCodesUsed(nbLongCodesUsed)
- .nbShortCodesUsed(nbShortCodesUsed)
- .nbShortCodesGenerated(nbShortCodesGenerated)
- .build();
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/LongCodeService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/LongCodeService.java
deleted file mode 100644
index 6577a46ca4ec45249350facebfb9db86ca538ae1..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/LongCodeService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Service
-@Slf4j
-public class LongCodeService {
-
- /**
- * generate and stringify a long code
- *
- * @return A randomly generated long code
- */
- public String generateCode() {
- return (UUID.randomUUID()).toString();
- }
-
- /**
- * @param size number of code to be generated
- * @return
- */
- public List<String> generateCodes(long size) {
- return Stream.generate(this::generateCode)
- .distinct()
- .limit(size)
- .collect(Collectors.toList());
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SFTPService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SFTPService.java
deleted file mode 100644
index 7bd9f0af612360e5ae9a3e6b9b39840d0a18af60..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SFTPService.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import com.jcraft.jsch.*;
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.xml.bind.DatatypeConverter;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Base64;
-import java.util.Properties;
-
-@Slf4j
-@Service
-public class SFTPService {
-
- private static final String ALGORITHM_SHA256 = "SHA-256";
-
- public static final String DATEFORMATFILE = "yyyyMMddHHmmss";
-
- @Value("${submission.code.server.sftp.host}")
- private String host;
-
- @Value("${submission.code.server.sftp.host.port}")
- @Setter
- private int port;
-
- @Value("${submission.code.server.sftp.host.key.algorithm}")
- private String hostKeyAlgorithm;
-
- @Value("${submission.code.server.sftp.knownhosts.file}")
- private String knownHostFile;
-
- @Value("${submission.code.server.sftp.host.path}")
- private String pathFile;
-
- @Value("${submission.code.server.sftp.user}")
- private String username;
-
- @Value("${submission.code.server.sftp.key}")
- private String keyPrivate;
-
- /**
- * sftp passphrase stored in a byte array.
- */
- private byte[] passphrase;
-
- /**
- * TargetZoneId is the time zone id (in the java.time.ZoneId way) on which the
- * submission code server should deliver the codes. eg.: for France is
- * "Europe/Paris"
- */
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- @Value("${zip.filename.formatter}")
- private String zipFilenameFormat;
-
- @Value("${digest.filename.formatter.sha256}")
- private String digestFileNameFormatSHA256;
-
- @Value("${submission.code.server.sftp.enablestricthost}")
- private String strictHostCheck;
-
- public SFTPService(@Value("${submission.code.server.sftp.passphrase}") final String passphrase) {
- if (passphrase != null) {
- try {
- this.passphrase = Base64.getDecoder().decode(passphrase);
- } catch (Exception e) {
- log.error("Error trying to parse Base64 passphrase to byte[] ", e);
- this.passphrase = null;
- }
- }
- }
-
- public void transferFileSFTP(ByteArrayOutputStream file) throws SubmissionCodeServerException {
- ChannelSftp channelSftp = null;
- log.info("Transferring zip file to SFTP");
-
- try (ByteArrayInputStream inputStream = new ByteArrayInputStream(file.toByteArray())) {
-
- log.info("SFTP: connection is about to be created");
- channelSftp = createConnection();
- log.info("SFTP: connexion created");
-
- OffsetDateTime date = OffsetDateTime.now(ZoneId.of(targetZoneId));
- String dateFile = date.format(DateTimeFormatter.ofPattern(DATEFORMATFILE));
- String fileNameZip = String.format(zipFilenameFormat, dateFile);
-
- log.info("SFTP: is about to pushed the zip file.");
- pushStreamToSftp(channelSftp, inputStream, fileNameZip);
- log.info("SFTP: files have been pushed");
-
- this.createDigestThenTransferToSFTP(
- file, channelSftp, ALGORITHM_SHA256, digestFileNameFormatSHA256, dateFile
- );
- } catch (IOException e) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.UNQUALIFIED_ERROR,
- e
- );
- } finally {
- closeConnection(channelSftp);
- }
- }
-
- public void pushStreamToSftp(ChannelSftp channelSftp, InputStream inputStream, String fileNameZip) {
- try {
- channelSftp.put(inputStream, fileNameZip);
- } catch (SftpException e) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.SFTP_FILE_PUSHING_FAILED_ERROR,
- e
- );
- }
- }
-
- public void closeConnection(ChannelSftp channelSftp) {
- try {
- if (null != channelSftp) {
- log.info("SFTP: connection is about to be closed");
- channelSftp.exit();
- channelSftp.getSession().disconnect();
- log.info("SFTP: connection closed");
- }
- } catch (JSchException e) {
- throw new RuntimeException("Unable to close JschSession", e);
- }
- }
-
- /**
- * Create connection SFTP to transfer file in server. The connection is created
- * with user and private key of user.
- *
- * @return An object channelSftp.
- */
- public ChannelSftp createConnection() throws SubmissionCodeServerException {
- try {
- JSch jSch = new JSch();
-
- Session jsSession = jSch.getSession(this.username, this.host, this.port);
- jSch.addIdentity(this.keyPrivate, this.passphrase);
-
- // /!\ mandatory set the knownhosts file.
- if (StringUtils.isNotBlank(this.knownHostFile)) {
- log.info("Using known_hosts file specified in configuration: {} ", this.knownHostFile);
- jSch.setKnownHosts(this.knownHostFile);
- }
-
- Properties config = new Properties();
-
- config.put("StrictHostKeyChecking", strictHostCheck);
-
- config.put("cipher.s2c", "aes256-ctr,aes256-cbc");
- config.put("cipher.c2s", "aes256-ctr,aes256-cbc");
-
- config.put("mac.s2c", "hmac-sha2-256");
- config.put("mac.c2s", "hmac-sha2-256");
-
- config.put("kex", "ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521");
-
- // /!\ set of only one server host key algorithm
- if (StringUtils.isNotBlank(this.hostKeyAlgorithm)) {
- log.info("Using Host key algorithm specified in configuration: {} ", this.hostKeyAlgorithm);
- config.put("server_host_key", this.hostKeyAlgorithm);
- }
-
- jsSession.setConfig(config);
-
- jsSession.connect();
-
- final ChannelSftp sftp = (ChannelSftp) jsSession.openChannel("sftp");
-
- // attempting to open a jsSession.
- sftp.connect();
-
- if (StringUtils.isNotBlank(this.pathFile)) {
- sftp.cd(this.pathFile);
- }
-
- return sftp;
- } catch (JSchException jshe) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.JSCH_SESSION_CREATION_FAILED_ERROR,
- jshe
- );
- } catch (SftpException e) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.SFTP_WORKING_DIRECTORY_ERROR,
- e
- );
- }
-
- }
-
- /**
- * Create sha256 from file already uploaded on the SFTP Server and transfers
- * sha256 to SFTP server.
- *
- * @param file the file from the sha256 should be generated.
- * @param channelSftp already opened channel. Should be an open connection.
- * @throws SubmissionCodeServerException if an error occurs at sha256
- * instantiation or if the sha256 file
- * cannot be pushed to SFTP server
- */
- private void createDigestThenTransferToSFTP(final ByteArrayOutputStream file, final ChannelSftp channelSftp,
- String algorithm, String digestFileNameFormat, String dateFile) throws SubmissionCodeServerException {
- log.info("Transferring digest file to SFTP");
-
- try {
- // Formatting the name of the digest file
- String fileNameDigest = String.format(digestFileNameFormat, dateFile);
-
- MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
- byte[] hash = messageDigest.digest(file.toByteArray());
-
- byte[] data = DatatypeConverter
- .printHexBinary(hash)
- .toLowerCase()
- .getBytes(StandardCharsets.UTF_8);
-
- log.info("SFTP: is about to pushed the digest file. {}", fileNameDigest);
- channelSftp.put(new ByteArrayInputStream(data), fileNameDigest);
- log.info("SFTP: files have been pushed");
-
- } catch (SftpException | NoSuchAlgorithmException e) {
- log.error(SubmissionCodeServerException.ExceptionEnum.SFTP_FILE_PUSHING_FAILED_ERROR.getMessage(), e);
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.SFTP_FILE_PUSHING_FAILED_ERROR,
- e
- );
- }
-
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierService.java
deleted file mode 100644
index a384fa6e17094bc4be52252d2c4d9835434ba858..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.data.entity.SequenceFichier;
-import fr.gouv.stopc.submission.code.server.data.repository.SequenceFichierRepository;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-import java.util.Optional;
-
-@Service
-public class SequenceFichierService {
-
- private final SequenceFichierRepository repository;
-
- @Inject
- public SequenceFichierService(SequenceFichierRepository repository) {
- this.repository = repository;
- }
-
- public Optional<SequenceFichier> getSequence(OffsetDateTime date) {
-
- if (Objects.nonNull(date)) {
- return Optional.ofNullable(
- this.repository
- .findByAnneeAndMoisAndJour(date.getYear(), date.getMonthValue(), date.getDayOfMonth())
- .map(sequenceFichier -> {
- sequenceFichier.setSequence(sequenceFichier.getSequence() + 1);
- this.repository.saveAndFlush(sequenceFichier);
- return sequenceFichier;
- })
- .orElseGet(() -> this.createSequence(date))
- );
- }
- return Optional.empty();
- }
-
- private SequenceFichier createSequence(OffsetDateTime date) {
- int shortYear = (date.getYear() % 100);
- int sequence = (shortYear + 1) % 100;
- return this.repository.saveAndFlush(
- SequenceFichier.builder()
- .annee(date.getYear())
- .mois(date.getMonthValue())
- .jour(date.getDayOfMonth())
- .sequence(sequence).build()
- );
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ShortCodeService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ShortCodeService.java
deleted file mode 100644
index a877f2411015cdea74f44c8c78c9aa1a4dfba8de..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ShortCodeService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class ShortCodeService {
-
- private static final String ALPHA_UPPER_CASE = "abcdefghijklmnopqrstuvwxyz".toUpperCase();
-
- private static final String NUMERIC = "0123456789";
-
- private static final Integer CODE_SIZE = 6;
-
- private static final SecureRandom sRandom = new SecureRandom();
-
- private static final List<Character> ALPHA_NUMERIC_CHAR_ARRAY = String
- .format(
- "%s%s",
- ALPHA_UPPER_CASE,
- NUMERIC
- )
- .chars()
- .mapToObj(c -> (char) c)
- .collect(Collectors.toList());
-
- /**
- * generate and stringify short code
- *
- * @return A randomly generated code of insensitive case alphanumeric char
- */
- public String generateCode() {
- log.info("Generating random short code");
- final List<Character> characters = getShuffledAlphaNumList();
-
- /**
- * The function sRandom.nexInt(i) create a number random from 0 to i-1. The
- * StringBuilder is more performing than string+=string.tu
- */
- StringBuilder alphaNum = new StringBuilder();
- for (int i = 0; i < CODE_SIZE; i++) {
- alphaNum.append(characters.get(sRandom.nextInt(ALPHA_NUMERIC_CHAR_ARRAY.size())));
- }
- return alphaNum.toString();
- }
-
- /**
- * @return return a shuffled copy of ALPHA_NUMERIC_CHAR_ARRAY
- */
- static List<Character> getShuffledAlphaNumList() {
- final ArrayList<Character> tempAlphaNumList = new ArrayList<>(ALPHA_NUMERIC_CHAR_ARRAY);
- Collections.shuffle(tempAlphaNumList, sRandom);
- return tempAlphaNumList;
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SubmissionCodeService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SubmissionCodeService.java
deleted file mode 100644
index 0b4017ef31769d2b766f24c73efc7c7e9df64698..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/SubmissionCodeService.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.apache.logging.log4j.util.Strings;
-import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import javax.validation.Valid;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Service
-@Valid
-public class SubmissionCodeService {
-
- private SubmissionCodeRepository submissionCodeRepository;
-
- @Value("${generation.code.security.shortcode.hours}")
- private Integer securityTimeBetweenTwoUsagesOfShortCode;
-
- @Inject
- public SubmissionCodeService(SubmissionCodeRepository submissionCodeRepository) {
- this.submissionCodeRepository = submissionCodeRepository;
- }
-
- public Optional<SubmissionCodeDto> getCodeValidity(String code) {
- if (Strings.isBlank(code)) {
- return Optional.empty();
- }
- SubmissionCode submissionCode = submissionCodeRepository.findByCode(code);
- if (Objects.isNull(submissionCode)) {
- return Optional.empty();
- }
- ModelMapper modelMapper = new ModelMapper();
- SubmissionCodeDto submissionCodeDto = modelMapper.map(submissionCode, SubmissionCodeDto.class);
- return Optional.of(submissionCodeDto);
- }
-
- public Iterable<SubmissionCode> saveAllCodes(List<SubmissionCodeDto> submissionCodeDtos) {
- return this.saveAllCodes(submissionCodeDtos, new Lot());
- }
-
- public Iterable<SubmissionCode> saveAllCodes(List<SubmissionCodeDto> submissionCodeDtos, Lot lot) {
- if (submissionCodeDtos.isEmpty()) {
- return Collections.emptyList();
- }
- ModelMapper modelMapper = new ModelMapper();
- List<SubmissionCode> submissionCodes = submissionCodeDtos.stream()
- .map(tmp -> {
- final SubmissionCode sc = modelMapper.map(tmp, SubmissionCode.class);
- sc.setLotkey(lot);
- return sc;
- })
- .collect(Collectors.toList());
- return submissionCodeRepository.saveAll(submissionCodes);
- }
-
- public Optional<SubmissionCode> saveCode(SubmissionCodeDto submissionCodeDto) {
- if (Objects.isNull(submissionCodeDto)) {
- return Optional.empty();
- }
- ModelMapper modelMapper = new ModelMapper();
- SubmissionCode submissionCode = modelMapper.map(submissionCodeDto, SubmissionCode.class);
- return Optional.of(submissionCodeRepository.save(submissionCode));
- }
-
- public Optional<SubmissionCode> saveCode(SubmissionCodeDto submissionCodeDto, Lot lot) {
- if (Objects.isNull(submissionCodeDto)) {
- return Optional.empty();
- }
- ModelMapper modelMapper = new ModelMapper();
-
- SubmissionCode submissionCodeToSave = modelMapper.map(submissionCodeDto, SubmissionCode.class);
- submissionCodeToSave.setLotkey(lot);
-
- try {
- // try to save data
- return Optional.of(submissionCodeRepository.save(submissionCodeToSave));
-
- } catch (DataIntegrityViolationException divExcetion) {
-
- // if Unique code exists for short code try to update
- if (securityTimeBetweenTwoUsagesOfShortCode != null
- && CodeTypeEnum.SHORT.isTypeOrTypeCodeOf(submissionCodeToSave.getType())) {
- SubmissionCode sc = this.submissionCodeRepository.findByCodeAndTypeAndAndDateEndValidityLessThan(
- submissionCodeToSave.getCode(),
- submissionCodeToSave.getType(),
- submissionCodeToSave.getDateAvailable()
- .minusHours(
- securityTimeBetweenTwoUsagesOfShortCode
- )
- );
- if (sc != null) {
- // replace actual line by new code
- submissionCodeToSave.setId(sc.getId());
- return Optional.of(this.submissionCodeRepository.save(submissionCodeToSave));
- }
- }
- // if update is not made throw the original exception
- throw divExcetion;
- }
-
- }
-
- public boolean updateCodeUsed(SubmissionCodeDto submissionCodeDto) {
- String code = submissionCodeDto.getCode();
- SubmissionCode submissionCode = submissionCodeRepository.findByCode(code);
- if (Objects.isNull(submissionCode)) {
- return false;
- }
- submissionCode.setDateUse(submissionCodeDto.getDateUse());
- submissionCode.setUsed(true);
- submissionCodeRepository.save(submissionCode);
- return true;
- }
-
- /**
- * Return number of code for the given lot identifier.
- *
- * @param lotIdentifier lot identifier in db
- * @return return number of code with the given lot identifier
- */
- public long getNumberOfCodesForLotIdentifier(long lotIdentifier) {
- return this.submissionCodeRepository.countSubmissionCodeByLotkeyId(lotIdentifier);
- }
-
- /**
- * Get specific range of code rows
- *
- * @param lotIdentifier lot identifier the codes should be matched
- * @param page page number
- * @param elementsByPage the row page the list ends.
- * @return list of code page row "page" elementsByPage rows "elementsByPage"
- * e.g. : page = 10 and elementsByPage = 12 , size list is 3 and has
- * only row 10, 11, 12
- */
- public Page<SubmissionCode> getSubmissionCodesFor(long lotIdentifier, int page, int elementsByPage) {
- return this.submissionCodeRepository
- .findAllByLotkeyId(lotIdentifier, PageRequest.of(page, elementsByPage));
- }
-
- public void removeByLot(Lot lot) {
- this.submissionCodeRepository.deleteAllByLotkey(lot);
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/VerifyService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/VerifyService.java
deleted file mode 100644
index da2e4179247e776e2ca458d96966839311ac3b84..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/VerifyService.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-import java.util.Optional;
-
-@Service
-@Slf4j
-public class VerifyService {
-
- private SubmissionCodeService submissionCodeService;
-
- /**
- * Default constructor spring-injecting the needed services.
- *
- * @param submissionCodeService service from the database module permitting to
- * interface with the data base.
- */
- @Inject
- public VerifyService(SubmissionCodeService submissionCodeService) {
- this.submissionCodeService = submissionCodeService;
- }
-
- /**
- * Method should be used to know if the code in parameter has been used or if it
- * is still valid.
- *
- * @param code The code value to verify
- * @return return the validity of the code.
- */
- public boolean verifyCode(String code) {
- Optional<CodeTypeEnum> typeToFound = CodeTypeEnum.searchMatchLength(code.length());
-
- if (!typeToFound.isPresent()) {
- log.warn("Code {} size is incorrect.", code);
- return false;
- }
-
- CodeTypeEnum codeTypeEnum = typeToFound.get();
- if (!codeTypeEnum.matchPattern(code)) {
- log.warn("Code {} doesn't respect the pattern of {}.", code, codeTypeEnum.getType());
- return false;
- }
-
- String type = codeTypeEnum.getTypeCode();
- Optional<SubmissionCodeDto> codeDtoOptional = submissionCodeService.getCodeValidity(code);
-
- if (!codeDtoOptional.isPresent()) {
- log.warn("Code {} ({}) was not found.", code, type);
- return false;
- }
-
- SubmissionCodeDto codeDto = codeDtoOptional.get();
-
- if (codeDto.getUsed().equals(Boolean.TRUE) || Objects.nonNull(codeDto.getDateUse())) {
- log.warn("Code {} ({}) has already been used.", code, type);
- return false;
- }
-
- ZoneOffset zoneOffset = codeDto.getDateAvailable().getOffset();
- OffsetDateTime dateNow = LocalDateTime.now().atOffset(zoneOffset);
-
- if (!validateDate(code, type, dateNow, codeDto.getDateAvailable(), codeDto.getDateEndValidity())) {
- log.warn("Code {} ({}) rejected because outside acceptable validity range.", code, type);
- return false;
- }
-
- codeDto.setUsed(true);
- codeDto.setDateUse(dateNow);
- final boolean isUpdated = submissionCodeService.updateCodeUsed(codeDto);
-
- if (isUpdated) {
- log.info("Code {} ({}) has been updated successfully.", code, type);
- } else {
- log.error("Code {} ({}) could not be updated.", code, type);
- }
- return isUpdated;
- }
-
- /**
- * A code cannot be used before he is valid or after it has expired.
- */
- private boolean validateDate(String code,
- String type,
- OffsetDateTime dateNow,
- OffsetDateTime dateAvailable,
- OffsetDateTime dateEndValidity) {
- if (Objects.isNull(dateAvailable) || Objects.isNull(dateEndValidity)) {
- log.info(
- "Code {} ({}) does not have a complete validity period (start date or end date missing)",
- code,
- type
- );
- return false;
- }
-
- if (dateNow.isBefore(dateAvailable)) {
- log.info(
- "Code {} ({}) being used before validity period start {}.",
- code,
- type,
- dateAvailable
- );
- return false;
- } else if (dateNow.isAfter(dateEndValidity)) {
- log.info(
- "Code {} ({}) being used after validity period end {}.",
- code,
- type,
- dateEndValidity
- );
- return false;
- } else {
- return true;
- }
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ViewsService.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ViewsService.java
deleted file mode 100644
index ca2586bf33f4d2262f1a9676b4609bd7a5ec0e3f..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/ViewsService.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.ViewDto;
-import fr.gouv.stopc.submission.code.server.business.vo.ViewVo;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
-
-import java.time.OffsetDateTime;
-import java.util.stream.Collectors;
-
-@Service
-public class ViewsService {
-
- private final SubmissionCodeService submissionCodeService;
-
- private final FileService fileExportService;
-
- /**
- * Default constructor
- *
- * @param submissionCodeService Spring-injection of the shortCodeService giving
- * access to persistence in db.
- */
- @Inject
- public ViewsService(SubmissionCodeService submissionCodeService,
- FileService fileExportService) {
- this.submissionCodeService = submissionCodeService;
- this.fileExportService = fileExportService;
- }
-
- /**
- * The method returns the information as number of codes .
- *
- * @return ViewDto.LotInformation
- */
- public ViewDto.LotInformation getLotInformation(long lotIdentifier) throws SubmissionCodeServerException {
- final long numOfCodes = this.submissionCodeService
- .getNumberOfCodesForLotIdentifier(lotIdentifier);
-
- return ViewDto.LotInformation.builder()
- .lotIdentifier(lotIdentifier)
- .numberOfCodes(numOfCodes)
- .build();
- }
-
- /**
- * The method returns the information as number page, as number elements for
- * page and list of codes.
- */
- public ViewDto.CodeValuesForPage getViewLotCodeDetailListFor(
- int page,
- int elementByPage,
- long lotIdentifier)
- throws SubmissionCodeServerException {
- final Page<SubmissionCode> submissionCodesPage = this.submissionCodeService.getSubmissionCodesFor(
- lotIdentifier,
- page - 1,
- elementByPage
- );
-
- if (submissionCodesPage == null ||
- submissionCodesPage.getTotalElements() < 1 ||
- submissionCodesPage.getTotalPages() < 1) {
- throw new SubmissionCodeServerException(
- SubmissionCodeServerException.ExceptionEnum.DB_INVALID_PARAMETERS_ERROR
- );
- }
-
- return ViewDto.CodeValuesForPage.builder()
- .actualPage(submissionCodesPage.getNumber() + 1)
- .lastPage(submissionCodesPage.getTotalPages())
- .maxByPage(submissionCodesPage.getNumberOfElements())
- .lot(lotIdentifier)
- .codes(
- submissionCodesPage.toList().stream()
- .map(
- sc -> ViewDto.CodeDetail.builder()
- .code(sc.getCode())
- .build()
- )
- .collect(Collectors.toList())
- )
- .build();
- }
-
- /**
- * The method launch the generation code with the dates from and to and number
- * of codes for day.
- *
- * @return ViewDto.CodeGenerationRequest defining if the request has been
- * successfully or not successfully submitted.
- */
- public ViewDto.CodeGenerationRequest launchGenerationWith(
- ViewVo.CodeGenerationRequestBody codeGenerationRequestBody) throws SubmissionCodeServerException {
-
- @NotNull
- final Long codePerDay = codeGenerationRequestBody.getDailyAmount();
- @NotNull
- final OffsetDateTime from = codeGenerationRequestBody.getFrom();
- @NotNull
- OffsetDateTime to = codeGenerationRequestBody.getTo();
-
- Lot newLot = new Lot();
- newLot.setNumberOfCodes(codePerDay.intValue());
- newLot.setDateExecution(OffsetDateTime.now());
- this.fileExportService.zipExportAsync(
- codePerDay,
- newLot,
- from.toString(),
- to.toString()
- );
-
- return ViewDto.CodeGenerationRequest.builder()
- .isSubmitted(true)
- .message("data have been successfully saved !")
- .build();
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/DailyGenerateSchedule.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/DailyGenerateSchedule.java
deleted file mode 100644
index be9d9512cd435461f989c3b23e664fb6fb374780..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/DailyGenerateSchedule.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service.schedule;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.service.FileService;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.time.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import static java.time.temporal.ChronoUnit.DAYS;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class DailyGenerateSchedule {
-
- private static final int TEN_DAYS = 10;
-
- private final SubmissionCodeRepository submissionCodeRepository;
-
- private final FileService fileService;
-
- private final GenerationConfigProperties generationConfig;
-
- private List<GenerationRequest> generationRequestList;
-
- public void dailyProductionCodeScheduler() {
- log.info("Start dailyProductionCodeScheduler");
-
- computeAndGenerateRequestList();
-
- try {
- generateCodesAndExportToSftp();
- } catch (SubmissionCodeServerException e) {
- log.error("Unexpected error occurred", e);
- }
-
- purgeUnusedCodes();
-
- log.info("End dailyProductionCodeScheduler");
- }
-
- protected OffsetDateTime getMidnight() {
- return Instant.now()
- .atZone(ZoneId.of("Europe/Paris"))
- .truncatedTo(DAYS)
- .toOffsetDateTime();
- }
-
- /**
- * Compute for each ten next days how many tar.gz we have to do after, generate
- * and save the result in a list of objects representing the requests.
- */
- private void computeAndGenerateRequestList() {
- log.info("SCHEDULER : Start computeAndGenerateRequestList");
- OffsetDateTime currentDate = getMidnight();
- generationRequestList = new ArrayList<>();
-
- for (int i = 0; i <= TEN_DAYS; i++) {
- final OffsetDateTime startDateTime = currentDate;
-
- Integer dailyProductionTarget = generationConfig.getDailyProductionTarget(startDateTime);
- var numberOfAvailableCodes = this.submissionCodeRepository
- .countAllByTypeAndDateAvailableEquals(CodeTypeEnum.LONG.getTypeCode(), startDateTime);
- log.info(
- "SCHEDULER : We have to produce {} codes for day {}", dailyProductionTarget,
- startDateTime.toString()
- );
- var numberOfCodeToGenerate = dailyProductionTarget - numberOfAvailableCodes;
- Long fragmentRemainingToGenerate = numberOfCodeToGenerate % generationConfig.getMaxbatchsize();
- var numberOfFullBatch = Math.toIntExact(numberOfCodeToGenerate / generationConfig.getMaxbatchsize());
-
- OffsetDateTime endDateTime = startDateTime.plusDays(1);
-
- // Batchs with max size
- for (long batchNumber = 0; batchNumber < numberOfFullBatch; batchNumber++) {
- updateOrCreateRequest(batchNumber, generationConfig.getMaxbatchsize(), startDateTime, endDateTime);
- }
- // Batch with less than max size
- if (fragmentRemainingToGenerate > 0) {
- updateOrCreateRequest(null, fragmentRemainingToGenerate.intValue(), startDateTime, endDateTime);
- }
-
- currentDate = currentDate.plusDays(1);
- }
- }
-
- private void updateOrCreateRequest(Long iterationBatchNumber,
- Integer numberOfCodeToGenerate,
- OffsetDateTime startDateTime,
- OffsetDateTime endDateTime) {
- boolean updated = false;
- // Update
- for (GenerationRequest gr : generationRequestList) {
- if (gr.getNumberOfCodeToGenerate().equals(numberOfCodeToGenerate)
- && (null == gr.getIterationBatchNumber()
- || gr.getIterationBatchNumber().equals(iterationBatchNumber))) {
- gr.setEndDateTime(endDateTime);
- updated = true;
- break;
- }
- }
- // Create
- if (!updated) {
- generationRequestList.add(
- GenerationRequest.builder()
- .numberOfCodeToGenerate(numberOfCodeToGenerate)
- .startDateTime(startDateTime)
- .endDateTime(endDateTime)
- .iterationBatchNumber(iterationBatchNumber)
- .build()
- );
- }
- }
-
- private void generateCodesAndExportToSftp() throws SubmissionCodeServerException {
- for (GenerationRequest generationRequest : generationRequestList) {
- Lot newLot = new Lot();
- newLot.setNumberOfCodes(generationRequest.getNumberOfCodeToGenerate());
- newLot.setDateExecution(OffsetDateTime.now());
- this.fileService.schedulerZipExport(
- Long.valueOf(generationRequest.getNumberOfCodeToGenerate()),
- newLot,
- generationRequest.getStartDateTime(),
- generationRequest.getEndDateTime()
- );
- }
- }
-
- /**
- * Purge unused codes no more valid since two months
- */
- public void purgeUnusedCodes() {
- log.info("SCHEDULER : Start purge unused codes");
- OffsetDateTime dateEndValidityAfter = OffsetDateTime.now().minusDays(2);
- submissionCodeRepository
- .deleteAllByUsedFalseAndDateEndValidityBefore(
- dateEndValidityAfter
- );
- log.info("SCHEDULER : End deletion of codes with a validity date of more than two months deleted");
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigProperties.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigProperties.java
deleted file mode 100644
index 8ab2bbf9513575e947156acffe9023bfc59c9d9c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigProperties.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service.schedule;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import java.time.OffsetDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "submission.code.server.cron")
-public class GenerationConfigProperties {
-
- List<GenerationConfig> scheduling;
-
- Integer maxbatchsize;
-
- /**
- * Return the daily production target of current startDateTime from the
- * properties files
- *
- * @param startDateTime current startDateTime
- * @return long dailyProductionTarget
- */
- public Integer getDailyProductionTarget(OffsetDateTime startDateTime) {
- Collections.sort(getScheduling());
- Integer dailyProductionTarget = 0;
- Optional<GenerationConfig> config = getScheduling().stream().filter(
- c -> c.getStartDate().isBefore(startDateTime) || c.getStartDate().isEqual(startDateTime)
- ).reduce((f, s) -> s);
-
- if (config.isPresent()) {
- dailyProductionTarget = config.get().getDailyProduction();
- }
- return dailyProductionTarget;
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- public static class GenerationConfig implements Comparable<GenerationConfig> {
-
- OffsetDateTime startDate;
-
- Integer dailyProduction;
-
- @Override
- public int compareTo(GenerationConfig o) {
- return getStartDate().compareTo(o.getStartDate());
- }
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationRequest.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationRequest.java
deleted file mode 100644
index 68f4985de74f160392fd9ab47c8104f821d71100..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationRequest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service.schedule;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.time.OffsetDateTime;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@SuperBuilder
-public class GenerationRequest {
-
- private OffsetDateTime startDateTime;
-
- private OffsetDateTime endDateTime;
-
- private Integer numberOfCodeToGenerate;
-
- private Long iterationBatchNumber;
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/vo/ViewVo.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/vo/ViewVo.java
deleted file mode 100644
index 17778c3e5de4e6974fac1a640b7c0c5c81741656..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/business/vo/ViewVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.vo;
-
-import fr.gouv.stopc.submission.code.server.domain.annotations.CodePerDay;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import java.time.OffsetDateTime;
-
-public class ViewVo {
-
- private ViewVo() {
- super();
- }
-
- @AllArgsConstructor
- @NoArgsConstructor
- @Data
- @Builder
- @Valid
- public static class CodeGenerationRequestBody {
-
- @NotNull
- // @PresentOrFutureTruncateDay
- private OffsetDateTime from;
-
- @NotNull
- // @PresentOrFutureTruncateDay
- private OffsetDateTime to;
-
- @NotNull
- @CodePerDay
- private long dailyAmount;
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/Lot.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/Lot.java
deleted file mode 100644
index cfe540c4576bd41014c59d4101fcde5ba5d17ff2..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/Lot.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.entity;
-
-import lombok.Data;
-
-import javax.persistence.*;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Entity
-@Table(name = "lot_keys")
-public class Lot {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- @Column(name = "date_execution", nullable = false, columnDefinition = "timestamp default CURRENT_TIMESTAMP")
- private OffsetDateTime dateExecution = OffsetDateTime.now();
-
- @Column(name = "number_of_codes", nullable = false, columnDefinition = "int default 0")
- private Integer numberOfCodes = 0;
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SequenceFichier.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SequenceFichier.java
deleted file mode 100644
index c27773ce0ff5e55475b3eb73d350a9d24c60ead9..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SequenceFichier.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Data
-@Entity
-@Table(name = "seq_fichier")
-public class SequenceFichier {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- @Column(name = "annee", nullable = false)
- private int annee;
-
- @Column(name = "mois", nullable = false)
- private int mois;
-
- @Column(name = "jour", nullable = false)
- private int jour;
-
- @Column(name = "sequence", nullable = false)
- private int sequence;
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/ShedLockEntity.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/ShedLockEntity.java
deleted file mode 100644
index ace23a33904e683530eda58b708ac08aee742fa2..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/ShedLockEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.entity;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import java.sql.Timestamp;
-import java.time.Instant;
-
-@Data
-@Entity
-@Table(name = "shedlock")
-public class ShedLockEntity {
-
- @Id
- @Column(name = "name", nullable = false)
- private String name = "";
-
- @Column(name = "lock_until", nullable = false)
- private Timestamp lock_until = Timestamp.from(Instant.now());
-
- @Column(name = "locked_at", nullable = false)
- private Timestamp locked_at = Timestamp.from(Instant.now());
-
- @Column(name = "locked_by", nullable = false)
- private String locked_by = "";
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SubmissionCode.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SubmissionCode.java
deleted file mode 100644
index 3b7af6a295cb5591293bc243cc3660b58bd58b2d..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/entity/SubmissionCode.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.entity;
-
-import lombok.Data;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-import javax.persistence.*;
-
-import java.time.OffsetDateTime;
-
-@Data
-@Entity
-@Table(name = "submission_code")
-public class SubmissionCode {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private long id;
-
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @OnDelete(action = OnDeleteAction.CASCADE)
- private Lot lotkey;
-
- @Column(name = "code", nullable = false, unique = true)
- private String code;
-
- @Column(name = "type_code", nullable = false)
- private String type;
-
- @Column(name = "date_end_validity", nullable = false)
- private OffsetDateTime dateEndValidity;
-
- @Column(name = "date_available", nullable = false)
- private OffsetDateTime dateAvailable;
-
- @Column(name = "date_use")
- private OffsetDateTime dateUse;
-
- @Column(name = "date_generation", nullable = false)
- private OffsetDateTime dateGeneration;
-
- @Column(name = "used", nullable = false)
- private Boolean used;
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SequenceFichierRepository.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SequenceFichierRepository.java
deleted file mode 100644
index 1d1c139746f49beda248796765bbfd6cfd879f60..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SequenceFichierRepository.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.repository;
-
-import fr.gouv.stopc.submission.code.server.data.entity.SequenceFichier;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface SequenceFichierRepository extends JpaRepository<SequenceFichier, Long> {
-
- Optional<SequenceFichier> findByAnnee(int annee);
-
- Optional<SequenceFichier> findByAnneeAndMoisAndJour(int annee, int mois, int jour);
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SubmissionCodeRepository.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SubmissionCodeRepository.java
deleted file mode 100644
index 6c5614b7a2bf039ac6b61bc7f5c16bde2fe5d9e9..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/data/repository/SubmissionCodeRepository.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package fr.gouv.stopc.submission.code.server.data.repository;
-
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.OffsetDateTime;
-
-public interface SubmissionCodeRepository extends PagingAndSortingRepository<SubmissionCode, Long> {
-
- SubmissionCode findByCode(String code);
-
- /**
- * count number of codes in db for the given lot identifier.
- *
- * @param lotIdentifier lot identifier in db
- * @return count number of codes in db for the given lot identifier.
- */
- long countSubmissionCodeByLotkeyId(long lotIdentifier);
-
- Page<SubmissionCode> findAllByLotkeyId(long lotIdentifier, Pageable pageable);
-
- SubmissionCode findByCodeAndTypeAndAndDateEndValidityLessThan(String code, String type,
- OffsetDateTime validityLessThanDate);
-
- void deleteAllByLotkey(Lot lotkey);
-
- long countAllByTypeAndDateAvailableEquals(String type, OffsetDateTime dateFrom);
-
- long countAllByTypeAndDateEndValidityBefore(String type, OffsetDateTime dateFrom);
-
- @Transactional
- @Modifying
- @Query("DELETE FROM SubmissionCode s where s.used = false and s.dateEndValidity < :dateEndValidity")
- void deleteAllByUsedFalseAndDateEndValidityBefore(OffsetDateTime dateEndValidity);
-
- /**
- * The method serches the used codes from fromDate until dateTo of type
- *
- * @param dateFrom
- * @param dateTo
- * @param type
- * @return
- */
- @Query("SELECT COUNT(*) FROM SubmissionCode s where s.type = :type and s.dateUse >= :fromDate and s.dateUse < :toDate")
- long countSubmissionCodeUsedByDate(@Param("fromDate") OffsetDateTime dateFrom,
- @Param("toDate") OffsetDateTime dateTo, @Param("type") String type);
-
- /**
- * @param dateTime
- * @param type
- * @return
- */
- @Query("SELECT COUNT(*) FROM SubmissionCode s where s.dateUse is NULL and s.type = :type and s.dateEndValidity < :dateExpire")
- long countSubmissionCodeExpiredDate(@Param("dateExpire") OffsetDateTime dateTime, @Param("type") String type);
-
- @Query("SELECT COUNT(*) FROM SubmissionCode s where s.type = :type and s.dateGeneration >= :startDate and s.dateGeneration < :endDate")
- long countGeneratedCodes(@Param("startDate") OffsetDateTime startDate, @Param("endDate") OffsetDateTime endDate,
- @Param("type") String type);
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodePerDay.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodePerDay.java
deleted file mode 100644
index e67d26ff463273f21ed99909feaf3031932a0434..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodePerDay.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.annotations;
-
-import fr.gouv.stopc.submission.code.server.domain.validators.CodePerDayValidator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({ FIELD })
-@Retention(RUNTIME)
-@Documented
-@Constraint(validatedBy = { CodePerDayValidator.class })
-/**
- * @see CodePerDayValidator description
- */
-public @interface CodePerDay {
-
- String message() default "{value} error";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodeType.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodeType.java
deleted file mode 100644
index 87fec813106c623b64cb980259458c0f6708a7b5..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/CodeType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.annotations;
-
-import fr.gouv.stopc.submission.code.server.domain.validators.CodeTypeValidator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({ FIELD })
-@Retention(RUNTIME)
-@Documented
-@Constraint(validatedBy = { CodeTypeValidator.class })
-/**
- * @see CodeTypeValidator description
- */
-public @interface CodeType {
-
- String message() default "{value} is not an instance of TypeEnum";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/PresentOrFutureTruncateDay.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/PresentOrFutureTruncateDay.java
deleted file mode 100644
index 59a6073ed2550c61f625028f1ad4d929418b3525..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/annotations/PresentOrFutureTruncateDay.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.annotations;
-
-import fr.gouv.stopc.submission.code.server.domain.validators.PresentOrFutureTruncateDayValidator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Target({ FIELD })
-@Retention(RUNTIME)
-@Documented
-@Constraint(validatedBy = { PresentOrFutureTruncateDayValidator.class })
-public @interface PresentOrFutureTruncateDay {
-
- String message() default "{value} is not an instance of TypeEnum";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/enums/CodeTypeEnum.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/enums/CodeTypeEnum.java
deleted file mode 100644
index a26cdb9902bc4d0ec7c3c690796d358b64719c4d..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/enums/CodeTypeEnum.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.enums;
-
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-@Getter
-public enum CodeTypeEnum {
-
- LONG("1", "UUIDv4", Pattern.LONG, 36),
- SHORT("2", "6-alphanum", Pattern.SHORT, 6),
- TEST("3", "12-aphanum", Pattern.TEST, 12);
-
- /**
- * type code is an numeric in string (ex. "1")
- */
- private final String typeCode;
-
- /**
- * type is the name of the code type. (ex. "UUIDv4")
- */
- private final String type;
-
- /**
- * pattern code matching regexp
- */
- private final String pattern;
-
- /**
- * length int
- */
- private final int length;
-
- /**
- * Default and only constructor
- *
- * @param typeCode {@link #typeCode}
- * @param type {@link #type}
- */
- CodeTypeEnum(final String typeCode, final String type, final String pattern, final int length) {
- this.typeCode = typeCode;
- this.type = type;
- this.pattern = pattern;
- this.length = length;
- }
-
- public static Optional<CodeTypeEnum> searchMatchType(String type) {
- for (CodeTypeEnum et : Arrays.asList(values())) {
- if (et.isTypeOrTypeCodeOf(type))
- return Optional.of(et);
- }
- return Optional.empty();
- }
-
- /**
- * Method equals get a string (ex. "1" or "UUIDv4") to know if the enum is
- * corresponding to the value.
- *
- * @param typeOrTypeCode (ex. "1" or "UUIDv4") value to test if the enum is
- * corresponding to "typeOrTypeCode"
- * @return if the enum is corresponding to the parameter in method returned
- * value is "true" otherwise returned value is "false"
- */
- public final Boolean isTypeOrTypeCodeOf(String typeOrTypeCode) {
- return this.type.equals(typeOrTypeCode) || this.typeCode.equals(typeOrTypeCode);
- }
-
- public static Optional<CodeTypeEnum> searchMatchLength(int length) {
- for (CodeTypeEnum et : Arrays.asList(values())) {
- if (et.isOfLength(length)) {
- return Optional.of(et);
- }
- }
- return Optional.empty();
- }
-
- public final Boolean matchPattern(String code) {
- return code.matches(this.pattern);
- }
-
- public final Boolean isOfLength(int length) {
- return (this.length == length);
- }
-
- /**
- * Static method exists get a string (ex. "1" or "UUIDv4") to know if an enum is
- * corresponding to the value. It uses the methode
- * {@link #isTypeOrTypeCodeOf(String)} to check the value.
- *
- * @param typeOrTypeCode (ex. "1" or "UUIDv4") value to test if the enum is
- * corresponding to "typeOrTypeCode"
- * @return if an enum is corresponding to the parameter in method returned value
- * is "true" otherwise returned value is "false"
- */
- public static final Boolean exists(final String typeOrTypeCode) {
- Optional<CodeTypeEnum> matchType = searchMatchType(typeOrTypeCode);
- return matchType.isPresent();
- }
-
- public interface Pattern {
-
- String SHORT = "([a-zA-Z0-9]{6})";
-
- String LONG = "([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8})";
-
- String TEST = "([a-zA-Z0-9]{12})";
- }
-
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/utils/FormatDatesKPI.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/utils/FormatDatesKPI.java
deleted file mode 100644
index df2f14f3712098973e6825616e966fb8c77446f2..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/utils/FormatDatesKPI.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.utils;
-
-import java.time.*;
-
-public final class FormatDatesKPI {
-
- /**
- * The method calculates the date dateTmpTo in UTC. This date uses for search
- * the KPI (codes used or expired until this date).
- *
- * @param dateTmpTo
- * @param targetZoneId
- * @return
- */
- public static OffsetDateTime normaliseDateTo(LocalDate dateTmpTo, String targetZoneId) {
- LocalDateTime localDateTimeToStart = dateTmpTo.plusDays(1L).atStartOfDay();
- ZoneOffset zoneOffset = OffsetDateTime.now(ZoneId.of(targetZoneId)).getOffset();
- OffsetDateTime dateToZone = OffsetDateTime.of(localDateTimeToStart, zoneOffset);
- return dateToZone.withOffsetSameInstant(ZoneOffset.UTC);
- }
-
- /**
- * The method calculates the date dateFrom in UTC. This date uses for search the
- * KPI (codes used since this date).
- *
- * @param dateFrom
- * @param targetZoneId
- * @return
- */
- public static OffsetDateTime normaliseDateFrom(LocalDate dateFrom, String targetZoneId) {
- ZoneOffset zoneOffset = OffsetDateTime.now(ZoneId.of(targetZoneId)).getOffset();
- LocalDateTime localDateTimeStart = dateFrom.atStartOfDay();
- OffsetDateTime dateBeginZone = OffsetDateTime.of(localDateTimeStart, zoneOffset);
- return dateBeginZone.withOffsetSameInstant(ZoneOffset.UTC);
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodePerDayValidator.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodePerDayValidator.java
deleted file mode 100644
index 51102ebd2ba9aaa5ce18baf08a56da7411b5308d..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodePerDayValidator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.validators;
-
-import fr.gouv.stopc.submission.code.server.domain.annotations.CodePerDay;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-@Slf4j
-public class CodePerDayValidator implements ConstraintValidator<CodePerDay, Long> {
-
- @Value("${generation.code.per.day.max}")
- Long maxCodePerDay;
-
- @Value("${generation.code.per.day.min}")
- Long minCodePerDay;
-
- /**
- * Validate codePerDay value. It should be contained between code.per.day.max
- * and code.per.day.min
- *
- * @param codePerDay code type to test
- * @return return true if code type to test corresponding to a CodeTypeEnum.
- */
- @Override
- public boolean isValid(Long codePerDay, ConstraintValidatorContext constraintValidatorContext) {
- return codePerDay != null && minCodePerDay <= codePerDay && codePerDay <= maxCodePerDay;
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodeTypeValidator.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodeTypeValidator.java
deleted file mode 100644
index 814b944bfd9feb78fec155a0f881b4d9641496ae..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/CodeTypeValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.validators;
-
-import fr.gouv.stopc.submission.code.server.domain.annotations.CodeType;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-/**
- * Validator of fields annotated with CodeType.
- */
-public class CodeTypeValidator implements ConstraintValidator<CodeType, String> {
-
- /**
- * Valid if string corresponding to a instance of enum CodeTypeEnum by running
- * method CodeTypeEnum.exists
- *
- * @param codeTypeToTest code type to test
- * @return return true if code type to test corresponding to a CodeTypeEnum.
- */
- @Override
- public boolean isValid(String codeTypeToTest, ConstraintValidatorContext constraintValidatorContext) {
- return CodeTypeEnum.exists(codeTypeToTest);
- }
-}
diff --git a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/PresentOrFutureTruncateDayValidator.java b/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/PresentOrFutureTruncateDayValidator.java
deleted file mode 100644
index 55f5c13170b656b0975aa80a256ff8abc9abe040..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/java/fr/gouv/stopc/submission/code/server/domain/validators/PresentOrFutureTruncateDayValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fr.gouv.stopc.submission.code.server.domain.validators;
-
-import fr.gouv.stopc.submission.code.server.domain.annotations.PresentOrFutureTruncateDay;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.time.temporal.ChronoUnit;
-
-@Slf4j
-public class PresentOrFutureTruncateDayValidator
- implements ConstraintValidator<PresentOrFutureTruncateDay, OffsetDateTime> {
-
- /**
- * @param date date to test
- * @return return true if date is sup or equals by day of server date.
- */
- @Override
- public boolean isValid(OffsetDateTime date, ConstraintValidatorContext constraintValidatorContext) {
- final OffsetDateTime now = OffsetDateTime.now();
- final ZoneOffset offset = now.getOffset();
- final OffsetDateTime dateToTest = date.toInstant().atOffset(offset);
- return ChronoUnit.SECONDS.between(dateToTest, now) <= 60;
- }
-}
diff --git a/legacy-submission-code-server/src/main/resources/application-dev.properties b/legacy-submission-code-server/src/main/resources/application-dev.properties
deleted file mode 100644
index 07963fe0a102795757a2a5d91e95c40f017ba1be..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-submission.code.server.sftp.host=${SUBMISSION_CODE_SERVER_SFTP_HOST:localhost}
-submission.code.server.sftp.host.path=${SUBMISSION_CODE_SERVER_SFTP_PATH:/upload}
-# specify here the algorithm used for the key of the host stored in the known_hosts file. Specifying more than one algorithm, even if the list include the one used, may not work
-submission.code.server.sftp.host.key.algorithm=${SUBMISSION_CODE_SERVER_SFTP_HOST_KEY_ALGORITHM:ssh-rsa}
-
-#Possible values for enablestricthost is ask | yes | no link : http://www.jcraft.com/jsch/README
-submission.code.server.sftp.enablestricthost=${SUBMISSION_CODE_SERVER_STRICT_HOST_CHECK:no}
-
-submission.code.server.sftp.key=${SUBMISSION_CODE_SERVER_SFTP_KEY:~/.ssh/rsa/rsa_scs}
-submission.code.server.sftp.passphrase=${SUBMISSION_CODE_SERVER_SFTP_PASSPHRASE:cGFzc3BocmFzZQ==}
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/main/resources/application.properties b/legacy-submission-code-server/src/main/resources/application.properties
deleted file mode 100644
index d35d771d455f28178d3dbca021a17dfbe8275ec2..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/resources/application.properties
+++ /dev/null
@@ -1,60 +0,0 @@
-management.server.port=8081
-management.endpoints.web.exposure.include=health,info,prometheus
-
-spring.datasource.url= ${SUBMISSION_CODE_SERVER_DB_URL:jdbc:postgresql://localhost:5432/dev-submission-code-server-schema}
-spring.datasource.username=${SUBMISSION_CODE_SERVER_DB_USR:postgres}
-spring.datasource.password=${SUBMISSION_CODE_SERVER_DB_PWD:1234}
-
-## base of stopcovid app url
-submission.code.server.cron.url=${SUBMISSION_CODE_SERVER_CRON_URL:https://app.stopcovid.gouv.fr?code=%s&type=%s}
-submission.code.server.cron.scheduling[0].dailyproduction=${SUBMISSION_CODE_SERVER_CRON_SCHEDULING_0_DAILYPRODUCTION:800000}
-submission.code.server.cron.scheduling[0].startdate=${SUBMISSION_CODE_SERVER_CRON_SCHEDULING_0_STARTDATE:2022-01-19T00:00:00+00:00}
-submission.code.server.cron.schedule=${SUBMISSION_CODE_SERVER_CRON_SCHEDULE:0 0 2 * * *}
-submission.code.server.cron.maxbatchsize=${SUBMISSION_CODE_SERVER_CRON_MAXBATCHSIZE:40000}
-
-## target zone id
-stop.covid.qr.code.targetzone=Europe/Paris
-
-generation.code.maxattempts=10
-
-# duration in days of long code validity
-generation.code.longcode.validity=${SUBMISSION_LONG_CODE_DAYS_VALIDITY:7}
-# duration in days of long code validity
-generation.code.testcode.validity=${SUBMISSION_TEST_CODE_DAYS_VALIDITY:15}
-# duration in minutes of short code validity
-generation.code.shortcode.validity=${SUBMISSION_SHORT_CODE_MINUTES_VALIDITY:60}
-
-# range of code per day authorized
-generation.code.per.day.min=${SUBMISSION_CODE_SERVER_CODE_PER_DAY_MIN:100}
-generation.code.per.day.max=${SUBMISSION_CODE_SERVER_CODE_PER_DAY_MAX:20000}
-
-# Minimum time before an already generated code may be recycled for a new one
-generation.code.security.shortcode.hours=24
-
-## csv file configuration
-csv.separator=,
-csv.delimiter="
-#Define only name directory not path
-csv.directory.tmp=${SUBMISSION_CODE_SERVER_TMP_DIRECTORY:/qrcode}
-csv.filename.formatter=%d%s.csv
-zip.filename.formatter=%s_stopcovid_qrcode_batch.tgz
-digest.filename.formatter.sha256=%s_stopcovid_qrcode_batch.sha256
-
-
-
-#Transfer file in server SFTP
-submission.code.server.sftp.enableautotransfer=${SUBMISSION_CODE_SERVER_SFTP_TRANSFER:true}
-submission.code.server.sftp.host=${SUBMISSION_CODE_SERVER_SFTP_HOST:10.0.1.141}
-submission.code.server.sftp.knownhosts.file=${SUBMISSION_CODE_SERVER_SFTP_KNOWN_HOST_FILE:~/.ssh/known_hosts}
-submission.code.server.sftp.host.port=${SUBMISSION_CODE_SERVER_SFTP_PORT:22}
-submission.code.server.sftp.host.path=${SUBMISSION_CODE_SERVER_SFTP_PATH:path}
-
-# specify here the algorithm used for the key of the host stored in the known_hosts file. Specifying more than one algorithm, even if the list include the one used, may not work
-submission.code.server.sftp.host.key.algorithm=${SUBMISSION_CODE_SERVER_SFTP_HOST_KEY_ALGORITHM:ecdsa-sha2-nistp256}
-
-#Possible values for enablestricthost is ask | yes | no link : http://www.jcraft.com/jsch/README
-submission.code.server.sftp.enablestricthost=${SUBMISSION_CODE_SERVER_STRICT_HOST_CHECK:yes}
-
-submission.code.server.sftp.user=${SUBMISSION_CODE_SERVER_SFTP_USER:user}
-submission.code.server.sftp.key=${SUBMISSION_CODE_SERVER_SFTP_KEY:~/.ssh/id_rsa.ppk}
-submission.code.server.sftp.passphrase=${SUBMISSION_CODE_SERVER_SFTP_PASSPHRASE:Tm90T3ZlcnJpZGVuRGVmYXVsdFN1Ym1pc3Npb25Db2RlU2VydmVyUGFzc3BocmFzZQ==}
diff --git a/legacy-submission-code-server/src/main/resources/data-scripts/V1__init.sql b/legacy-submission-code-server/src/main/resources/data-scripts/V1__init.sql
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/legacy-submission-code-server/src/main/resources/data-scripts/V2__add_indexes_submission_code.sql b/legacy-submission-code-server/src/main/resources/data-scripts/V2__add_indexes_submission_code.sql
deleted file mode 100644
index 0051e03e94bc050b99af7b4f552f1ea209c6346e..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/resources/data-scripts/V2__add_indexes_submission_code.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-create index if not exists type_code_idx on submission_code(type_code);
-create index if not exists type_code_date_available_idx on submission_code(type_code, date_available);
diff --git a/legacy-submission-code-server/src/main/resources/public/status.txt b/legacy-submission-code-server/src/main/resources/public/status.txt
deleted file mode 100644
index d8a261510c19731b6d59ac32e70495f222c205f6..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/resources/public/status.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-up
-
diff --git a/legacy-submission-code-server/src/main/resources/submission-code-server-api.yml b/legacy-submission-code-server/src/main/resources/submission-code-server-api.yml
deleted file mode 100644
index fc08265389d63319941119c0fb36f0387b26e970..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/main/resources/submission-code-server-api.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-openapi: 3.0.0
-info:
- description:
- Submission Code Server Client API Spec. This server generates one-time codes
- to be used in the StopCovid app.
- version: 0.0.1
- title: Submission Code Server Client API Spec
- termsOfService: https://gitlab.inria.fr/stopcovid19/submission-code-server
- contact:
- email: stopcovid@inria.fr
- license:
- name: Custom (see repository's LICENSE.md)
-paths:
- "/generate/short":
- get:
- tags:
- - Generate Code
- summary: Generate 6-alphanum code
- description: Generate a new submission code. Codes are usable once.
- operationId: generate
- responses:
- "200":
- description: Generated code
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/CodeSimpleDto"
- "/generate/test":
- get:
- tags:
- - Generate Code
- summary: Generate a test code that is 12 characters long.
- description: Generate a new submission code. Codes are usable once.
- operationId: generateTest
- responses:
- "200":
- description: Generated code
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/CodeSimpleDto"
- "/verify":
- get:
- tags:
- - Verify Code
- summary: Verify a code
- description: >-
- Check the validity of a submission code (originally provided by the
- app).
-
- NOTE: This API must be protected and used only by a trusted back-end server over a secure private connection.
- operationId: verify
- parameters:
- - name: type
- in: query
- required: false
- description: If present, should be between (1 to 3)
- schema:
- type: string
- - name: code
- in: query
- required: true
- description: should respect regexp ([a-zA-Z0-9]{6}) |
- ([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8}) | ([a-zA-Z0-9]{12})
- schema:
- type: string
- responses:
- "200":
- description: Returns the submission code validation result
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/VerifyDto"
- "/kpi":
- servers:
- - url: mycodeserver.org/intenal/api/v1
- get:
- tags:
- - KPI
- summary: Get KPIs
- description: >-
- Get KPIs concerning input time range
-
- NOTE: This API must be protected and used only by a trusted back-end server over a secure private connection.
- operationId: kpi
- parameters:
- - name: fromDate
- in: query
- required: true
- schema:
- type: string
- format: date
- - name: toDate
- in: query
- required: true
- schema:
- type: string
- format: date
- responses:
- "200":
- description: Returns the KPI list for date range
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/KpisResponse"
-components:
- schemas:
- CodeDetail:
- type: object
- properties:
- code:
- type: string
- KpisResponse:
- type: array
- items:
- $ref: "#/components/schemas/Kpi"
- Kpi:
- type: object
- properties:
- date:
- type: string
- format: date
- nbShortCodesUsed:
- type: integer
- format: int64
- nbLongCodesUsed:
- type: integer
- format: int64
- nbLongExpiredCodes:
- type: integer
- format: int64
- nbShortExpiredCodes:
- type: integer
- format: int64
- nbShortCodesGenerated:
- type: integer
- format: int64
- required:
- - date
- - nbShortCodesUsed
- - nbLongCodesUsed
- - nbLongExpiredCodes
- - nbShortExpiredCodes
- - nbShortCodesGenerated
- VerifyDto:
- type: object
- properties:
- valid:
- type: boolean
- description: >-
- True if the code is valid, false if invalid or expired, or if type
- does not match an existing code.
-
- A valid code is destroyed when validated successfully.
- required:
- - valid
- CodeSimpleDto:
- type: object
- properties:
- code:
- type: string
- description:
- The submission code to display. Should be encoded as a QR code by
- the client (combined with type info).
- example: AS3F5Z
- pattern: "[a-zA-Z0-9]{6}"
- validFrom:
- type: string
- description:
- Submission code must not be used before this validity date.
- Format ISO date is YYYY-MM-DDTHH:mm:ss.sssZ
- validUntil:
- type: string
- description:
- Submission code must not be used after this validity date.
- Format ISO date is YYYY-MM-DDTHH:mm:ss.sssZ
- dateGenerate:
- type: string
- description: Format ISO date is YYYY-MM-DDTHH:mm:ss.sssZ
- description: A submission code and its type as well as validity information
- required:
- - code
- - validFrom
- - validUnti
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/CodeShortCodeServiceTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/CodeShortCodeServiceTest.java
deleted file mode 100644
index 3ce994619927ead7cb6cb54ba2c5bbefa3ca2106..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/CodeShortCodeServiceTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class CodeShortCodeServiceTest {
-
- @Test
- @Disabled("for benchmark only")
- void generateCodeShortCodeTest() {
- Long size = new Long("300000");
- final long start = System.currentTimeMillis();
- final List<String> shortCodeIds = Stream.generate(new ShortCodeService()::generateCode)
- .distinct()
- .limit(size)
- .collect(Collectors.toList());
- System.out.println(
- String.format(
- "expected %s and get %s in %s millis", size, shortCodeIds.size(),
- System.currentTimeMillis() - start
- )
- );
- assertEquals(size, shortCodeIds.size());
- }
-
- @Test
- void getShuffledAlphaNumListTest() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
- final long start = System.currentTimeMillis();
- // ShortCodeServiceImpl service = new ShortCodeServiceImpl();
- // Method getShuffledAlphaNumList =
- // service.getClass().getDeclaredMethod("getShuffledAlphaNumList");
- // getShuffledAlphaNumList.setAccessible(true);
- // final List<Character> shuffledAlphaNumList = (List<Character>)
- // getShuffledAlphaNumList.invoke(service);
- final List<Character> shuffledAlphaNumList = new ShortCodeService().getShuffledAlphaNumList();
- System.out.println(
- String.format(
- "expected %s and get %s in %s millis", 26 + 10, shuffledAlphaNumList.size(),
- System.currentTimeMillis() - start
- )
- );
- assertEquals(26 + 10, shuffledAlphaNumList.size());
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/FileServiceTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/FileServiceTest.java
deleted file mode 100644
index 397d491665e6f46e567c34deb4e06369cbdf4243..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/FileServiceTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.CodeDetailedDto;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SequenceFichier;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.modelmapper.internal.util.Assert;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.TimeZone;
-
-import static org.apache.tomcat.util.http.fileupload.FileUtils.deleteDirectory;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(SpringExtension.class)
-@TestPropertySource("classpath:application.properties")
-class FileServiceTest {
-
- /**
- * Zone ID to use
- */
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- @Mock
- private GenerateService generateService;
-
- @Mock
- private SFTPService sftpService;
-
- @Mock
- private SubmissionCodeService submissionCodeService;
-
- @Mock
- private SequenceFichierService sequenceFichierService;
-
- @Spy
- @InjectMocks
- private FileService fileExportService;
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- TimeZone.setDefault(TimeZone.getTimeZone(this.targetZoneId));
-
- ReflectionTestUtils.setField(this.fileExportService, "qrCodeBaseUrlToBeFormatted", "my%smy%s");
- ReflectionTestUtils.setField(this.fileExportService, "targetZoneId", this.targetZoneId);
- ReflectionTestUtils.setField(this.fileExportService, "csvSeparator", ',');
- ReflectionTestUtils.setField(this.fileExportService, "csvDelimiter", '"');
- ReflectionTestUtils.setField(this.fileExportService, "csvFilenameFormat", "%d%s.csv");
- ReflectionTestUtils.setField(this.fileExportService, "directoryTmpCsv", "tmp");
- ReflectionTestUtils.setField(this.fileExportService, "transferFile", false);
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", this.targetZoneId);
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 1);
- ReflectionTestUtils.setField(this.generateService, "timeValidityLongCode", 2);
- ReflectionTestUtils.setField(this.generateService, "timeValidityShortCode", 15);
- ReflectionTestUtils.setField(this.generateService, "submissionCodeService", this.submissionCodeService);
- ReflectionTestUtils.setField(this.generateService, "shortCodeService", new ShortCodeService());
- ReflectionTestUtils.setField(this.generateService, "longCodeService", new LongCodeService());
- when(this.sequenceFichierService.getSequence(any())).thenReturn(Optional.empty());
- }
-
- @Test
- public void testCreateZipComplete() throws IOException, SubmissionCodeServerException {
- // String numberCodeDay, String lot, String dateFrom, String dateTo
- final CodeDetailedDto sc = CodeDetailedDto.builder()
- .typeAsString(CodeTypeEnum.LONG.getTypeCode())
- .validUntil(OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
- .validFrom(OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
- .dateGenerate(OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
- .code("3d27eeb8-956c-4660-bc04-8612a4c0a7f1")
- .build();
-
- OffsetDateTime startDate = OffsetDateTime.now();
- String nowDay = startDate.format(DateTimeFormatter.ISO_DATE_TIME);
- String endDay = OffsetDateTime.now().plusDays(4L).format(DateTimeFormatter.ISO_DATE_TIME);
-
- Lot lot = new Lot();
- lot.setId(1L);
-
- OffsetDateTime date = OffsetDateTime.now().plusDays(1L);
- List<OffsetDateTime> dates = new ArrayList<>();
- dates.add(date);
-
- Mockito.when(generateService.generateLongCodesWithBulkMethod(date, 10, lot, date))
- .thenReturn(Arrays.asList(sc));
- Mockito.when(generateService.getListOfValidDatesFor(5, startDate)).thenReturn(dates);
- Optional<ByteArrayOutputStream> result = Optional.empty();
-
- result = fileExportService.zipExport(10L, lot, nowDay, endDay);
-
- Assert.notNull(result.get());
-
- }
-
- @Test
- public void testCreateZipCompleteOneDay() throws Exception {
- // String numberCodeDay, String lot, String dateFrom, String dateTo
- Optional<ByteArrayOutputStream> result;
-
- final CodeDetailedDto sc = CodeDetailedDto.builder()
- .typeAsString(CodeTypeEnum.LONG.getTypeCode())
- .validUntil(OffsetDateTime.now().toString())
- .validFrom(OffsetDateTime.now().toString())
- .dateGenerate(OffsetDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
- .code("3d27eeb8-956c-4660-bc04-8612a4c0a7f1")
- .build();
-
- OffsetDateTime nowDay = OffsetDateTime.now();
- String nowDayString = nowDay.format(DateTimeFormatter.ISO_DATE_TIME);
- String endDay = nowDayString;
-
- Lot lot = new Lot();
- lot.setId(1L);
-
- Mockito.when(generateService.generateLongCodesWithBulkMethod(nowDay, 10, lot, nowDay))
- .thenReturn(Arrays.asList(sc));
- List<OffsetDateTime> dates = new ArrayList<>();
- dates.add(nowDay);
- Mockito.when(generateService.getListOfValidDatesFor(1, nowDay)).thenReturn(dates);
-
- result = fileExportService.zipExport(10L, lot, nowDayString, endDay);
-
- Assert.notNull(result.get());
-
- }
-
- @Test
- public void testCheckDatesValidation() {
-
- OffsetDateTime startDay = OffsetDateTime.now().minusDays(1l);
- OffsetDateTime endDay = OffsetDateTime.now().plusDays(4L);
- Assert.isTrue(!fileExportService.isDateValid(startDay, endDay));
-
- }
-
- @Test
- public void testSerializeCodesToCsv() {
- File tmpDirectory = new File("test");
- tmpDirectory.mkdir();
- List<SubmissionCodeDto> submissionCodeDtos = new ArrayList<>();
- OffsetDateTime nowDay = OffsetDateTime.now();
- SubmissionCodeDto submissionCodeDto = SubmissionCodeDto.builder().code("test").dateAvailable(nowDay)
- .dateEndValidity(nowDay.plusDays(1L))
- .dateGeneration(nowDay).lot(1L).used(false).type("test").build();
-
- submissionCodeDtos.add(submissionCodeDto);
- List<OffsetDateTime> dates = new ArrayList<>();
- dates.add(nowDay);
- try {
- fileExportService.serializeCodesToCsv(submissionCodeDtos, dates, tmpDirectory);
- } catch (SubmissionCodeServerException e) {
- e.printStackTrace();
- }
-
- Assert.notNull(tmpDirectory.list());
- try {
- deleteDirectory(tmpDirectory);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPackageCsvDataToZipFile() {
- File tmpDirectory = new File("test");
- tmpDirectory.mkdir();
- List<SubmissionCodeDto> submissionCodeDtos = new ArrayList<>();
- OffsetDateTime nowDay = OffsetDateTime.now();
- SubmissionCodeDto submissionCodeDto = SubmissionCodeDto.builder().code("test").dateAvailable(nowDay)
- .dateEndValidity(nowDay.plusDays(1L))
- .dateGeneration(nowDay).lot(1L).used(false).type("test").build();
-
- submissionCodeDtos.add(submissionCodeDto);
- List<OffsetDateTime> dates = new ArrayList<>();
- dates.add(nowDay);
-
- when(sequenceFichierService.getSequence(nowDay)).thenReturn(
- Optional.of(
- new SequenceFichier(
- 1L, nowDay.getYear(), nowDay.getMonthValue(), nowDay.getDayOfMonth(),
- nowDay.getYear() % 100 + 1
- )
- )
- );
- // create csv in directory
- try {
- fileExportService.serializeCodesToCsv(submissionCodeDtos, dates, tmpDirectory);
- } catch (SubmissionCodeServerException e) {
- e.printStackTrace();
- }
- List<String> datesZip = new ArrayList<>();
- datesZip.add(
- String.format(
- "%s.csv",
- nowDay.plus(1, ChronoUnit.YEARS).format(DateTimeFormatter.ofPattern("yyyy")).substring(2)
- + nowDay.format(DateTimeFormatter.ofPattern("yyMMdd"))
- )
- );
- ByteArrayOutputStream result = null;
- // call package zip
- try {
- result = fileExportService.packageCsvDataToZipFile(datesZip, tmpDirectory);
- } catch (SubmissionCodeServerException | IOException e) {
- e.printStackTrace();
- }
-
- Assert.notNull(result);
- // remove resources
- try {
- deleteDirectory(tmpDirectory);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierServiceTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierServiceTest.java
deleted file mode 100644
index c3fe4c523f2c6bc8a8ce27bd9dbcea72052c1830..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/SequenceFichierServiceTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service;
-
-import fr.gouv.stopc.submission.code.server.data.entity.SequenceFichier;
-import fr.gouv.stopc.submission.code.server.data.repository.SequenceFichierRepository;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import java.time.OffsetDateTime;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(SpringExtension.class)
-public class SequenceFichierServiceTest {
-
- @InjectMocks
- private SequenceFichierService service;
-
- @Mock
- private SequenceFichierRepository repository;
-
- @Test
- public void testGetSequenceWhenSequenceNotFound() {
-
- // Given
- OffsetDateTime now = OffsetDateTime.now();
-
- when(this.repository.findByAnneeAndMoisAndJour(now.getYear(), now.getMonthValue(), now.getDayOfMonth()))
- .thenReturn(Optional.empty());
- when(this.repository.saveAndFlush(any())).thenReturn(SequenceFichier.builder().build());
-
- // When
- Optional<SequenceFichier> sequence = this.service.getSequence(now);
-
- // Then
- assertTrue(sequence.isPresent());
- verify(this.repository).findByAnneeAndMoisAndJour(now.getYear(), now.getMonthValue(), now.getDayOfMonth());
- verify(this.repository).saveAndFlush(any());
- }
-
- @Test
- public void testGetSequenceWhenSequenceWhenFound() {
-
- // Given
- OffsetDateTime now = OffsetDateTime.now();
- int year = now.getYear();
- int currentSequence = (year % 100) + 1;
- SequenceFichier sequenceFichier = SequenceFichier.builder()
- .id(1L)
- .annee(year)
- .mois(now.getMonthValue())
- .jour(now.getDayOfMonth())
- .sequence(currentSequence)
- .build();
-
- when(this.repository.findByAnneeAndMoisAndJour(now.getYear(), now.getMonthValue(), now.getDayOfMonth()))
- .thenReturn(Optional.of(sequenceFichier));
-
- when(this.repository.save(any())).thenReturn(SequenceFichier.builder().build());
-
- // When
- Optional<SequenceFichier> sequence = this.service.getSequence(now);
-
- // Then
- assertTrue(sequence.isPresent());
- assertEquals(currentSequence + 1, sequence.get().getSequence());
- verify(this.repository).findByAnneeAndMoisAndJour(now.getYear(), now.getMonthValue(), now.getDayOfMonth());
- verify(this.repository).saveAndFlush(any());
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigPropertiesTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigPropertiesTest.java
deleted file mode 100644
index ade5d567cdfe6dd846a2f88cb8d8280aaa3ed93e..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/business/service/schedule/GenerationConfigPropertiesTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package fr.gouv.stopc.submission.code.server.business.service.schedule;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-class GenerationConfigPropertiesTest {
-
- private final String targetZoneId = "Europe/Paris";
-
- @Test
- void decreasingVolumetry() {
- Map<Integer, Integer> dayAndVolumeMap = Map.of(0, 300, 8, 40, 9, 0);
- List<Integer> returnedValues = getDailyProductionTargetList(dayAndVolumeMap);
- List<Integer> expectedValues = List.of(300, 300, 300, 300, 300, 300, 300, 300, 40, 0, 0);
- Assertions.assertEquals(expectedValues, returnedValues);
- }
-
- @Test
- void increasingVolumetryAndStop() {
- Map<Integer, Integer> dayAndVolumeMap = Map.of(0, 300, 5, 800, 10, 0);
- List<Integer> returnedValues = getDailyProductionTargetList(dayAndVolumeMap);
- List<Integer> expectedValues = List.of(300, 300, 300, 300, 300, 800, 800, 800, 800, 800, 0);
- Assertions.assertEquals(expectedValues, returnedValues);
- }
-
- @Test
- void simulateInvertedDates() {
- OffsetDateTime todayOff = OffsetDateTime.now(ZoneId.of(targetZoneId)).truncatedTo(ChronoUnit.DAYS);
- List<GenerationConfigProperties.GenerationConfig> scheduling = new ArrayList<>();
-
- OffsetDateTime targetDate = todayOff;
- GenerationConfigProperties.GenerationConfig conf = GenerationConfigProperties.GenerationConfig
- .builder()
- .dailyProduction(300)
- .startDate(targetDate)
- .build();
- scheduling.add(conf);
-
- targetDate = todayOff.plusDays(8);
- conf = GenerationConfigProperties.GenerationConfig
- .builder()
- .dailyProduction(800)
- .startDate(targetDate)
- .build();
- scheduling.add(conf);
-
- targetDate = todayOff.plusDays(5);
- conf = GenerationConfigProperties.GenerationConfig
- .builder()
- .dailyProduction(500)
- .startDate(targetDate)
- .build();
- scheduling.add(conf);
-
- GenerationConfigProperties generationConfig = new GenerationConfigProperties();
- generationConfig.setScheduling(scheduling);
-
- OffsetDateTime currentDate = OffsetDateTime.now();
- List<Integer> returnedValues = new ArrayList<>();
- for (int i = 0; i < 11; i++) {
- returnedValues.add(generationConfig.getDailyProductionTarget(currentDate));
- currentDate = currentDate.plusDays(1);
- }
-
- List<Integer> expectedValues = List.of(300, 300, 300, 300, 300, 500, 500, 500, 800, 800, 800);
- Assertions.assertEquals(expectedValues, returnedValues);
- }
-
- private List<Integer> getDailyProductionTargetList(Map<Integer, Integer> dayAndVolumeMap) {
- OffsetDateTime todayOff = OffsetDateTime.now(ZoneId.of(targetZoneId)).truncatedTo(ChronoUnit.DAYS);
- List<GenerationConfigProperties.GenerationConfig> scheduling = new ArrayList<>();
- dayAndVolumeMap.forEach((day, volume) -> {
- OffsetDateTime currentDate = todayOff.plusDays(day);
- GenerationConfigProperties.GenerationConfig conf = GenerationConfigProperties.GenerationConfig.builder()
- .dailyProduction(volume).startDate(currentDate)
- .build();
- scheduling.add(conf);
- }
- );
-
- GenerationConfigProperties generationConfig = new GenerationConfigProperties();
- generationConfig.setScheduling(scheduling);
-
- OffsetDateTime currentDate = OffsetDateTime.now();
- List<Integer> schedules = new ArrayList<>();
- for (int i = 0; i < 11; i++) {
- schedules.add(generationConfig.getDailyProductionTarget(currentDate));
- currentDate = currentDate.plusDays(1);
- }
- return schedules;
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericMethodTest.java
deleted file mode 100644
index 934c3c07a95d60963d67f52afbd4e3e9aebdf80c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericMethodTest.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package fr.gouv.stopc.submission.code.server.generateservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.CodeDetailedDto;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.LongCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.ShortCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.apache.logging.log4j.util.Strings;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.*;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class GenerateServiceGenerateCodeGenericMethodTest {
-
- @Mock
- private SubmissionCodeService submissionCodeService;
-
- @Spy
- @InjectMocks
- private GenerateService generateService;
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", "Europe/Paris");
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- // SET 24 hours of lock security
- ReflectionTestUtils.setField(this.submissionCodeService, "securityTimeBetweenTwoUsagesOfShortCode", 24);
- ReflectionTestUtils.setField(this.generateService, "longCodeService", new LongCodeService());
- ReflectionTestUtils.setField(this.generateService, "shortCodeService", new ShortCodeService());
- }
-
- /**
- * List is returning desired number of codes
- */
- @Test
- void testSizeOfGenerateResponseDtoList()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final long size = Long.parseLong("10");
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
- final Lot lot = new Lot();
-
- Mockito.when(this.submissionCodeService.saveCode(Mockito.any(), Mockito.any()))
- .thenReturn(Optional.of(new SubmissionCode()));
-
- final List<CodeDetailedDto> codeDetailedResponseDtoList = this.generateService.generateCodeGeneric(
- size, cte, validFrom, lot
- );
- // list should not be null
- assertNotNull(codeDetailedResponseDtoList);
- // list should be at size
- assertEquals(size, codeDetailedResponseDtoList.size());
- }
-
- /**
- * Check elements in list have each a code.
- */
- @Test
- void testCodeNotBlank()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- final SubmissionCode submissionCode = new SubmissionCode();
- submissionCode.setCode("TOTO");
-
- Mockito.when(this.submissionCodeService.saveCode(Mockito.any(), Mockito.any()))
- .thenReturn(Optional.of(submissionCode));
-
- final SubmissionCodeDto submissionCodeDto = this.generateService
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(
- cte, validFrom
- ).build();
-
- // list should not be null
- assertNotNull(submissionCodeDto);
-
- // asserting that generated is not blank
- final String code = submissionCodeDto.getCode();
- assertTrue(Strings.isNotBlank(code));
-
- }
-
- /**
- * Check elements in list have each a code.
- */
- @Test
- void testCodeWithLongCodePattern()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- final SubmissionCodeDto submissionCodeDto = this.generateService
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(
- cte, validFrom
- ).build();
-
- // list should not be null
- assertNotNull(submissionCodeDto);
-
- Pattern p = Pattern.compile("([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8})");
-
- // asserting that code is formatted as UUIDv4 standard
- final String code = submissionCodeDto.getCode();
- Matcher m = p.matcher(code);
- assertTrue(m.matches());
- }
-
- /**
- * Check elements in list have each a code.
- */
- @Test
- void testCodeWithShortCodePattern()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final CodeTypeEnum cte = CodeTypeEnum.SHORT;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- final SubmissionCodeDto submissionCodeDto = this.generateService
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(
- cte, validFrom
- ).build();
-
- // list should not be null
- assertNotNull(submissionCodeDto);
-
- Pattern p = Pattern.compile("([A-Z0-9]{6})");
-
- // asserting that code is formatted as UUIDv4 standard
- final String code = submissionCodeDto.getCode();
- Matcher m = p.matcher(code);
- assertTrue(m.matches());
-
- }
-
- /**
- * Check elements in list have the right code type
- */
- @Test
- void testCodeType()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- final SubmissionCodeDto submissionCodeDto = this.generateService
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(
- cte, validFrom
- ).build();
-
- // list should not be null
- assertNotNull(submissionCodeDto);
-
- // assert the returning code corresponding to the given CodeTypeEnum in
- // parameter
- assertEquals(CodeTypeEnum.LONG.getTypeCode(), submissionCodeDto.getType());
- }
-
- /**
- * Check elements in list have the right validUntil and validFrom format
- */
- @Test
- void testValidUntilAndValidFromFormat()
- throws SubmissionCodeServerException {
- // asserting generateService is available
- final long size = Long.parseLong("1");
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
- final Lot lot = new Lot();
-
- final SubmissionCode submissionCode = new SubmissionCode();
- submissionCode.setDateEndValidity(OffsetDateTime.now());
- submissionCode.setDateAvailable(OffsetDateTime.now());
-
- Mockito.when(this.submissionCodeService.saveCode(Mockito.any(), Mockito.any()))
- .thenReturn(Optional.of(submissionCode));
-
- final List<CodeDetailedDto> codeDetailedResponseDtoList = this.generateService.generateCodeGeneric(
- size, cte, validFrom, lot
- );
-
- // list should not be null
- assertNotNull(codeDetailedResponseDtoList);
- // list should be at size
- assertEquals(size, codeDetailedResponseDtoList.size());
-
- Pattern p = Pattern.compile(
- "^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])" +
- "T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?" +
- "(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$"
- );
-
- codeDetailedResponseDtoList.forEach(grDto -> {
-
- // asserting that date is at the right format
- final String validFrom1 = grDto.getValidFrom();
- final String validUntil1 = grDto.getValidUntil();
-
- Matcher m = p.matcher(validFrom1);
- assertTrue(m.matches());
-
- m = p.matcher(validUntil1);
- assertTrue(m.matches());
- });
- }
-
- /**
- * Number of tries reach
- */
- @Test
- void testReachNumberOfTries() {
- // asserting generateService is available
- final long size = Long.parseLong("10");
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
- final Lot lot = new Lot();
-
- Mockito.when(submissionCodeService.saveCode(Mockito.any(SubmissionCodeDto.class), Mockito.any(Lot.class)))
- .thenThrow(DataIntegrityViolationException.class);
-
- ReflectionTestUtils.setField(generateService, "targetZoneId", "Europe/Paris");
- ReflectionTestUtils.setField(generateService, "numberOfTryInCaseOfError", 0);
-
- assertThrows(
- SubmissionCodeServerException.class,
- () -> this.generateService.generateCodeGeneric(
- size, cte, validFrom, lot
- ),
- "Expected generateCodeGeneric() to throw, but it didn't"
- );
- }
-
- /**
- * Number of tries reach
- */
- @Test
- void testReachNumberOfTriesWithoutLotParameter() {
- // asserting generateService is available
- final long size = Long.parseLong("10");
- final CodeTypeEnum cte = CodeTypeEnum.LONG;
- final OffsetDateTime validFrom = OffsetDateTime.now();
- final Lot lot = new Lot();
-
- Mockito.when(submissionCodeService.saveCode(Mockito.any(SubmissionCodeDto.class), Mockito.any(Lot.class)))
- .thenThrow(DataIntegrityViolationException.class);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", "Europe/Paris");
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- assertThrows(
- SubmissionCodeServerException.class,
- () -> this.generateService.generateCodeGeneric(
- size, cte, validFrom, new Lot()
- ),
- "Expected generateCodeGeneric() to throw, but it didn't"
- );
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericUpdateMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericUpdateMethodTest.java
deleted file mode 100644
index 959c4c12e5f661a24a9f2d6543b930ee3f5fd3f6..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateCodeGenericUpdateMethodTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package fr.gouv.stopc.submission.code.server.generateservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.CodeDetailedDto;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.ShortCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.*;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.time.OffsetDateTime;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class GenerateServiceGenerateCodeGenericUpdateMethodTest {
-
- @Mock
- private ShortCodeService shortCodeService;
-
- @Mock
- private SubmissionCodeRepository submissionCodeRepository;
-
- @Spy
- @InjectMocks
- private SubmissionCodeService submissionCodeService;
-
- @Spy
- @InjectMocks
- private GenerateService generateService;
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", "Europe/Paris");
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- // SET 24 hours of lock security
- ReflectionTestUtils.setField(this.submissionCodeService, "securityTimeBetweenTwoUsagesOfShortCode", 24);
- ReflectionTestUtils.setField(this.generateService, "submissionCodeService", this.submissionCodeService);
- }
-
- /**
- * Simulate a same code insertion when validity date is not compliant with
- */
- @Test
- void testSameShortCodeAndSecurityDelayNotRespected() {
- // asserting gsi is available
- final long size = Long.parseLong("1");
- final CodeTypeEnum cte = CodeTypeEnum.SHORT;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- Mockito.when(shortCodeService.generateCode())
- .thenReturn("5d98e3");
-
- final SubmissionCode submissionCode = new SubmissionCode();
- submissionCode.setId(1);
- submissionCode.setCode("5d98e3");
-
- Mockito.when(this.submissionCodeRepository.save(Mockito.any()))
- .thenThrow(DataIntegrityViolationException.class)
- .thenReturn(null);
-
- Mockito.when(
- this.submissionCodeRepository.findByCodeAndTypeAndAndDateEndValidityLessThan(
- "5d98e3", cte.getTypeCode(), validFrom.minusHours(24)
- )
- ).thenReturn(null);
-
- assertThrows(
- SubmissionCodeServerException.class,
- () -> this.generateService.generateCodeGeneric(
- size, cte, validFrom, null
- ),
- "Expected generateCodeGeneric() to throw, but it didn't"
- );
-
- }
-
- /**
- * Number of tries reach
- */
- @Test
- void testSameShortCodeAndSecurityDelayIsRespected() throws SubmissionCodeServerException {
- // asserting gsi is available
- final long size = Long.parseLong("1");
- final CodeTypeEnum cte = CodeTypeEnum.SHORT;
- final OffsetDateTime validFrom = OffsetDateTime.now();
-
- Mockito.when(shortCodeService.generateCode())
- .thenReturn("5d98e3");
-
- final SubmissionCode submissionCode = new SubmissionCode();
- submissionCode.setId(1);
- submissionCode.setCode("5d98e3");
-
- Mockito.when(this.submissionCodeRepository.save(Mockito.any()))
- .thenThrow(DataIntegrityViolationException.class)
- .thenReturn(submissionCode);
-
- Mockito.when(
- this.submissionCodeRepository.findByCodeAndTypeAndAndDateEndValidityLessThan(
- "5d98e3", cte.getTypeCode(), validFrom.minusHours(24)
- )
- ).thenReturn(submissionCode);
-
- // try once
- final List<CodeDetailedDto> codeDetailedResponseDtoListFirst = this.generateService.generateCodeGeneric(
- size, cte, validFrom, null
- );
-
- assertEquals(
- codeDetailedResponseDtoListFirst.size(),
- size
- );
-
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateLongCodesMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateLongCodesMethodTest.java
deleted file mode 100644
index d052656a40fce3077b19c31b1a5625afe49bf81b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGenerateLongCodesMethodTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package fr.gouv.stopc.submission.code.server.generateservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.LongCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.*;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.time.OffsetDateTime;
-import java.util.Optional;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-@Slf4j
-class GenerateServiceGenerateLongCodesMethodTest {
-
- @Mock
- private LongCodeService longCodeService;
-
- @Mock
- private SubmissionCodeService submissionCodeService;
-
- @Spy
- @InjectMocks
- private GenerateService generateService;
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", "Europe/Paris");
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- // SET 24 hours of lock security
- ReflectionTestUtils.setField(this.submissionCodeService, "securityTimeBetweenTwoUsagesOfShortCode", 24);
- }
-
- /**
- * Calling generateCodeGeneric and assert that it returns the right size and the
- * right elements
- */
- @Test
- void testSizeLongCodeGenerateResponseDtoList() throws SubmissionCodeServerException {
- int size = 12;
-
- Mockito.when(this.submissionCodeService.saveCode(Mockito.any(), Mockito.any()))
- .thenReturn(Optional.of(new SubmissionCode()));
-
- this.generateService.generateCodeGeneric(size, CodeTypeEnum.LONG, OffsetDateTime.now(), new Lot());
-
- verify(longCodeService, times(12)).generateCode();
-
- }
-
- @Test
- void testGenerateLongCode() {
- LongCodeService longCodeService = new LongCodeService();
- log.info("{}", longCodeService.generateCode());
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidFromListMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidFromListMethodTest.java
deleted file mode 100644
index 79d1cae24c959724842f01790321663a9a7888b1..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidFromListMethodTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package fr.gouv.stopc.submission.code.server.generateservice;
-
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GenerateServiceGetValidFromListMethodTest {
-
- @Spy
- @InjectMocks
- private GenerateService generateService;
-
- private static final String targetZoneId = "Europe/Paris";
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", this.targetZoneId);
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- }
-
- /**
- * Test method generating list of validFrom OffSetTime.
- */
- @Test
- void testValidFromList() {
- final int size = 10;
- final ZoneId parisZoneId = ZoneId.of(this.targetZoneId);
-
- // to prevent days, month, and year changes this time has been specially chosen
- // for the test.
- final OffsetDateTime validFromFirstValue = OffsetDateTime.now(parisZoneId)
- .withMonth(12)
- .withDayOfMonth(31)
- .withHour(21)
- .withMinute(00);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", "Europe/Paris");
-
- // Tested method call
- List<OffsetDateTime> validFromList = this.generateService.getListOfValidDatesFor(size, validFromFirstValue);
-
- final ZoneOffset zuluZoneOffset = ZoneOffset.of("Z");
-
- // list returned should be at the desired size.
- assertEquals(size, validFromList.size());
-
- // first value of list should be validFromFirstValue at zulu time
- assertEquals(validFromFirstValue.withOffsetSameInstant(ZoneOffset.of("Z")), validFromList.get(0));
-
- int parisMidnightAtZuluHour = validFromFirstValue
- .withHour(0)
- .withOffsetSameInstant(ZoneOffset.of("Z"))
- .getHour();
-
- int parisMidnightAtZuluMinutes = validFromFirstValue
- .withHour(0)
- .withMinute(0)
- .withOffsetSameInstant(ZoneOffset.of("Z"))
- .getMinute();
-
- int parisMidnightAtZuluSeconds = validFromFirstValue
- .withHour(0)
- .withMinute(0)
- .withSecond(0)
- .withOffsetSameInstant(ZoneOffset.of("Z"))
- .getSecond();
-
- // dayOfMonth with zulu zoneoffset conversion
- for (int i = 1; i < size; i++) {
-
- final OffsetDateTime z = validFromFirstValue
- .plusDays(i)
- .withSecond(0)
- .withMinute(0)
- .withHour(0)
- .withOffsetSameInstant(ZoneOffset.of("Z"));
-
- int dayOfMonth = z.getDayOfMonth();
- int year = z.getYear();
- int month = z.getMonthValue();
-
- final OffsetDateTime vf = validFromList.get(i);
-
- // asserting that days are incremental.
- assertEquals(dayOfMonth, vf.getDayOfMonth());
- assertEquals(month, vf.getMonthValue());
- assertEquals(year, vf.getYear());
-
- // asserting hours, minutes, and seconds are set at Zulu offset
- assertEquals(parisMidnightAtZuluHour, vf.getHour());
- assertEquals(parisMidnightAtZuluMinutes, vf.getMinute());
- assertEquals(parisMidnightAtZuluSeconds, vf.getSecond());
-
- // asserting that Offset is ZULU
- assertEquals(zuluZoneOffset, vf.getOffset());
-
- }
-
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidityDateLongCodeMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidityDateLongCodeMethodTest.java
deleted file mode 100644
index 642ee0d40263d2cbaf865a29e4751e9a733bf86b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/generateservice/GenerateServiceGetValidityDateLongCodeMethodTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package fr.gouv.stopc.submission.code.server.generateservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.LongCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.ShortCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.springframework.test.util.ReflectionTestUtils;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-public class GenerateServiceGetValidityDateLongCodeMethodTest {
-
- @Mock
- private SubmissionCodeService submissionCodeService;
-
- @Spy
- @InjectMocks
- private GenerateService generateService;
-
- private static final String targetZoneId = "Europe/Paris";
-
- @BeforeEach
- public void init() {
-
- MockitoAnnotations.initMocks(this);
-
- ReflectionTestUtils.setField(this.generateService, "targetZoneId", this.targetZoneId);
- ReflectionTestUtils.setField(this.generateService, "numberOfTryInCaseOfError", 0);
-
- // SET 24 hours of lock security
- ReflectionTestUtils.setField(this.submissionCodeService, "securityTimeBetweenTwoUsagesOfShortCode", 24);
- ReflectionTestUtils.setField(this.generateService, "longCodeService", new LongCodeService());
- ReflectionTestUtils.setField(this.generateService, "shortCodeService", new ShortCodeService());
- }
-
- @Test
- void testCheckValidUntilFormat() throws SubmissionCodeServerException {
-
- final long validityDays = 10;
- ReflectionTestUtils.setField(this.generateService, "timeValidityLongCode", validityDays);
-
- OffsetDateTime testedValidFrom = OffsetDateTime.now(ZoneId.of(this.targetZoneId));
-
- testedValidFrom = testedValidFrom.withMonth(01).withDayOfMonth(01).withHour(1).withMinute(12)
- .truncatedTo(ChronoUnit.MINUTES);
-
- final SubmissionCodeDto submissionCodeDto = this.generateService
- .preGenerateSubmissionCodeDtoForCodeTypeAndDateValidity(CodeTypeEnum.LONG, testedValidFrom).build();
-
- assertNotNull(submissionCodeDto);
-
- final OffsetDateTime validUntil = submissionCodeDto.getDateEndValidity()
- .withOffsetSameInstant(
- OffsetDateTime.now(ZoneId.of(this.targetZoneId)).getOffset()
- );
-
- final OffsetDateTime validFrom = submissionCodeDto.getDateAvailable()
- .withOffsetSameInstant(
- OffsetDateTime.now(ZoneId.of(this.targetZoneId)).getOffset()
- );
-
- // asserting Hours is 23
- assertEquals(23, validUntil.getHour());
-
- // asserting Minutes is 59
- assertEquals(59, validUntil.getMinute());
-
- // asserting truncate to minutes
- assertEquals(00, validUntil.getSecond());
-
- final long betweenSec = SECONDS.between(validFrom, validUntil);
- final long betweenDays = betweenSec / 60 / 60 / 24;
-
- final int deltaMinutes = testedValidFrom.getHour() * 60 + testedValidFrom.getMinute();
-
- assertEquals((((validityDays + 1) * 24 * 60) - deltaMinutes - 1) * 60, betweenSec);
-
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberSpringConfiguration.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberSpringConfiguration.java
deleted file mode 100644
index 9195c7e15af1f228fb4a4325c0e9adbf29c1f6ea..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberSpringConfiguration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it;
-
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.it.utils.IntegrationTest;
-import io.cucumber.java.Before;
-import io.cucumber.spring.CucumberContextConfiguration;
-import lombok.RequiredArgsConstructor;
-
-@CucumberContextConfiguration
-@IntegrationTest
-@RequiredArgsConstructor
-public class CucumberSpringConfiguration {
-
- private final SubmissionCodeRepository submissionCodeRepository;
-
- @Before
- public void initialization() {
- submissionCodeRepository.deleteAll();
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberTest.java
deleted file mode 100644
index d69bff8533435652eacf6762e7a317c53679099a..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/CucumberTest.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it;
-
-import io.cucumber.junit.platform.engine.Cucumber;
-
-@Cucumber
-public class CucumberTest {
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/dto/CsvRowDto.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/dto/CsvRowDto.java
deleted file mode 100644
index 544a8058c44859148586ac15c03c30344ff59a0a..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/dto/CsvRowDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.Valid;
-
-import java.time.Instant;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Builder
-@Valid
-public class CsvRowDto {
-
- private String qrcode;
-
- private String code;
-
- private Instant dateAvailable;
-
- private Instant dateEndValidity;
-
- public CsvRowDto(String qrcode, String code, String dateAvailable, String dateEndValidity) {
- this.qrcode = qrcode;
- this.code = code;
- this.dateAvailable = Instant.parse(dateAvailable);
- this.dateEndValidity = Instant.parse(dateEndValidity);
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/PostgresManager.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/PostgresManager.java
deleted file mode 100644
index 34e23519c00d49118e7dd11c37b2744f59e4a51c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/PostgresManager.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.manager;
-
-import org.springframework.test.context.TestExecutionListener;
-import org.testcontainers.containers.GenericContainer;
-
-public class PostgresManager implements TestExecutionListener {
-
- private static final int PORT = 5432;
-
- private static final GenericContainer POSTGRE_SQL_TEST_CONTAINER = new GenericContainer("postgres:13")
- .withEnv("POSTGRES_USER", "postgres")
- .withEnv("POSTGRES_PASSWORD", "1234")
- .withEnv("POSTGRES_DB", "dev-submission-code-server-schema")
- .withExposedPorts(PORT);
-
- static {
- POSTGRE_SQL_TEST_CONTAINER.start();
- String jdbcUrl = "jdbc:postgresql://" + POSTGRE_SQL_TEST_CONTAINER.getHost()
- + ":"
- + POSTGRE_SQL_TEST_CONTAINER.getMappedPort(PORT).toString()
- + "/dev-submission-code-server-schema";
- System.setProperty("SUBMISSION_CODE_SERVER_DB_URL", jdbcUrl);
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/SftpManager.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/SftpManager.java
deleted file mode 100644
index 14ff1b207b3453d09da60d1c781002e8cc2730d5..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/manager/SftpManager.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.manager;
-
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SftpException;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.api.ListAssert;
-import org.springframework.test.context.TestExecutionListener;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.utility.MountableFile;
-
-import java.io.File;
-import java.util.Base64;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class SftpManager implements TestExecutionListener {
-
- private static final int PORT = 22;
-
- private static final String USER = "user";
-
- private static final String PASSWORD = "password";
-
- private static final byte[] PASSPHRASE = Base64.getDecoder().decode("cGFzc3BocmFzZQ==");
-
- private static final String HOST_KNOWN_FILE = "~/.ssh/known_hosts";
-
- private static final String HOST_KEY_ALGORITHM = "ssh-rsa";
-
- private static final String FSP = MountableFile.forClasspathResource("sftp/rsa_scs").getResolvedPath();
-
- private static final GenericContainer SFTP = new GenericContainer(
- new ImageFromDockerfile()
- .withFileFromClasspath(".", "sftp/docker")
- )
- .withExposedPorts(PORT)
- .withCommand(USER + ":" + PASSWORD + ":1001:::upload");
-
- public static int getMappedPort() {
- return SFTP.getMappedPort(PORT);
- }
-
- static {
- SFTP.start();
- System.setProperty("SUBMISSION_CODE_SERVER_SFTP_HOST", SFTP.getHost());
- System.setProperty("SUBMISSION_CODE_SERVER_SFTP_PORT", SFTP.getMappedPort(PORT).toString());
- System.setProperty("SUBMISSION_CODE_SERVER_SFTP_KEY", FSP);
- }
-
- @SneakyThrows
- public static ListAssert<String> assertThatAllFilesFromSftp() {
-
- log.debug("SFTP: connection is about to be created");
- ChannelSftp channelSftp = createConnection();
- log.debug("SFTP: connexion created");
-
- log.debug("SFTP: list files in upload directory");
- List<String> listAssert;
- Vector<ChannelSftp.LsEntry> ls = channelSftp.ls("/upload");
- listAssert = ls.stream()
- .filter(lsEntry -> !lsEntry.getAttrs().isDir())
- .map(ChannelSftp.LsEntry::getFilename)
- .collect(Collectors.toList());
-
- log.debug("SFTP: connection is about to be closed");
- channelSftp.exit();
- log.debug("SFTP: connection closed");
-
- return Assertions.assertThat(listAssert);
- }
-
- @SneakyThrows
- public static void purgeSftp() {
- ChannelSftp channelSftp = createConnection();
- Vector<ChannelSftp.LsEntry> ls = channelSftp.ls("/upload");
- ls.stream()
- .filter(lsEntry -> !lsEntry.getAttrs().isDir()).forEach(lsEntry -> {
- try {
- channelSftp.rm(lsEntry.getFilename());
- } catch (SftpException e) {
- throw new RuntimeException(e);
- }
- });
- channelSftp.exit();
- }
-
- @SneakyThrows
- public static List<File> getAllFilesFromSftp(File tmpDirectory) {
- List<File> fileList;
- ChannelSftp channelSftp = createConnection();
- Vector<ChannelSftp.LsEntry> ls = channelSftp.ls("/upload");
- fileList = ls.stream()
- .filter(lsEntry -> !lsEntry.getAttrs().isDir())
- .map(lsEntry -> {
- try {
- channelSftp.get(
- "/upload/"
- .concat(lsEntry.getFilename()),
- tmpDirectory.getAbsolutePath()
- );
- return new File(
- tmpDirectory.getAbsolutePath()
- .concat(File.separator)
- .concat(lsEntry.getFilename())
- );
- } catch (SftpException e) {
- throw new RuntimeException(e);
- }
-
- })
- .collect(Collectors.toList());
- channelSftp.exit();
- return fileList;
- }
-
- /**
- * Create connection SFTP to transfer file in server. The connection is created
- * with user and private key of user.
- *
- * @return An object channelSftp.
- */
- private static ChannelSftp createConnection() {
- try {
- JSch jSch = new JSch();
-
- Session jsSession = jSch.getSession(USER, SFTP.getHost(), SFTP.getMappedPort(PORT));
- jSch.addIdentity(FSP, PASSPHRASE);
-
- jSch.setKnownHosts(HOST_KNOWN_FILE);
-
- Properties config = new Properties();
-
- config.put("StrictHostKeyChecking", "no");
-
- config.put("cipher.s2c", "aes256-ctr,aes256-cbc");
- config.put("cipher.c2s", "aes256-ctr,aes256-cbc");
-
- config.put("mac.s2c", "hmac-sha2-256");
- config.put("mac.c2s", "hmac-sha2-256");
-
- config.put("kex", "ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521");
-
- config.put("server_host_key", HOST_KEY_ALGORITHM);
-
- jsSession.setConfig(config);
-
- jsSession.connect();
-
- final ChannelSftp sftp = (ChannelSftp) jsSession.openChannel("sftp");
-
- // attempting to open a jsSession.
- sftp.connect();
-
- sftp.cd("/upload");
-
- return sftp;
- } catch (JSchException | SftpException e) {
- throw new UnsupportedOperationException("unexpected error occurred", e);
- }
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/ItDefinitionSteps.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/ItDefinitionSteps.java
deleted file mode 100644
index 69eeab511b26757ca15f0662710b81ed61e8e1f8..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/ItDefinitionSteps.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.steps;
-
-import com.opencsv.CSVReader;
-import com.opencsv.exceptions.CsvValidationException;
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import fr.gouv.stopc.submission.code.server.domain.utils.FormatDatesKPI;
-import fr.gouv.stopc.submission.code.server.it.dto.CsvRowDto;
-import fr.gouv.stopc.submission.code.server.it.manager.SftpManager;
-import fr.gouv.stopc.submission.code.server.it.utils.SchedulerTestUtil;
-import io.cucumber.java.Before;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.params.shadow.com.univocity.parsers.csv.CsvParser;
-import org.junit.jupiter.params.shadow.com.univocity.parsers.csv.CsvParserSettings;
-import org.testcontainers.shaded.com.google.common.io.Files;
-
-import java.io.*;
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPInputStream;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-@Slf4j
-public class ItDefinitionSteps extends SchedulerTestUtil {
-
- private File tmpDirectory;
-
- @Before
- public void initialization() {
- makeSftpReachable();
- purgeSftpAndDB();
- }
-
- @Given("generate long code older than two months")
- public void generate_long_code_older_than_two_months() throws SubmissionCodeServerException {
- createFalsesCodesInDB(OffsetDateTime.now().minusMonths(3), 100);
- }
-
- @Given("purge old codes")
- public void purge_old_codes() throws SubmissionCodeServerException {
- dailyGenerateSchedule.purgeUnusedCodes();
- }
-
- @Given("purge sftp")
- public void purge_sftp() {
- purgeSftp();
- }
-
- @Given("sftp server is unreachable")
- public void stop_sftp() {
- makeSftpUnreachable();
- }
-
- @Given("scheduler generate codes and stop after the first batch of j8")
- public void scheduler_generate_codes_and_stop_after_the_first_batch_of_j8() {
- Map<Integer, Integer> dayAndVolumeMap = Map.of(0, 300, 8, 40, 9, 0);
- configureScheduler(dayAndVolumeMap);
- assertDoesNotThrow(() -> dailyGenerateSchedule.dailyProductionCodeScheduler());
- }
-
- @Given("scheduler generate {int} code per days since J {int} and J {int}")
- public void scheduler_generate_code_per_days_since_j_and_j(int numberOfCodes, int startDayNumber,
- int endDayNumber) {
- endDayNumber++;
- Map<Integer, Integer> dayAndVolumeMap = Map.of(startDayNumber, numberOfCodes, endDayNumber, 0);
- configureScheduler(dayAndVolumeMap);
- assertDoesNotThrow(() -> dailyGenerateSchedule.dailyProductionCodeScheduler());
- }
-
- @Then("sftp contains {int} files")
- public void then_sftp_contains_files(int numberOfFiles) {
- SftpManager.assertThatAllFilesFromSftp().hasSize(numberOfFiles);
- }
-
- @Then("in db there is {int} codes each days between j {int} and j {int}")
- public void then_in_db_there_is_code_each_days_between_J_and_J(int numberOfCodes,
- int startDayNumber,
- int endDayNumber) {
- int numberOfDays = endDayNumber + 1 - startDayNumber;
- assertFromStartDayDuringNumberOfDaysCorrespondingToNumberOfCodes(startDayNumber, numberOfDays, numberOfCodes);
- }
-
- @Then("then there is no more codes older than two months")
- public void then_there_is_no_more_long_codes_older_thant_two_months() {
- LocalDate today = LocalDate.now(ZoneOffset.UTC);
- final OffsetDateTime endDateTime = FormatDatesKPI.normaliseDateFrom(today, ZoneOffset.UTC.toString())
- .minusMonths(2);
- long availableCodes = submissionCodeRepository.countAllByTypeAndDateEndValidityBefore(
- CodeTypeEnum.LONG.getTypeCode(), endDateTime
- );
- Assertions.assertEquals(0, availableCodes);
- }
-
- @Then("sftp contains {int} files and names are well formatted")
- public void then_sftp_contains_files_and_names_are_well_formatted(int numberOfFiles) {
- OffsetDateTime date = OffsetDateTime.now(ZoneId.of(targetZoneId));
- String dateFile = date.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- SftpManager.assertThatAllFilesFromSftp().hasSize(numberOfFiles)
- .anyMatch(l -> l.matches(dateFile + "\\d{6}_stopcovid_qrcode_batch.tgz"))
- .anyMatch(l -> l.matches(dateFile + "\\d{6}_stopcovid_qrcode_batch.sha256"));
- }
-
- @Then("archive and csv has right filename")
- public void archive_and_csv_has_right_filename() {
- tmpDirectory = Files.createTempDir();
- File archiveFile = getTgzFile();
- OffsetDateTime date = OffsetDateTime.now(ZoneId.of(targetZoneId));
- List<File> listCsvFiles = extractFile(archiveFile.getPath());
- String csvDateFile = date.format(DateTimeFormatter.ofPattern("yyMMdd"));
- Assertions
- .assertTrue(listCsvFiles.stream().allMatch(l -> l.getName().matches("\\d{2}" + csvDateFile + ".csv")));
- }
-
- @Then("csv contains {int} lines")
- public void csv_contains_x_lines(int numberOfLines) throws CsvValidationException, IOException {
- File archiveFile = getTgzFile();
- List<File> listCsvFiles = extractFile(archiveFile.getPath());
- HashedMap filesRowsCount = countRowsFromCsvFiles(listCsvFiles);
- Assertions.assertTrue(filesRowsCount.values().stream().findFirst().isPresent());
- Assertions.assertEquals(numberOfLines, filesRowsCount.values().stream().findFirst().get());
- }
-
- @Then("first csv content is correct")
- public void first_csv_content_is_correct() throws IOException {
- File archiveFile = getTgzFile();
- List<File> listCsvFiles = extractFile(archiveFile.getPath());
- verifyRowsFromCsvFiles(listCsvFiles);
- }
-
- private File getTgzFile() {
- OffsetDateTime date = OffsetDateTime.now(ZoneId.of(targetZoneId));
- String dateFile = date.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- List<File> fileList = SftpManager.getAllFilesFromSftp(tmpDirectory);
- File archiveFile = fileList.stream()
- .filter(l -> l.getName().matches(dateFile + "\\d{6}_stopcovid_qrcode_batch.tgz")).findFirst()
- .orElse(null);
- Assertions.assertNotNull(archiveFile);
- return archiveFile;
- }
-
- private List<File> extractFile(String archiveFilePath) {
- List<File> csvFiles = new ArrayList<>();
- log.debug("File : {}", archiveFilePath);
- if (archiveFilePath.contains(".tgz")) {
- log.debug("Try to extract file : {}", archiveFilePath);
- try (
- FileInputStream fis = new FileInputStream(archiveFilePath);
- GZIPInputStream gzipInputStream = new GZIPInputStream(new BufferedInputStream(fis));
- TarArchiveInputStream tis = new TarArchiveInputStream(gzipInputStream)) {
- TarArchiveEntry entry;
- while ((entry = tis.getNextTarEntry()) != null) {
- log.debug("Extracted file : {}", entry.getName());
- final File currentFile = new File(tmpDirectory, entry.getName());
- extractFileFromTar(currentFile, tis);
- csvFiles.add(currentFile);
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- return csvFiles;
- }
-
- private void extractFileFromTar(File file, TarArchiveInputStream tis) throws IOException {
- int count;
- byte[] data = new byte[2048];
- try (BufferedOutputStream outputStream = new BufferedOutputStream(
- new FileOutputStream(file)
- )) {
-
- while ((count = tis.read(data)) != -1) {
- outputStream.write(data, 0, count);
- }
-
- outputStream.flush();
- }
- }
-
- private HashedMap countRowsFromCsvFiles(List<File> fileList) throws IOException, CsvValidationException {
- HashedMap map = new HashedMap();
- for (File file : fileList) {
- try (CSVReader reader = new CSVReader(new FileReader(file.getPath()))) {
- int count = 0;
- while (reader.readNext() != null) {
- count++;
- }
- map.put(file.getName(), count);
- }
- }
- return map;
- }
-
- private void verifyRowsFromCsvFiles(List<File> fileList) throws IOException {
- for (File file : fileList) {
- CsvParserSettings settings = new CsvParserSettings();
- settings.getFormat().setLineSeparator("\n");
- settings.getFormat().setDelimiter(',');
- CsvParser parser = new CsvParser(settings);
- List<String[]> allRows = parser.parseAll(new FileReader(file));
-
- String[] expected = { "code_pour_qr", "code_brut", "validite_debut", "validite_fin" };
- Assertions.assertTrue(allRows.stream().findFirst().isPresent());
- String[] opt = allRows.stream().findFirst().get();
- Assertions.assertArrayEquals(expected, opt);
-
- List<CsvRowDto> csvRowDtoList = allRows.stream().skip(1).map(p -> new CsvRowDto(p[0], p[1], p[2], p[3]))
- .collect(Collectors.toList());
- for (CsvRowDto row : csvRowDtoList) {
- Assertions.assertTrue(row.getQrcode().matches("https://app.stopcovid.gouv.fr\\?code=(.{36})&type=1"));
- Assertions.assertTrue(row.getCode().matches("(.{36})"));
- Assertions.assertEquals(getMidnight().toInstant(), row.getDateAvailable());
- Instant expectedEndValidityDate = OffsetDateTime.now(ZoneId.of(targetZoneId))
- .truncatedTo(ChronoUnit.DAYS).plus(8, ChronoUnit.DAYS)
- .minus(1, ChronoUnit.MINUTES).toInstant();
- Assertions.assertEquals(expectedEndValidityDate, row.getDateEndValidity());
- }
- }
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/TestCodesSteps.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/TestCodesSteps.java
deleted file mode 100644
index 215843e8feaffb055f168c0392ff826729174923..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/steps/TestCodesSteps.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.steps;
-
-import fr.gouv.stopc.submission.code.server.business.model.CodeSimpleDto;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.VerifyService;
-import io.cucumber.java.en.And;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
-import lombok.RequiredArgsConstructor;
-import org.junit.jupiter.api.Assertions;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@RequiredArgsConstructor
-public class TestCodesSteps {
-
- private final GenerateService generateService;
-
- private final VerifyService verifyService;
-
- private CodeSimpleDto codeSimpleDto;
-
- private Boolean verify;
-
- @When("I request a \"test\" submission code")
- @Given("A \"test\" submission code has been generated")
- public void we_ask_for_a_new_test_code() {
- codeSimpleDto = generateService.generateTestCode();
- Assertions.assertNotNull(codeSimpleDto);
- }
-
- @Then("I received a 12 characters code valid until now plus 15 days")
- public void the_generated_code_is_a_well_formatted_code() {
- assertThat(codeSimpleDto.getCode())
- .matches("([a-zA-Z0-9]{12})");
-
- Instant inThreeDays = Instant.now().truncatedTo(ChronoUnit.DAYS)
- .plus(15, ChronoUnit.DAYS);
- Instant validUntil = Instant.parse(codeSimpleDto.getValidUntil());
- assertThat(inThreeDays).isEqualTo(validUntil);
- }
-
- @When("I request it's verification")
- @And("It's verification has already been requested")
- public void i_request_it_s_verification() {
- verify = verifyService.verifyCode(codeSimpleDto.getCode());
- }
-
- @Then("The verification response is successful")
- public void the_verification_response_is_successful() {
- Assertions.assertTrue(verify);
- }
-
- @Then("The verification response is failed")
- public void the_verification_response_is_failed() {
- Assertions.assertFalse(verify);
- }
-
- @Given("I generate an INVALID \"test\" submission code")
- public void i_request_the_verification_of_an_invalid_test_code() {
- codeSimpleDto = CodeSimpleDto.builder().code("a_false_code").build();
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/IntegrationTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/IntegrationTest.java
deleted file mode 100644
index 3841f3dfe0fb548250c800f2e62b86fffa2c6952..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/IntegrationTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.utils;
-
-import fr.gouv.stopc.submission.code.server.SubmissionCodeServerApplication;
-import fr.gouv.stopc.submission.code.server.it.manager.PostgresManager;
-import fr.gouv.stopc.submission.code.server.it.manager.SftpManager;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.TestPropertySource;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.test.context.TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS;
-
-@ActiveProfiles("dev")
-@TestPropertySource("classpath:application-dev.properties")
-@SpringBootTest(webEnvironment = RANDOM_PORT)
-@TestExecutionListeners(listeners = { SftpManager.class, PostgresManager.class }, mergeMode = MERGE_WITH_DEFAULTS)
-@Retention(RUNTIME)
-@Target(TYPE)
-@ContextConfiguration(classes = SubmissionCodeServerApplication.class)
-public @interface IntegrationTest {
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/SchedulerTestUtil.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/SchedulerTestUtil.java
deleted file mode 100644
index 1b7eb97ed17bc8d5744d83dc13538d852ff80b9a..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/it/utils/SchedulerTestUtil.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package fr.gouv.stopc.submission.code.server.it.utils;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.service.FileService;
-import fr.gouv.stopc.submission.code.server.business.service.GenerateService;
-import fr.gouv.stopc.submission.code.server.business.service.SFTPService;
-import fr.gouv.stopc.submission.code.server.business.service.schedule.DailyGenerateSchedule;
-import fr.gouv.stopc.submission.code.server.business.service.schedule.GenerationConfigProperties;
-import fr.gouv.stopc.submission.code.server.business.service.schedule.GenerationConfigProperties.GenerationConfig;
-import fr.gouv.stopc.submission.code.server.data.entity.Lot;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import fr.gouv.stopc.submission.code.server.it.manager.SftpManager;
-import org.junit.jupiter.api.Assertions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-
-import java.time.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import static java.time.temporal.ChronoUnit.DAYS;
-
-public class SchedulerTestUtil {
-
- @Value("${stop.covid.qr.code.targetzone}")
- protected String targetZoneId;
-
- @Autowired
- protected DailyGenerateSchedule dailyGenerateSchedule;
-
- @Autowired
- protected SubmissionCodeRepository submissionCodeRepository;
-
- @Autowired
- private FileService fileService;
-
- @Autowired
- protected SFTPService sftpService;
-
- @Autowired
- GenerateService generateService;
-
- protected OffsetDateTime getMidnight() {
- return Instant.now()
- .atZone(ZoneId.of("Europe/Paris"))
- .truncatedTo(DAYS)
- .toOffsetDateTime();
- }
-
- protected void assertFromStartDayDuringNumberOfDaysCorrespondingToNumberOfCodes(int startDay, int numberOfDays,
- int numberOfExpectedCodes) {
- OffsetDateTime currentDate = getMidnight();
- OffsetDateTime iterateDate = currentDate.plusDays(startDay);
- for (int days = 0; days < numberOfDays; days++) {
-
- long availableCodes = submissionCodeRepository.countAllByTypeAndDateAvailableEquals(
- CodeTypeEnum.LONG.getTypeCode(), iterateDate
- );
- Assertions.assertEquals(numberOfExpectedCodes, availableCodes);
- iterateDate = iterateDate.plusDays(1);
- }
- }
-
- protected void configureScheduler(Map<Integer, Integer> production) {
- OffsetDateTime todayOff = OffsetDateTime.now(ZoneId.of(targetZoneId)).truncatedTo(DAYS);
- List<GenerationConfig> scheduling = new ArrayList<>();
- production.forEach((day, volume) -> {
- OffsetDateTime currentDate = todayOff.plusDays(day);
- GenerationConfig conf = GenerationConfig.builder().dailyProduction(volume).startDate(currentDate)
- .build();
- scheduling.add(conf);
- }
- );
-
- GenerationConfigProperties generationConfig = new GenerationConfigProperties();
- generationConfig.setScheduling(scheduling);
- generationConfig.setMaxbatchsize(40);
- dailyGenerateSchedule = new DailyGenerateSchedule(
- submissionCodeRepository,
- fileService,
- generationConfig
- );
- }
-
- protected void purgeSftp() {
- SftpManager.purgeSftp();
- }
-
- protected void purgeSftpAndDB() {
- submissionCodeRepository.deleteAll();
- SftpManager.purgeSftp();
- }
-
- protected void createFalsesCodesInDB(OffsetDateTime from, long dailyAmount)
- throws SubmissionCodeServerException {
- Lot newLot = new Lot();
- newLot.setNumberOfCodes(1);
- newLot.setDateExecution(OffsetDateTime.now());
-
- generateService.generateLongCodesWithBulkMethod(
- from,
- dailyAmount,
- newLot,
- OffsetDateTime.now()
- );
- }
-
- public void makeSftpUnreachable() {
- sftpService.setPort(2222);
- }
-
- public void makeSftpReachable() {
- sftpService.setPort(SftpManager.getMappedPort());
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/kpiservice/KpiServiceTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/kpiservice/KpiServiceTest.java
deleted file mode 100644
index 9e700b0ee3620cf0e75382a3f095b236a58bcdce..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/kpiservice/KpiServiceTest.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package fr.gouv.stopc.submission.code.server.kpiservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.model.Kpi;
-import fr.gouv.stopc.submission.code.server.business.service.KpiService;
-import fr.gouv.stopc.submission.code.server.data.repository.SequenceFichierRepository;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import fr.gouv.stopc.submission.code.server.domain.utils.FormatDatesKPI;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.when;
-
-/**
- * Test class for the Kpi generation service
- *
- * @author plant-stopcovid
- */
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = { KpiService.class })
-@TestPropertySource("classpath:application.properties")
-public class KpiServiceTest {
-
- private static final String SHOULD_NOT_FAIL_MESSAGE = "This should not fail.";
-
- /**
- * Zone ID to use
- */
- @Value("${stop.covid.qr.code.targetzone}")
- private String targetZoneId;
-
- @MockBean
- private SubmissionCodeRepository submissionCodeRepositoryMock;
-
- @MockBean
- private SequenceFichierRepository sequenceFichierRepositoryMock;
-
- /**
- * The service to test
- */
- @Autowired
- private KpiService kpiService;
-
- private LocalDate startDate;
-
- private LocalDate endDate;
-
- private OffsetDateTime startDateTime;
-
- private OffsetDateTime endDateTime;
-
- @BeforeEach
- public void init() {
- this.startDate = LocalDate.now();
- this.endDate = this.startDate.plusDays(1);
-
- this.startDateTime = FormatDatesKPI.normaliseDateFrom(this.startDate, this.targetZoneId);
- this.endDateTime = FormatDatesKPI.normaliseDateTo(this.startDate, this.targetZoneId);
- }
-
- @Test
- public void getCodeLongUsedForDay() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate();
-
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- ).thenReturn(2L);
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "2"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(toDate, this.targetZoneId), "2")
- )
- .thenReturn(0L);
- List<Kpi> result = new ArrayList<>();
- try {
- result = this.kpiService.generateKPI(fromDate, toDate);
- } catch (SubmissionCodeServerException s) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
- assertTrue(result.get(0).getNbLongCodesUsed() != 0);
- assertTrue(result.size() == 1);
- }
-
- @Test
- public void getCodeShortUsedForDay() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate();
-
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "2"
- )
- ).thenReturn(2L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(toDate, this.targetZoneId), "2")
- )
- .thenReturn(0L);
- List<Kpi> result = new ArrayList<>();
- try {
- result = this.kpiService.generateKPI(fromDate, toDate);
- } catch (SubmissionCodeServerException s) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
- assertTrue(result.get(0).getNbShortCodesUsed() != 0);
- assertTrue(result.size() == 1);
- }
-
- @Test
- public void getCodeShortExpiredForDay() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate();
-
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "2"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(toDate, this.targetZoneId), "2")
- )
- .thenReturn(1L);
- List<Kpi> result = new ArrayList<>();
- try {
- result = this.kpiService.generateKPI(fromDate, toDate);
- } catch (SubmissionCodeServerException s) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
- assertTrue(result.get(0).getNbShortExpiredCodes() != 0);
- assertTrue(result.size() == 1);
-
- }
-
- @Test
- public void getCodeLongExpiredForDay() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate();
-
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(fromDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "2"
- )
- ).thenReturn(0L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(fromDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(1L);
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(FormatDatesKPI.normaliseDateTo(toDate, this.targetZoneId), "2")
- )
- .thenReturn(0L);
- List<Kpi> result = new ArrayList<>();
- try {
- result = this.kpiService.generateKPI(fromDate, toDate);
- } catch (SubmissionCodeServerException s) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
- assertTrue(result.get(0).getNbLongExpiredCodes() != 0);
- assertTrue(result.size() == 1);
-
- }
-
- @Test
- public void validationDate() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate().minusDays(1L);
- assertThrows(SubmissionCodeServerException.class, () -> {
- this.kpiService.generateKPI(fromDate, toDate);
- });
- }
-
- /**
- * Check if the service KPI create 7 KPI for a week.
- */
- @Test
- public void getKPIForWeek() {
- LocalDate fromDate = OffsetDateTime.now().toLocalDate();
- LocalDate toDate = OffsetDateTime.now().toLocalDate().plusDays(6L);
- int countLongUsed = 1;
- int countShortUsed = 3;
-
- int i = 1;
- for (LocalDate loopDate = fromDate; loopDate.isBefore(toDate)
- || loopDate.isEqual(toDate); loopDate = loopDate.plusDays(1L)) {
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(loopDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(loopDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(Long.valueOf(countLongUsed * i));
- when(
- this.submissionCodeRepositoryMock.countSubmissionCodeUsedByDate(
- FormatDatesKPI.normaliseDateFrom(loopDate, this.targetZoneId),
- FormatDatesKPI.normaliseDateTo(loopDate, this.targetZoneId), "2"
- )
- )
- .thenReturn(Long.valueOf(countShortUsed * i));
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(loopDate, this.targetZoneId), "1"
- )
- )
- .thenReturn(Long.valueOf(i * (i + 1)));
- when(
- this.submissionCodeRepositoryMock
- .countSubmissionCodeExpiredDate(
- FormatDatesKPI.normaliseDateTo(loopDate, this.targetZoneId), "2"
- )
- )
- .thenReturn(Long.valueOf(i * (i + 2)));
- i = i + 1;
- }
- List<Kpi> result = new ArrayList<>();
- try {
- result = this.kpiService.generateKPI(fromDate, toDate);
- } catch (SubmissionCodeServerException s) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
- assertTrue(result.size() == 7);
- }
-
- @Test
- public void testCountShortCodesGenerated() {
-
- // Given
- final long nbGeneratedCodes = 1L;
- when(
- this.submissionCodeRepositoryMock
- .countGeneratedCodes(this.startDateTime, this.endDateTime, CodeTypeEnum.SHORT.getTypeCode())
- ).thenReturn(nbGeneratedCodes);
-
- // When
- List<Kpi> submissionCodeServerKpis = null;
- try {
- submissionCodeServerKpis = this.kpiService.generateKPI(this.startDate, this.endDate);
- } catch (SubmissionCodeServerException e) {
- fail(SHOULD_NOT_FAIL_MESSAGE);
- }
-
- // Then
- assertTrue(submissionCodeServerKpis.size() == 2);
- assertEquals(nbGeneratedCodes, submissionCodeServerKpis.get(0).getNbShortCodesGenerated());
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/server/SubmissionCodeServiceTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/server/SubmissionCodeServiceTest.java
deleted file mode 100644
index 99af34440688ea8ade76faf93ca703e3514ed0a1..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/server/SubmissionCodeServiceTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package fr.gouv.stopc.submission.code.server.server;
-
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.data.entity.SubmissionCode;
-import fr.gouv.stopc.submission.code.server.data.repository.SubmissionCodeRepository;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.StreamSupport;
-
-@Transactional
-public class SubmissionCodeServiceTest {
-
- private SubmissionCodeRepository submissionCodeRepositoryMock = Mockito.mock(SubmissionCodeRepository.class);
-
- @Test
- public void testGetCodeValidity() {
- SubmissionCode submissionCode = new SubmissionCode();
- Mockito.when(submissionCodeRepositoryMock.findByCode(Mockito.anyString()))
- .thenReturn(submissionCode);
- SubmissionCodeService submissionCodeServiceImplTest = new SubmissionCodeService(
- submissionCodeRepositoryMock
- );
- String code = "test";
- Optional<SubmissionCodeDto> result = submissionCodeServiceImplTest.getCodeValidity(code);
- Assertions.assertTrue(result.isPresent());
- }
-
- @Test
- public void testSaveAllCodeGenerateByBatch() {
- List<SubmissionCode> submissionCodes = new ArrayList<>();
- SubmissionCode codePositive = new SubmissionCode();
- submissionCodes.add(codePositive);
- Mockito.when(submissionCodeRepositoryMock.saveAll(Mockito.anyList())).thenReturn(submissionCodes);
- SubmissionCodeService submissionCodeServiceTest = new SubmissionCodeService(
- submissionCodeRepositoryMock
- );
- List<SubmissionCodeDto> submissionCodeDtos = new ArrayList<>();
- SubmissionCodeDto submissionCodeDto = new SubmissionCodeDto();
- submissionCodeDtos.add(submissionCodeDto);
- Iterable<SubmissionCode> result = submissionCodeServiceTest.saveAllCodes(submissionCodeDtos);
- Assertions.assertTrue(StreamSupport.stream(result.spliterator(), false).count() != 0);
- }
-
- @Test
- public void testSaveCodeGenerate() {
- SubmissionCode submissionCode = new SubmissionCode();
- Mockito.when(submissionCodeRepositoryMock.save(submissionCode)).thenReturn(submissionCode);
- SubmissionCodeService submissionCodeServiceTest = new SubmissionCodeService(
- submissionCodeRepositoryMock
- );
- SubmissionCodeDto submissionCodeDto = new SubmissionCodeDto();
- Optional<SubmissionCode> result = submissionCodeServiceTest.saveCode(submissionCodeDto);
- Assertions.assertTrue(result.isPresent());
-
- }
-
- @Test
- public void testGetValidityEmpty() {
- SubmissionCode submissionCode = new SubmissionCode();
- Mockito.when(submissionCodeRepositoryMock.findByCode(Mockito.anyString()))
- .thenReturn(submissionCode);
- SubmissionCodeService submissionCodeService = new SubmissionCodeService(submissionCodeRepositoryMock);
- String code = "";
- Optional<SubmissionCodeDto> result = submissionCodeService.getCodeValidity(code);
- Assertions.assertTrue(!result.isPresent());
- }
-
- @Test
- public void testSaveAllCodeGenerateByBatchEmpty() {
- SubmissionCodeService codePositiveServiceTest = new SubmissionCodeService(submissionCodeRepositoryMock);
- Iterable<SubmissionCode> result = codePositiveServiceTest.saveAllCodes(new ArrayList<>());
- Assertions.assertNotNull(result);
- }
-
- @Test
- public void testUpdateCodeUsed() {
- SubmissionCodeDto submissionCodeDto = new SubmissionCodeDto();
- submissionCodeDto.setCode("test");
- submissionCodeDto.setType("test");
- SubmissionCode submissionCode = new SubmissionCode();
- Mockito.when(submissionCodeRepositoryMock.findByCode(Mockito.anyString()))
- .thenReturn(submissionCode);
- Mockito.when(submissionCodeRepositoryMock.save(submissionCode)).thenReturn(submissionCode);
- SubmissionCodeService submissionCodeService = new SubmissionCodeService(submissionCodeRepositoryMock);
- Assertions.assertTrue(submissionCodeService.updateCodeUsed(submissionCodeDto));
- }
-
- @Test
- public void testUpdateCodeUsedNotFound() {
- SubmissionCodeDto submissionCodeDto = new SubmissionCodeDto();
- submissionCodeDto.setCode("test");
- submissionCodeDto.setType("test");
- SubmissionCode submissionCode = new SubmissionCode();
- Mockito.when(submissionCodeRepositoryMock.findByCode(Mockito.anyString()))
- .thenReturn(null);
- Mockito.when(submissionCodeRepositoryMock.save(submissionCode)).thenReturn(submissionCode);
- SubmissionCodeService submissionCodeService = new SubmissionCodeService(submissionCodeRepositoryMock);
- Assertions.assertTrue(!submissionCodeService.updateCodeUsed(submissionCodeDto));
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/verifyservice/VerifyServiceVerifyCodeMethodTest.java b/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/verifyservice/VerifyServiceVerifyCodeMethodTest.java
deleted file mode 100644
index 6e5530ee68cb754980b62b17fe1b6d06240e2d64..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/fr/gouv/stopc/submission/code/server/verifyservice/VerifyServiceVerifyCodeMethodTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package fr.gouv.stopc.submission.code.server.verifyservice;
-
-import fr.gouv.stopc.submission.code.server.business.controller.exception.SubmissionCodeServerException;
-import fr.gouv.stopc.submission.code.server.business.dto.SubmissionCodeDto;
-import fr.gouv.stopc.submission.code.server.business.service.SubmissionCodeService;
-import fr.gouv.stopc.submission.code.server.business.service.VerifyService;
-import fr.gouv.stopc.submission.code.server.domain.enums.CodeTypeEnum;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-
-import java.time.OffsetDateTime;
-import java.util.Optional;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-public class VerifyServiceVerifyCodeMethodTest {
-
- private static final String FALSE_CODE = "FALSE_CODE";
-
- private static final String GOOD_CODE = "AAAAAA";
-
- @Mock
- SubmissionCodeService submissionCodeService;
-
- @Spy
- @InjectMocks
- private VerifyService verifyService;
-
- @BeforeEach
- public void init() {
- MockitoAnnotations.initMocks(this);
- }
-
- @ParameterizedTest
- @ValueSource(strings = {
- "!!!!!!!-!!!!-!!!!-!!!!-!!!!!!!!!!!!!",
- "!!!!!!",
- "!!!!!!!!!!!!"
- })
- void testCodeHasCorrectSize(String code) throws SubmissionCodeServerException {
-
- Optional<CodeTypeEnum> typeToFound = CodeTypeEnum.searchMatchLength(code.length());
-
- assertThat(typeToFound).isPresent();
- }
-
- @ParameterizedTest
- @ValueSource(strings = {
- "!!!!!!!-!!!!-!!!!-!!!!-!!!!!!!!!!!!",
- "!!!!!!!-!!!!-!!!!-!!!!-!!!!!!!!!!!!!!",
- "!!!!!",
- "!!!!!!!",
- "!!!!!!!!!!!",
- "!!!!!!!!!!!!!"
- })
- void testCodeHasIncorrectSize(String code) throws SubmissionCodeServerException {
-
- Optional<CodeTypeEnum> typeToFound = CodeTypeEnum.searchMatchLength(code.length());
-
- assertThat(typeToFound).isEmpty();
- }
-
- @ParameterizedTest
- @CsvSource({
- "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa , 1",
- "aaaaaa , 2",
- "aaaaaaaaaaaa, 3" })
- void testCodeHasGoodPattern(String code, String type) throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(code))
- .thenReturn(
- Optional.of(
- SubmissionCodeDto.builder()
- .code(code)
- .type(type)
- .used(false)
- .dateAvailable(OffsetDateTime.now().minusDays(11))
- .dateEndValidity(OffsetDateTime.now().plusDays(12))
- .build()
- )
- );
-
- when(this.submissionCodeService.updateCodeUsed(any()))
- .thenReturn(true);
-
- final boolean isPresent = this.verifyService.verifyCode(code);
- assertThat(isPresent).as("The code " + code + " is valid.").isTrue();
- }
-
- @ParameterizedTest
- @CsvSource({
- "!!!!!!!!-!!!!-!!!!-!!!!-!!!!!!!!!!!! , 1",
- "!!!!!! , 2",
- "!!!!!!!!!!!!, 3" })
- void testCodeHasBadPattern(String code, String type) throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(code))
- .thenReturn(
- Optional.of(
- SubmissionCodeDto.builder()
- .code(code)
- .type(type)
- .used(false)
- .dateAvailable(OffsetDateTime.now().minusDays(11))
- .dateEndValidity(OffsetDateTime.now().plusDays(12))
- .build()
- )
- );
-
- when(this.submissionCodeService.updateCodeUsed(any()))
- .thenReturn(true);
-
- final boolean isPresent = this.verifyService.verifyCode(code);
- assertThat(isPresent).as("The code " + code + " is invalid.").isFalse();
- }
-
- /**
- * Code does not exists
- */
- @Test
- void testCodeNotExist() throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(FALSE_CODE))
- .thenReturn(Optional.empty());
-
- final boolean isPresent = this.verifyService.verifyCode(FALSE_CODE);
- assertFalse(isPresent);
-
- }
-
- /**
- * Code exists
- */
- @Test
- void testCodeExist() throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(GOOD_CODE))
- .thenReturn(
- Optional.of(
- SubmissionCodeDto.builder()
- .code(GOOD_CODE)
- .type(CodeTypeEnum.SHORT.getTypeCode())
- .used(false)
- .dateAvailable(OffsetDateTime.now().minusDays(11))
- .dateEndValidity(OffsetDateTime.now().plusDays(12))
- .build()
- )
- );
-
- when(this.submissionCodeService.updateCodeUsed(any()))
- .thenReturn(true);
-
- final boolean isPresent = this.verifyService.verifyCode(GOOD_CODE);
- assertTrue(isPresent);
- }
-
- /**
- * Code was already verified
- */
- @Test
- void testCodeAlreadyVerify() throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(GOOD_CODE))
- .thenReturn(
- Optional.of(
- SubmissionCodeDto.builder()
- .code(GOOD_CODE)
- .type(CodeTypeEnum.SHORT.getTypeCode())
- .used(true)
- .dateAvailable(OffsetDateTime.now().minusDays(11))
- .dateEndValidity(OffsetDateTime.now().plusDays(12))
- .build()
- )
- );
-
- final boolean isPresent2 = this.verifyService.verifyCode(GOOD_CODE);
- assertFalse(isPresent2);
- }
-
- /**
- * Code has expired
- */
- @Test
- void testExpiredCode() throws SubmissionCodeServerException {
-
- when(this.submissionCodeService.getCodeValidity(GOOD_CODE))
- .thenReturn(
- Optional.of(
- SubmissionCodeDto.builder()
- .code(GOOD_CODE)
- .type(CodeTypeEnum.SHORT.getTypeCode())
- .used(false)
- .dateAvailable(OffsetDateTime.now().minusDays(11))
- .dateEndValidity(OffsetDateTime.now().minusDays(10))
- .build()
- )
- );
-
- final boolean isPresent = this.verifyService.verifyCode(GOOD_CODE);
- assertFalse(isPresent);
- }
-}
diff --git a/legacy-submission-code-server/src/test/java/test/fr/gouv/stopc/submission/code/server/ws/SubmissionCodeServerApplicationTest.java b/legacy-submission-code-server/src/test/java/test/fr/gouv/stopc/submission/code/server/ws/SubmissionCodeServerApplicationTest.java
deleted file mode 100644
index 9895012ed97c3695ed6f987ee52835b69c4ddaf5..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/java/test/fr/gouv/stopc/submission/code/server/ws/SubmissionCodeServerApplicationTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package test.fr.gouv.stopc.submission.code.server.ws;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@ExtendWith(SpringExtension.class)
-class SubmissionCodeServerApplicationTest {
-
- @Test
- void testContextLoads() {
- }
-
-}
diff --git a/legacy-submission-code-server/src/test/resources/application-dev.properties b/legacy-submission-code-server/src/test/resources/application-dev.properties
deleted file mode 100644
index 3cc23b36cc4ce25c425aab44356d899ab3309759..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/application-dev.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-## target zone id
-stop.covid.qr.code.targetzone=Europe/Paris
-
-csv.separator=,
-csv.delimiter="
-csv.directory.tmp=/qrcode
-csv.filename.formatter=%d%s.csv
-zip.filename.formatter=%s_stopcovid_qrcode_batch.tgz
-digest.filename.formatter.sha256=%s_stopcovid_qrcode_batch.sha256
-
-# Minimum time before an already generated code may be recycled for a new one
-submission.code.server.sftp.passphrase=${SUBMISSION_CODE_SERVER_SFTP_PASSPHRASE:cGFzc3BocmFzZQ==}
-submission.code.server.sftp.host=${SUBMISSION_CODE_SERVER_SFTP_HOST:localhost}
-submission.code.server.sftp.host.port=${SUBMISSION_CODE_SERVER_SFTP_PORT:22}
-submission.code.server.sftp.host.path=${SUBMISSION_CODE_SERVER_SFTP_PATH:/upload}
-submission.code.server.sftp.host.key.algorithm=${SUBMISSION_CODE_SERVER_SFTP_HOST_KEY_ALGORITHM:ssh-rsa}
-submission.code.server.sftp.knownhosts.file=${SUBMISSION_CODE_SERVER_SFTP_KNOWN_HOST_FILE:~/.ssh/known_hosts}
-submission.code.server.sftp.user=${SUBMISSION_CODE_SERVER_SFTP_USER:user}
-submission.code.server.sftp.key=${SUBMISSION_CODE_SERVER_SFTP_KEY:~/.ssh/rsa/rsa_scs}
-submission.code.server.sftp.enablestricthost=${SUBMISSION_CODE_SERVER_STRICT_HOST_CHECK:no}
-submission.code.server.sftp.enableautotransfer=${SUBMISSION_CODE_SERVER_SFTP_TRANSFER:yes}
-
-spring.datasource.url= ${SUBMISSION_CODE_SERVER_DB_URL:jdbc:postgresql://localhost:5432/dev-submission-code-server-schema}
-spring.datasource.username=${SUBMISSION_CODE_SERVER_DB_USR:postgres}
-spring.datasource.password=${SUBMISSION_CODE_SERVER_DB_PWD:1234}
-spring.jpa.hibernate.ddl-auto=update
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/application.properties b/legacy-submission-code-server/src/test/resources/application.properties
deleted file mode 100644
index 8f56f1aa582d2b56954a33045427099da28cd44e..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/application.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-controller.path.prefix=/api/v1
-controller.path.internal-prefix=/internal/api/v1
-
-generation.code.bulk.num.of.code=10
-
-generation.code.maxattempts=1
-
-# duration in days of long code validity
-generation.code.longcode.validity=7
-
-# duration in days of test code validity
-generation.code.testcode.validity=15
-
-# duration in minutes of short code validity
-generation.code.shortcode.validity=15
-
-## base of stopcovid app urls
-submission.code.server.cron.url=${SUBMISSION_CODE_SERVER_CRON_URL:https://app.stopcovid.gouv.fr?code=%s&type=%s}
-
-## target zone id
-stop.covid.qr.code.targetzone=Europe/Paris
-
-csv.separator=,
-csv.delimiter="
-csv.directory.tmp=/qrcode
-csv.filename.formatter=%d%s.csv
-zip.filename.formatter=%s_stopcovid_qrcode_batch.tgz
-digest.filename.formatter.sha256=%s_stopcovid_qrcode_batch.sha256
-
-# Minimum time before an already generated code may be recycled for a new one
-generation.code.security.shortcode.hours=24
-submission.code.server.sftp.passphrase=${SUBMISSION_CODE_SERVER_SFTP_PASSPHRASE:Tm90T3ZlcnJpZGVuRGVmYXVsdFN1Ym1pc3Npb25Db2RlU2VydmVyUGFzc3BocmFzZQ==}
-submission.code.server.sftp.host=${SUBMISSION_CODE_SERVER_SFTP_HOST:10.0.1.141}
-submission.code.server.sftp.host.port=${SUBMISSION_CODE_SERVER_SFTP_PORT:22}
-submission.code.server.sftp.host.path=${SUBMISSION_CODE_SERVER_SFTP_PATH:path}
-submission.code.server.sftp.host.key.algorithm=${SUBMISSION_CODE_SERVER_SFTP_HOST_KEY_ALGORITHM:ecdsa-sha2-nistp256}
-submission.code.server.sftp.knownhosts.file=${SUBMISSION_CODE_SERVER_SFTP_KNOWN_HOST_FILE:~/.ssh/known_hosts}
-submission.code.server.sftp.user=${SUBMISSION_CODE_SERVER_SFTP_USER:user}
-submission.code.server.sftp.key=${SUBMISSION_CODE_SERVER_SFTP_KEY:~/.ssh/id_rsa.ppk}
-submission.code.server.sftp.enablestricthost=${SUBMISSION_CODE_SERVER_STRICT_HOST_CHECK:yes}
-submission.code.server.sftp.enableautotransfer=${SUBMISSION_CODE_SERVER_SFTP_TRANSFER:false}
-
-submission.code.server.cron.maxbatchsize=${SUBMISSION_CODE_SERVER_CRON_MAXBATCHSIZE:40000}
-submission.code.server.cron.scheduling[0].dailyproduction=${SUBMISSION_CODE_SERVER_CRON_SCHEDULING_0_DAILYPRODUCTION:300000}
-submission.code.server.cron.scheduling[0].startdate=${SUBMISSION_CODE_SERVER_CRON_SCHEDULING_0_STARTDATE:2021-09-01T00:00:00+00:00}
-submission.code.server.cron.schedule=${SUBMISSION_CODE_SERVER_CRON_SCHEDULE:0 0 0 * * *}
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/generatedFileContent.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/generatedFileContent.feature
deleted file mode 100644
index 595a8871643a8f9c7b13059ed92f9bd77989972d..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/generatedFileContent.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Feature: Test if the generated file is well formatted
-
- Background:
- Given scheduler generate 10 code per days since J 0 and J 0
-
- Scenario: Verify the name and the content of the generated files
- Then sftp contains 2 files and names are well formatted
- Then archive and csv has right filename
- Then csv contains 11 lines
- Then first csv content is correct
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/nominalAndIncreasing.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/nominalAndIncreasing.feature
deleted file mode 100644
index 24117a454c576f869a5932aaeb5df8eaacf4571b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/nominalAndIncreasing.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-Feature: Normal scheduler execution and increasing volumetry on day 5
-
- Background:
- Given scheduler generate 300 code per days since J 0 and J 10
-
- Scenario: Nominal execution and increasing
- Then sftp contains 16 files
- Then in db there is 300 codes each days between j 0 and j 10
- Given purge sftp
- Given scheduler generate 400 code per days since J 5 and J 10
- Then sftp contains 6 files
- Then in db there is 300 codes each days between j 0 and j 4
- Then in db there is 400 codes each days between j 5 and j 10
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/partialRecovery.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/partialRecovery.feature
deleted file mode 100644
index d8f72ac8118a92d031550145173991180434f84c..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/partialRecovery.feature
+++ /dev/null
@@ -1,14 +0,0 @@
-Feature: Test resumption of activity following a partial execution yesterday
-
- Background:
- Given scheduler generate codes and stop after the first batch of j8
-
- Scenario: We relaunch the scheduler
- Then sftp contains 16 files
- Then in db there is 300 codes each days between j 0 and j 7
- Then in db there is 40 codes each days between j 8 and j 8
- Then in db there is 0 codes each days between j 9 and j 10
- Given purge sftp
- Given scheduler generate 300 code per days since J 0 and J 10
- Then in db there is 300 codes each days between j 0 and j 10
- Then sftp contains 16 files
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/purge.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/purge.feature
deleted file mode 100644
index 5170330303ced9a1346af3a252e775df2d3d687e..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/purge.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Daily purge
-
- Scenario: There is no more codes older than two months
- Given generate long code older than two months
- When purge old codes
- Then then there is no more codes older than two months
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/recovery.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/recovery.feature
deleted file mode 100644
index a6383e36b88847e6fe668418074835cf7125397f..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/recovery.feature
+++ /dev/null
@@ -1,13 +0,0 @@
-Feature: Test resumption of activity following a non-execution yesterday
-
- Background:
- Given scheduler generate 300 code per days since J 0 and J 8
-
- Scenario: We relaunch the scheduler
- Then sftp contains 16 files
- Then in db there is 300 codes each days between j 0 and j 8
- Then in db there is 0 codes each days between j 9 and j 10
- Given purge sftp
- Given scheduler generate 300 code per days since J 9 and J 10
- Then in db there is 300 codes each days between j 0 and j 10
- Then sftp contains 16 files
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/sftpNotReachable.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/sftpNotReachable.feature
deleted file mode 100644
index 87f770ae62cd99f3faeed4f1551ec575a86fc1d8..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/sftpNotReachable.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: SFTP server is not reachable
-
- Scenario: sftp server is not reachable
- Given sftp server is unreachable
- When scheduler generate 300 code per days since J 0 and J 10
- Then in db there is 0 codes each days between j 0 and j 10
diff --git a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/testCodeGenerateAndVerify.feature b/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/testCodeGenerateAndVerify.feature
deleted file mode 100644
index 215e881e728b660a1c2ac5becc0839914110de03..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/fr/gouv/stopc/submission/code/server/it/features/testCodeGenerateAndVerify.feature
+++ /dev/null
@@ -1,21 +0,0 @@
-Feature: Test code generation
-
- Scenario: Generate a "test" submission code
- When I request a "test" submission code
- Then I received a 12 characters code valid until now plus 15 days
-
- Scenario: I Can verify a "test" submission code
- Given A "test" submission code has been generated
- When I request it's verification
- Then The verification response is successful
-
- Scenario: A test code can't be used twice
- Given A "test" submission code has been generated
- And It's verification has already been requested
- When I request it's verification
- Then The verification response is failed
-
- Scenario: An unknown test code verification must fail
- Given I generate an INVALID "test" submission code
- When I request it's verification
- Then The verification response is failed
diff --git a/legacy-submission-code-server/src/test/resources/junit-platform.properties b/legacy-submission-code-server/src/test/resources/junit-platform.properties
deleted file mode 100644
index 18cf9ee4c8e8409ec405a3d1d6c000e0a0b6e061..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/junit-platform.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-cucumber.publish.quiet=true
-cucumber.plugin=pretty, html:target/cucumber-reports/Cucumber.html
diff --git a/legacy-submission-code-server/src/test/resources/logback-test.xml b/legacy-submission-code-server/src/test/resources/logback-test.xml
deleted file mode 100644
index 81e657f106d2fa1b3ce4a26e93a880c1b3599168..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration>
- <include resource="org/springframework/boot/logging/logback/base.xml" />
- <logger name="org.springframework" level="OFF" />
-</configuration>
diff --git a/legacy-submission-code-server/src/test/resources/sftp/docker/Dockerfile b/legacy-submission-code-server/src/test/resources/sftp/docker/Dockerfile
deleted file mode 100644
index 6f461088206d6af1b61631c9bd24bc0a9cb83fd3..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/sftp/docker/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM atmoz/sftp
-
-RUN apt-get update && \
- apt-get -y install dos2unix
-
-COPY files/rsa_scs.pub /home/user/.ssh/authorized_keys
-COPY files/install.sh /etc/sftp.d/
-
-RUN dos2unix /etc/sftp.d/install.sh && \
- chmod +x /etc/sftp.d/install.sh
-
-EXPOSE 22
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/sftp/docker/files/install.sh b/legacy-submission-code-server/src/test/resources/sftp/docker/files/install.sh
deleted file mode 100644
index dc22538930d6e038525d5eba53d1978584c7efac..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/sftp/docker/files/install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "==> Create upload directory"
-mkdir -p /home/user/upload || true
-chmod -R 007 /home/user/upload || true
-
-echo "==> Add authorized_keys"
-chmod 600 /home/user/.ssh/authorized_keys || true
-chown -R user: /home/user/.ssh/authorized_keys || true
\ No newline at end of file
diff --git a/legacy-submission-code-server/src/test/resources/sftp/docker/files/rsa_scs.pub b/legacy-submission-code-server/src/test/resources/sftp/docker/files/rsa_scs.pub
deleted file mode 100644
index d3a55d8449dd2891d6df60a08a942bdb90514a3b..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/sftp/docker/files/rsa_scs.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVwaDIxh/B2/WmSkeDofJhLzBT45cSQjOQfYagDH+0Z410vmDmmx0EAKuVnRYZCkMh5rYF9KdUD7FQRVRa7teIV7ckV0XbrsmuTejcV//IZ/96Zzxr76Do0LLogyh4ojdxcyp72CAstj3MiERSQCAXPFLADZ+NsR/Iv6UgSN2qr6Erv/dmfA4c40p9N7M+LDcRd/xx01bIece6aB9vNr8ukBqPlKnf3Lw5w37LrC/c3+/tK8/t85wp25RtYsG3CgM7iG+iudhefhfdkiq+c+hhoLxo9fkpwl3gcbQbrX2iLSZfsfWaD7DZ5XX7AQ+83Fvh7oH9yp5h8+voeJAJHsOF968rqmlHUyCOB74wO0biFi3NKMLSL6zSlsO0PpWesmlamKxSfTmrhg9GRJKtKi2CrK0cjGNrIt7/BjHgNHmXrqqL7OfNUlQEPBre7Jx8XO+uVeXztPZYn86/dgAFxc/XLZGDEjo+erimU3jtLt2frsRZLrk5e2GIxvzFHv6Kioc=
diff --git a/legacy-submission-code-server/src/test/resources/sftp/rsa_scs b/legacy-submission-code-server/src/test/resources/sftp/rsa_scs
deleted file mode 100644
index 45485a360aa6189c0aeb985c00630f0e8f4a1cd7..0000000000000000000000000000000000000000
--- a/legacy-submission-code-server/src/test/resources/sftp/rsa_scs
+++ /dev/null
@@ -1,42 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,95A4C0B10B1BB7BE8F9B5D719F33E5A6
-
-nR12iYZxKLxilQiougkdwQuAJ9Jet/clm3zxgg5Hcl+Zet34deFTX8uZTaqPdP+B
-0XIsJKItESYPS5lW6gvIbfh675SuQs13XTIR1U/wZqkPaq0/jbbf73VHcd883B4H
-0jJ4gCbdAIPl+9I0xbd2a5+7hYX1eccPodNC0o2yDB4tRGpBmocGvqntyp9PSJFB
-7WreATG8YbD61cEm1NU1CP+ZXtRrcR2DG+SVHBscmevwHgV1oJBUv3Ac7jhGUoHU
-EQ9OmjDDrISQT21jhQMqDFTsToi2QHzMeP0aUXkF4IpnxAvGh74DaizWdHTfy1SB
-dfREbnWnu0CfJwarp1xYZPOji/wIIehmlvb7F6/wiiMuo97YWbTSEWiK5r/VERmw
-JE23pc9Yjbn52qqUpFZYvn7JLvpF19DkZhNYLc0lod+gMzMPZVd926fUbIaMNJ7R
-DWwAx7UjrPERCh47a5qshKMF8X78xknZzj6/QsvRjD3M36GJGYn6txwKFTwKuXXr
-l1xr302DCLCmOc/dkflw//7Vg2RcAlddSVF9Ff2v4ynb7gohcC4ed9IY8F/s0TJQ
-NhZCt7EVLx4WwxpeAZpBYpBws88p3aEXoy6J3PORpUVyWGvFNDSzwtJN77es45Hq
-AWQyyu2npWEYo5lrKYnUK6myN+7b1/bjmbX29ulhtbVexuFX9cK4DoColys6DN3G
-4SzbBHvgf0O19+k8T/qc+svmr0XX1iFLioACoynA3IKPrs+rVsuZM2xVXSp9h8HK
-ubyzSiGN4dDiTiL9fvjrsEs9oJZOmMa/Jn78/MVYF+Kc7/2rGZGqxbxFbVo9dF4P
-M0sFo4UpRNvhFWvJNChBNpgeTR4CnyLjFoEJyqPDWxANNNoP8Kglneeve8ZiPD9P
-/Mv4nJqgsoIa0mQbc08iMz1miFuIksB8PLdSVv8VF5O/lj5whjVQSP5EOalPenTa
-Urf9qZzujozOw6Qn39+R2k0NnvXQr/k/TMPyiRqOhBC/6sTGQ9+L3gh6l3b4aJIO
-upV1WzqQqK+iL2UgKamJeyuXsRsRy9nN85lUbULqxCbcnKVrEhcnPtqrKhTdsBps
-T7GMMj8b3g8lrI+b0iLpkZ1jMjm4Kc/329LeSum4yxP8nAQRNWTAXfm6hSGeR04q
-r5XGazfGHlCd5pRCUBKak5Fqmlm35xrxd8qE/m/91mGQsyF2ZoPmOFski7DTYSkb
-AxB72ZVubzjAotjP6M0awOmv3vYC0n8LeeshC80C826Dg2t6w+/axPjtcfz+3w6y
-RWPS6934inlRDthCOMukt6V43ojDaAzkDojkgzVF7FaZtkI6kxWVyfHiitEY4zMK
-eDJFTPnXOSAg8T315X9d6gW/C1HgeqmsZFIT83bQQPGBdin+XMs5W2UaPDl5Zrmc
-t8S/3AX1BOmkhZhY+xpo86Tx5ularo7IRUqTJrpMGN6wM1LOE1cMZpZH91IZUx/k
-WdDMJ70kPE32I18QEcxbDlZ1UMqHOhLuJX41RepIQ+/fB5uDtewOwGtIXrFujLAx
-s039iRbw7g6aatuIFuBANOzU2SMYJK38PErhcqcPRjaDxQrN1AsI9UgnARw7LTfO
-LG5T7ypU4nBc6rJmWsD5V6C5xKLjLMl/5dnS1kVCGPduFGH6fJFPRxqapAH5R1tS
-ptQa7bUNTu4f/hDH6LMR9AapNAYO1fu/eYXIN5xSlnL18UCndloQYu7BTkoGv/hn
-i7yVJhGt4leILHfazRtmwbe6mmh+rTcfzp0MILMH3hiPaE/W1VEKXfDmGrCA1zXY
-r4opIvxxDuxlMw38vAosLiVNy2qynlapqphOqQtaOuSHG0r7rcHCXrspiu2DzbDR
-sfSGcMTz76uh4fMINWxdEh6HAzsRshKidj+PxMvDTT1NMZLpx38w/8csXctHjMoL
-/aNXE0i7894wl1y/0tlHKR0bhsmuCcL/UcLwSypayLfDrl0CkaRMh8iO5atpnDxp
-bNNYdXlJLiTao1pFIFF5SoW8JWF9rFdGlZIxI3JDR3oKVBXC2GLgcoYQ0pFc15dv
-0hO9qAOWaz9nbiRGQU89ZK/8vlAURgHFAa1mwzuebfWvLOmiu74FjLhjuuprKXjf
-xJSxTN/I2AuPiTyWAHgsgeSjso0omfqmxxHlO9KQfmsJl0/PF111+O8TtFgIxcWu
-Z2KlON0VIcl7dHVGwE+ImUNYGaxzlu01JuW2fmXfBRlaSY4V30+ZmB44ona5fg5T
-2iE6CL3dCyh2E10stKaKLeN5HFz00ElyAckMY1zV1SRaHNnLL88ZJYwZmiAkWLlV
-3CydQxbR3Q+aR4Bhf08y1Ub9/sZQ1Pkge482dRLw47CicxeZejAatcHtosNKf6f/
------END RSA PRIVATE KEY-----
diff --git a/pom.xml b/pom.xml
index be1fa817a1c93caeab45a756db330f07447dbbd6..74d547520f6d2fb56363f69473268c153fe25ce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>9.25.5</version>
+ <version>9.25.6</version>
</dependency>
<dependency>
@@ -256,6 +256,18 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <docker>
+ <publishRegistry>
+ <username>
+ ${spring-boot.build-image.publishRegistry.username}
+ </username>
+ <password>
+ ${spring-boot.build-image.publishRegistry.password}
+ </password>
+ </publishRegistry>
+ </docker>
+ </configuration>
<executions>
<execution>
<goals>
diff --git a/renovate.json b/renovate.json
index cfea4681ecb08b45db0935fd8a0935ed3cc47de4..39a2b6e9a55b8aaa96d0ee0e1c8f956c5c662e75 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,6 +2,5 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
- ],
- "ignorePaths": ["legacy-submission-code-server/**"]
+ ]
}
diff --git a/src/k8s/deployment.yml b/src/k8s/deployment.yml
new file mode 100644
index 0000000000000000000000000000000000000000..866f961f8fbde3e11d1666cf58c88e5c62048494
--- /dev/null
+++ b/src/k8s/deployment.yml
@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: submission-code-server-deployment
+spec:
+ revisionHistoryLimit: 1
+ selector:
+ matchLabels:
+ app: submission-code-server
+ template:
+ metadata:
+ labels:
+ app: submission-code-server # Bind by service selector>app:
+ spec:
+ containers:
+ - name: submission-app
+ image: submission-server
+ imagePullPolicy: Always
+ ports:
+ - containerPort: 8080
+ env:
+ - name: SPRING_DATASOURCE_URL
+ valueFrom:
+ secretKeyRef:
+ name: submission-secrets
+ key: SPRING_DATASOURCE_URL
+ - name: SPRING_DATASOURCE_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: submission-secrets
+ key: SPRING_DATASOURCE_PASSWORD
+ - name: SUBMISSION_JWTPUBLICKEYS_TOUSANTICOVIDKID
+ valueFrom:
+ secretKeyRef:
+ name: submission-secrets
+ key: SUBMISSION_JWTPUBLICKEYS_TOUSANTICOVIDKID
+ - name: SPRING_DATASOURCE_USERNAME
+ value: pocinit
+ - name: SPRING_FLYWAY_ENABLED
+ value: "true"
+ - name: SPRING_FLYWAY_BASELINE_ON_MIGRATE
+ value: "true"
+ - name: SPRING_FLYWAY_BASELINE_VERSION
+ value: "0"
+ nodeSelector:
+ cce.cloud.com/cce-nodepool: "caascad-inttac-ju-pod-tac-dashing-boa"
+ imagePullSecrets:
+ - name: poc-inttac-poc-img-push-pull-secret
diff --git a/src/k8s/kustomization.yml b/src/k8s/kustomization.yml
new file mode 100644
index 0000000000000000000000000000000000000000..68074df3dd84991446edf8a85855fcc6e596cd0f
--- /dev/null
+++ b/src/k8s/kustomization.yml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - deployment.yml
+ - service.yml
diff --git a/src/k8s/service.yml b/src/k8s/service.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f52abedb54be6a90d19f8a8943217438f3cfa15a
--- /dev/null
+++ b/src/k8s/service.yml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ application: tac # do not delete, used for billing
+ name: submission-code-server-service # Service name
+spec:
+ type: NodePort
+ selector:
+ app: submission-code-server # Defines app that will be targeted
+ ports:
+ - port: 80
+ targetPort: 8080