Bump json from 20180130 to 20230227 in /backend

README.md

@@ -28,9 +28,9 @@ Additional parameters: <br>
 <i>currently supported:</i> 'chrome', 'firefox' <br>
 <i>default:</i> 'chrome' <br>
 <b>url</b> - defines RIHA application URL<br>
-<i>default:</i> 'https://riha-browser-ik.ci.kit' <br><br>
+<i>default:</i> 'https://www.riha.ee' <br><br>
 Running tests with additional parameters:<br>
-`mvn test -DskipTests=false -Dbrowser=chrome -Durl=https://riha-browser-ik.ci.kit`
+`mvn test -DskipTests=false -Dbrowser=chrome -Durl=https://www.riha.ee`
 
 
-
+

autotest/README.md

@@ -0,0 +1,2 @@
+`Run test` 
+mvn test -DskipTests=false -Dbrowser=chrome -Durl=https://www.riha.ee

autotest/src/main/java/ee/ria/riha/context/ScenarioContext.java

@@ -15,7 +15,7 @@ public class ScenarioContext {
     public static final String CREATED_SYSTEM_NAME = "CREATED_SYSTEM_NAME";
     public static final String CREATED_SYSTEM_SHORT_NAME = "CREATED_SYSTEM_SHORT_NAME";
 
-    public static final String DEFAULT_APP_URL = "https://riha-browser-ik.ci.kit";
+    public static final String DEFAULT_APP_URL = "https://www.riha.ee/Avaleht";
 
     private final Map<String, String> context = new HashMap<>();
 

autotest/src/main/java/ee/ria/riha/pages/BasePage.java

@@ -75,4 +75,14 @@ public void rememberSystemNameAndShortName(String systemName, String shortName)
         scenarioContext.saveToContext(ScenarioContext.CREATED_SYSTEM_NAME, systemName);
         scenarioContext.saveToContext(ScenarioContext.CREATED_SYSTEM_SHORT_NAME, shortName);
     }
+
+    public void scrollDown(){
+        JavascriptExecutor js = (JavascriptExecutor) driver;
+        js.executeScript("window.scrollTo(0, document.body.scrollHeight)");
+    }
+
+    public void scrollToElement(WebElement element){
+        JavascriptExecutor js = (JavascriptExecutor) driver;
+        js.executeScript("arguments[0].scrollIntoView();", element);
+    }
 }

autotest/src/main/java/ee/ria/riha/pages/EvaluateSystemsPage.java

@@ -31,6 +31,9 @@ public String getLastInfosystemDateClass() {
     }
 
     public  boolean isPreviouslySavedSystemVisibleInTheFeedbackTable() {
+        wait.sleep(1000);
+        scrollToElement(lastInfosystem);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, lastInfosystem, "lastInfosystem");
         String savedShortName = scenarioContext.getFromContext(ScenarioContext.CREATED_SYSTEM_SHORT_NAME);
         return savedShortName.trim().equalsIgnoreCase(lastInfosystem.getText().trim());

autotest/src/main/java/ee/ria/riha/pages/HomePage.java

