Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

#13147 - Phone Number Validation for E-Santé Reports – Remove and Sto… #13151

Merged
merged 10 commits into from
Oct 8, 2024
Merged

#13147 - Phone Number Validation for E-Santé Reports – Remove and Sto… #13151

merged 10 commits into from
Oct 8, 2024

Conversation

sergiupacurariu
Copy link
Contributor

…re Non-Numeric Text

Fixes #13147

leventegal-she
leventegal-she requested changes Oct 1, 2024
View reviewed changes
Copy link
Contributor

@leventegal-she leventegal-she left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the new field should be mapped to case/contact/event participant when processing

sormas-api/src/test/java/de/symeda/sormas/api/i18n/I18nConstantGenerator.java Outdated
@@ -29,7 +29,7 @@
*/
public class I18nConstantGenerator {

private static final String FILE_PATH_PATTERN = "src/main/java/de/symeda/sormas/api/i18n/%s.java";
private static final String FILE_PATH_PATTERN = "sormas-api/src/main/java/de/symeda/sormas/api/i18n/%s.java";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java Outdated
@@ -449,4 +450,13 @@ public String getTsv() {
public void setTsv(String tsv) {
this.tsv = tsv;
}

@Column(length = CHARACTER_LIMIT_DEFAULT)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be CHARACTER_LIMIT_TEXT

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

@sormas-vitagroup
Copy link
Contributor

SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=13151

#13147 - Phone Number Validation for E-Santé Reports – Remove and Sto…
3a0cd35 
…re Non-Numeric Text - changes after review
@sergiupacurariu
Copy link
Contributor Author

the new additionalDetails field was added to Person's general comment field

SergiuPacurariu added 2 commits October 3, 2024 17:05
@sormas-vitagroup
Copy link
Contributor

SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=13151

leventegal-she
leventegal-she requested changes Oct 7, 2024
View reviewed changes
sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/ExternalMessageDto.java Outdated
@@ -158,6 +158,9 @@ public class ExternalMessageDto extends SormasToSormasShareableDto {

private boolean automaticProcessingPossible;

@Size(max = FieldConstraints.CHARACTER_LIMIT_TEXT, message = Validations.textTooLong)
private String additionalDetails;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rename to personAdditionalDetails

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed

SergiuPacurariu added 2 commits October 7, 2024 16:10
#13147 - Phone Number Validation for E-Santé Reports – Remove and Sto…
3543c72 
…re Non-Numeric Text - changes after review
Merge branch 'development' of github.com:SORMAS-Foundation/SORMAS-Pro…
5391ba8 
…ject into feature-13147_phone_number_validation_for_e-sante

# Conflicts:
#	sormas-backend/src/main/resources/sql/sormas_schema.sql
@sormas-vitagroup
Copy link
Contributor

SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=13151

leventegal-she
leventegal-she requested changes Oct 8, 2024
View reviewed changes
...pi/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java Outdated

final PersonDto person = buildPerson();
person.setAdditionalDetails(externalMessageDto.getPersonAdditionalDetails());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the additional details should be set using the mapper. see buildPerson function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

sormas-backend/src/main/resources/sql/sormas_schema.sql Outdated
@@ -13249,4 +13249,12 @@ ALTER TABLE users_history ADD COLUMN externalid text;

INSERT INTO schema_version (version_number, comment) VALUES (550, '#13080 Keycloak username modification is not synced by sormas');

-- 2024-09-23 #13147 Phone Number Validation for E-Santé Reports – Remove and Store Non-Numeric Text
ALTER TABLE externalmessage
ADD COLUMN personAdditionaldetails text;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

column names are all lowercase in general

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

@sormas-vitagroup
Copy link
Contributor

SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=13151

@leventegal-she leventegal-she merged commit 4fdea77 into development Oct 8, 2024
5 of 11 checks passed
@leventegal-she leventegal-she deleted the feature-13147_phone_number_validation_for_e-sante branch October 8, 2024 12:19
@sormas-vitagroup
Copy link
Contributor

SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=13151

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leventegal-she leventegal-she Awaiting requested review from leventegal-she

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Phone Number Validation for E-Santé Reports – Remove and Store Non-Numeric Text
3 participants
@sergiupacurariu @sormas-vitagroup @leventegal-she