rename columns to english

Author: Tristan-WorkGH

src/main/java/org/gridsuite/useradmin/server/repository/ConnectionEntity.java

@@ -27,19 +27,19 @@
 @Entity
 @Table(name = "connection", indexes = {@Index(name = "connection_sub_index", columnList = "sub")})
 public class ConnectionEntity extends AbstractUserEntity {
-    @Column(name = "firstConnexionDate", nullable = false)
-    private LocalDateTime firstConnexionDate;
+    @Column(name = "firstConnectionDate", nullable = false)
+    private LocalDateTime firstConnectionDate;
 
-    @Column(name = "lastConnexionDate", nullable = false)
-    private LocalDateTime lastConnexionDate;
+    @Column(name = "lastConnectionDate", nullable = false)
+    private LocalDateTime lastConnectionDate;
 
     @Column(name = "connectionAccepted", nullable = false)
     private Boolean connectionAccepted;
 
-    public ConnectionEntity(String sub, LocalDateTime firstConnexionDate, LocalDateTime lastConnexionDate, Boolean connectionAccepted) {
+    public ConnectionEntity(String sub, LocalDateTime firstConnectionDate, LocalDateTime lastConnectionDate, Boolean connectionAccepted) {
         super(sub);
-        this.firstConnexionDate = firstConnexionDate;
-        this.lastConnexionDate = lastConnexionDate;
+        this.firstConnectionDate = firstConnectionDate;
+        this.lastConnectionDate = lastConnectionDate;
         this.connectionAccepted = connectionAccepted;
     }
 }

src/main/java/org/gridsuite/useradmin/server/repository/ConnectionRepository.java

@@ -28,7 +28,7 @@ public interface ConnectionRepository extends JpaRepository<ConnectionEntity, UU
     @Modifying
     default void recordNewConnection(@NonNull final String sub, final boolean connectionAccepted) {
         this.findBySub/*IgnoreCase*/(sub).ifPresentOrElse(
-            conn -> this.save(conn.setLastConnexionDate(LocalDateTime.now()).setConnectionAccepted(connectionAccepted)),
+            conn -> this.save(conn.setLastConnectionDate(LocalDateTime.now()).setConnectionAccepted(connectionAccepted)),
             () -> this.save(new ConnectionEntity(sub, LocalDateTime.now(), LocalDateTime.now(), connectionAccepted))
         );
     }

src/main/java/org/gridsuite/useradmin/server/service/ConnectionsService.java

@@ -38,7 +38,7 @@ public void recordConnectionAttempt(String sub, Boolean isAllowed) {
             connectionEntity = new ConnectionEntity(sub, LocalDateTime.now().truncatedTo(ChronoUnit.MICROS), LocalDateTime.now().truncatedTo(ChronoUnit.MICROS), isAllowed);
             connectionRepository.save(connectionEntity);
         } else {
-            connectionEntity.setLastConnexionDate(LocalDateTime.now().truncatedTo(ChronoUnit.MICROS));
+            connectionEntity.setLastConnectionDate(LocalDateTime.now().truncatedTo(ChronoUnit.MICROS));
             connectionEntity.setConnectionAccepted(isAllowed);
         }
     }
@@ -51,11 +51,11 @@ public List<ConnectionEntity> removeDuplicates() {
         connectionsBySub.keySet().forEach(sub ->
             connectionsBySub.get(sub).stream().skip(1).forEach(connectionEntity -> {
                 ConnectionEntity groupedEntity = connectionsBySub.get(sub).get(0);
-                if (connectionEntity.getLastConnexionDate().isAfter(groupedEntity.getLastConnexionDate())) {
-                    groupedEntity.setLastConnexionDate(connectionEntity.getLastConnexionDate());
+                if (connectionEntity.getLastConnectionDate().isAfter(groupedEntity.getLastConnectionDate())) {
+                    groupedEntity.setLastConnectionDate(connectionEntity.getLastConnectionDate());
                 }
-                if (connectionEntity.getFirstConnexionDate().isBefore(groupedEntity.getFirstConnexionDate())) {
-                    groupedEntity.setFirstConnexionDate(connectionEntity.getFirstConnexionDate());
+                if (connectionEntity.getFirstConnectionDate().isBefore(groupedEntity.getFirstConnectionDate())) {
+                    groupedEntity.setFirstConnectionDate(connectionEntity.getFirstConnectionDate());
                 }
                 connectionRepository.delete(connectionEntity);
             })

src/main/resources/db/changelog/changesets/changelog_20240109T161028Z.xml

@@ -1,6 +1,6 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-    <changeSet author="chuinetri" id="1704818243021-0">
+    <changeSet author="chuinetri" id="1704818243021-1">
         <comment>Deduplicate rows before adding unique constraint</comment>
         <delete tableName="user_infos">
             <where>id in (select id from (select row_number() over (partition by sub) as rnb, * from user_infos) subquery where rnb > 1)</where>
@@ -26,8 +26,13 @@
         </delete>
     </changeSet>
 
-    <changeSet author="chuinetri" id="1704818243021-1">
+    <changeSet author="chuinetri" id="1704818243021-2">
         <addUniqueConstraint columnNames="sub" constraintName="UC_USER_INFOSSUB_COL" tableName="user_infos"/>
         <addUniqueConstraint columnNames="sub" constraintName="UC_CONNECTIONSUB_COL" tableName="connection"/>
     </changeSet>
+
+    <changeSet author="chuinetri" id="1704818243021-3">
+        <renameColumn tableName="connection" oldColumnName="first_connexion_date" newColumnName="first_connection_date"/>
+        <renameColumn tableName="connection" oldColumnName="last_connexion_date" newColumnName="last_connection_date"/>
+    </changeSet>
 </databaseChangeLog>

src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java

@@ -116,14 +116,14 @@ public void testUserAdmin() throws Exception {
         assertEquals(3, connectionRepository.findAll().size());
         assertTrue(connectionRepository.findBySub(USER_SUB).get().getConnectionAccepted());
         assertFalse(connectionRepository.findBySub("UNKNOWN").get().getConnectionAccepted());
-        LocalDateTime firstConnectionDate = connectionRepository.findBySub(USER_SUB).get().getFirstConnexionDate();
+        LocalDateTime firstConnectionDate = connectionRepository.findBySub(USER_SUB).get().getFirstConnectionDate();
         //firstConnectionDate and lastConnectionDate are equals cause this is the first connection for this user
-        assertTrue(firstConnectionDate.toEpochSecond(ZoneOffset.UTC) < connectionRepository.findBySub(USER_SUB).get().getLastConnexionDate().toEpochSecond(ZoneOffset.UTC) + 2);
+        assertTrue(firstConnectionDate.toEpochSecond(ZoneOffset.UTC) < connectionRepository.findBySub(USER_SUB).get().getLastConnectionDate().toEpochSecond(ZoneOffset.UTC) + 2);
 
         mockMvc.perform(head("/" + UserAdminApi.API_VERSION + "/users/{sub}", USER_SUB))
                 .andExpect(status().isOk())
                 .andReturn();
-        assertEquals(firstConnectionDate, connectionRepository.findBySub(USER_SUB).get().getFirstConnexionDate());
+        assertEquals(firstConnectionDate, connectionRepository.findBySub(USER_SUB).get().getFirstConnectionDate());
 
         mockMvc.perform(delete("/" + UserAdminApi.API_VERSION + "/users/{id}", userId)
                         .header("userId", ADMIN_USER)