@@ -59,7 +59,7 @@ public String getLoggedInUsersName() {
 
     public void selectSecondOrganization() {
         wait.forPresenceOfElements(25, By.xpath("/html/body/ngb-modal-window"), "modal");
-        modalContainer.findElement(By.cssSelector("tr:nth-child(2) > td")).click();
+        modalContainer.findElement(By.cssSelector("tr:nth-child(3) > td")).click();
         wait.sleep(3000);
     }
 
@@ -99,6 +99,9 @@ public void clickEvaluate() {
     }
 
     public void openSelectOrganizationDialog() {
+        wait.sleep(1000);
+        scrollToElement(selectOrganizationButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, selectOrganizationButton, "selectOrganizationButton");
         selectOrganizationButton.click();
     }

autotest/src/main/java/ee/ria/riha/pages/InfosystemPage.java

@@ -183,14 +183,21 @@ public void clickOnTopic(String topic) {
     public void clickEditButton() {
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, editButton, "editButton");
         editButton.click();
+        wait.sleep(2000);
     }
 
     public void clickEditLegalActsButton() {
+        wait.sleep(1000);
+        scrollToElement(editLegalActsButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, editLegalActsButton, "editButton");
         editLegalActsButton.click();
     }
 
     public void clickEditContactsButton() {
+        wait.sleep(1000);
+        scrollToElement(editContactsButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, editContactsButton, "editContactsButton");
         editContactsButton.click();
     }
@@ -207,6 +214,9 @@ public void clickSelectDevelopmentStatus(boolean isActiveDevelopment) {
     }
 
     public void clickRequestFeedbackButton() {
+        wait.sleep(2000);
+        scrollToElement(feedbackRequestButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, feedbackRequestButton, "feedback request button");
         feedbackRequestButton.click();
         wait.sleep(2000);
@@ -237,7 +247,7 @@ public String getOpenIssues() {
 
     public void userClicksOnUploadNewFileButton() {
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, modalContainer, "modalContainer");
-        modalContainer.findElement(By.cssSelector(".ml-2:nth-child(2)")).click();
+        modalContainer.findElement(By.cssSelector(".ms-2:nth-child(2)")).click();
     }
 
     public boolean isUploadedDateDisplayedOnTheLastUploadedDocument() {
@@ -302,11 +312,11 @@ public void userAddsFeedbackWithTypeAndComment(String type, String comment) {
         modalContainer.findElement(By.name("commentText")).sendKeys(comment);
 
         modalContainer.findElement(By.name("decisionType")).click();
-        wait.sleep(2000);
+        wait.sleep(3000);
         new Select(modalContainer.findElement(By.name("decisionType"))).selectByVisibleText(type);
 
         wait.sleep(2000);
-        modalContainer.findElement(By.cssSelector(".mx-2 > .btn")).click();
+        modalContainer.findElement(By.xpath("/html/body/ngb-modal-window/div/div/app-approver-feedback-details/section/div/form/div/div[2]/div[2]/div[2]/button")).click();
 
         wait.sleep(2000);
         modalContainer.findElement(By.cssSelector(".btn-secondary")).click();
@@ -328,6 +338,8 @@ public void createIssue(String title, String comment) {
     public boolean isIssueSaved() {
         String issueTitle = scenarioContext.getFromContext(ISSUE_TITLE);
         wait.forPresenceOfElements(DISPLAY_ELEMENT_TIMEOUT, By.linkText(issueTitle), "linkTitle");
+        scrollToElement(driver.findElement(By.linkText(issueTitle)));
+        wait.sleep(2000);
         driver.findElement(By.linkText(issueTitle)).click();
 
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, modalContainer, "modalContainer");
@@ -365,6 +377,8 @@ public void clickSubmitFeedbackRequestButton() {
     }
 
     public void clickSaveButton() {
+        scrollDown();
+        wait.sleep(2000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, saveButton, "saveButton");
         saveButton.click();
     }
@@ -423,16 +437,22 @@ public void enterNewTopic(String topic) {
     }
 
     public void removeTopic(String topic) {
+        scrollDown();
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, topicTagsContainer, "topicTagsContainer");
         WebElement topicTag = topicTagsContainer.findElements(By.tagName("tag"))
                 .stream()
                 .filter(tag -> tag.findElement(By.tagName("div")).getAttribute("aria-label").equalsIgnoreCase(topic))
                 .findFirst()
                 .get();
         topicTag.findElement(By.tagName("delete-icon")).click();
+        wait.sleep(1000);
     }
 
     public void clickEditDocumentationButton() {
+        wait.sleep(1000);
+        scrollToElement(editDocumentationButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, editDocumentationButton, "editDocumentationButton");
         editDocumentationButton.click();
     }
@@ -444,6 +464,9 @@ public void clickOnAddNewDocumentationUrlButton() {
     }
 
     public void clickEditDataButton() {
+        wait.sleep(2000);
+        scrollToElement(editDataButton);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, editDataButton, "editDataButton");
         editDataButton.click();
     }
@@ -480,7 +503,7 @@ public void uploadNewFileDocumentFile(String fileName) {
     }
 
     public boolean isUserCanEditLastUploadedDocument() {
-        modalContainer.findElement(By.cssSelector(".expandable-block:last-child .mr-1")).click();
+        modalContainer.findElement(By.cssSelector(".expandable-block:last-child .me-1")).click();
         wait.sleep(1000);
         boolean filenameInputVisible = modalContainer.findElement(By.cssSelector(".expandable-block:last-child .form-group:nth-child(1)")).isDisplayed();
         modalContainer.findElement(By.cssSelector(".btn-success")).click();
@@ -497,6 +520,7 @@ public void enterNewLegalActInfo(String url, String title) {
         modifiedSelectByValue(new Select(legalTypeSelect), "LEGAL_TYPE_STATUTE");
         modalContainer.findElement(By.cssSelector(".col-12 > .btn")).click();
         modalContainer.findElement(By.cssSelector(".btn-success")).click();
+        wait.sleep(1000);
     }
 
     public String getTechDocUrls() {
@@ -685,6 +709,9 @@ public void clickLogOut() {
     }
 
     public void clickFeedbackTopic(String topic) {
+        wait.sleep(1000);
+        scrollToElement(driver.findElement(By.linkText(topic)));
+        wait.sleep(2000);
         wait.forPresenceOfElements(DISPLAY_ELEMENT_TIMEOUT, By.linkText(topic), "feedbackTopic");
         driver.findElement(By.linkText(topic)).click();
     }

autotest/src/main/java/ee/ria/riha/pages/MyInfosystemsPage.java

@@ -80,6 +80,9 @@ public void goToInfosystemPage(String infosystem) {
     }
 
     public void goToCreateNewInfosystemPage() {
+        wait.sleep(1000);
+        scrollToElement(createNewLink);
+        wait.sleep(1000);
         wait.forElementToBeDisplayed(DISPLAY_ELEMENT_TIMEOUT, createNewLink, "createNewLink");
         createNewLink.click();
     }

autotest/src/test/resources/ee/ria/riha/AddReferenceToInfoSystem.feature

@@ -4,7 +4,7 @@ Feature: Infosystems feedback requesting
     Given User is logged in to "/" as "60001019906" using tel. number "00000766"
     And HomePage: user opens 'my organization infosystems' page
 
-  Scenario: User can add contact to infosystem (RIHAKB-423)
+  Scenario: User can add relation to infosystem (RIHAKB-423)
     Given MyInfosystemsPage: user select "riha-test" infosystem
     When InfosytemPage: user clicks on 'Seosed süsteemidega' in the navigation bar
     Then InfosystemPage: url will contain '/Infosüsteemid/Vaata/riha-test#seosed'

autotest/src/test/resources/ee/ria/riha/HomePage.feature

@@ -12,4 +12,4 @@ Feature: Home page functionality
 
   Scenario: End user can perform a search in RIHA navigation (RIHAKB-540)
     Given HomePage: user clicks on the search bar and enters 'kontakt'
-    Then InfosytemsPage: the search bar still contains entered words 'kontakt' and url ends with '/Infosüsteemid?searchText=kontakt&sort=meta.update_timestamp&dir=DESC'
+    Then InfosytemsPage: the search bar still contains entered words 'kontakt' and url ends with '/Infosüsteemid?searchText=kontakt&sort=meta.update_timestamp&dir=DESC'

backend/pom.xml

@@ -47,36 +47,19 @@
         </dependency>
 
         <!-- TARA integration related -->
+        <!-- ENDOF TARA integration related -->
+
         <dependency>
-            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>2.5.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-jose</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-core</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
-        <!-- ENDOF TARA integration related -->
 
         <dependency>
             <groupId>ee.ria.riha</groupId>
             <artifactId>browser-frontend</artifactId>
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>ee.ria.riha</groupId>
-            <artifactId>storage-client</artifactId>
-            <version>0.13.6</version>
-        </dependency>
 
         <dependency>
             <groupId>com.github.fge</groupId>
@@ -92,7 +75,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.5.12</version>
+            <version>1.6.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -120,6 +103,27 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>7.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230227</version>
+        </dependency>
+
+        <!-- Storage-client -->
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -161,10 +165,11 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
-                    <skip>true</skip>
+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
             </plugin>
         </plugins>

backend/src/main/java/ee/ria/riha/client/OperationType.java

@@ -0,0 +1,23 @@
+package ee.ria.riha.client;
+
+/**
+ * @author Valentin Suhnjov
+ */
+public enum OperationType {
+    GET("get"),
+    PUT("put"),
+    POST("post"),
+    DELETE("delete"),
+    COUNT("count");
+
+    private final String value;
+
+    OperationType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}