WIP

MAIF · Oct 11, 2024 · 888518d · 888518d
1 parent 381224a
commit 888518d
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 10 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -6,7 +6,7 @@ services:
       - 27017:27017
 
   zookeeper:
-    image: confluentinc/cp-zookeeper:3.2.1
+    image: confluentinc/cp-zookeeper:5.2.3
     ports:
       - 32182:32181
     expose:
@@ -16,7 +16,7 @@ services:
       - ZOOKEEPER_TICK_TIME=2000
 
   kafka:
-    image: confluentinc/cp-kafka:3.2.1
+    image: confluentinc/cp-kafka:5.2.3
     ports:
       - 29092:29092
     expose:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - 27017:27017
   zookeeper:
-    image: confluentinc/cp-zookeeper:3.2.1
+    image: confluentinc/cp-zookeeper:5.2.3
     ports:
      - 32182:32181
     environment:
@@ -15,7 +15,7 @@ services:
       - "moby:127.0.0.1"
       - "localhost: 127.0.0.1"
   kafka:
-    image: confluentinc/cp-kafka:3.2.1
+    image: confluentinc/cp-kafka:5.2.3
     ports:
      - 29092:29092
     depends_on:

diff --git a/nio-server/app/controllers/ConsentController.scala b/nio-server/app/controllers/ConsentController.scala
@@ -130,12 +130,12 @@ class ConsentController(
 
       }
 
-  def find(tenant: String, orgKey: String, userId: String): Action[AnyContent] = AuthAction.async { implicit req =>
+  def find(tenant: String, orgKey: String, userId: String, showExpiredConsents: Boolean): Action[AnyContent] = AuthAction.async { implicit req =>
     import cats.data._
     import cats.implicits._
 
     EitherT(findConsentFacts(tenant, orgKey, userId, req.authInfo.offerRestrictionPatterns))
-      .fold(error => error.renderError(), consentFact => renderMethod(consentFact))
+      .fold(error => error.renderError(), consentFact => renderMethod(consentFact.filterExpiredConsent(showExpiredConsents)))
   }
 
   private def findConsentFacts(

diff --git a/nio-server/app/models/ConsentFact.scala b/nio-server/app/models/ConsentFact.scala
@@ -468,6 +468,19 @@ case class ConsentFact(
       )
     ))
   }
+
+  def filterExpiredConsent(showExpiredConsents: Boolean): ConsentFact = {
+    if (showExpiredConsents) {
+      this
+    } else {
+      val now = LocalDateTime.now(Clock.systemUTC())
+      this.copy(groups = this.groups.map(group =>
+        group.copy(consents = group.consents.toList.filter(c =>
+          c.expiredAt.isEmpty || c.expiredAt.exists(d => d.isAfter(now))
+        ))
+      ))
+    }
+  }
 }
 
 object ConsentFact extends ReadableEntity[ConsentFact] {

diff --git a/nio-server/test/resources/default.conf → nio-server/conf/dataset.conf b/nio-server/test/resources/default.conf → nio-server/conf/dataset.conf
diff --git a/nio-server/conf/dev.conf b/nio-server/conf/dev.conf
@@ -0,0 +1,4 @@
+include "application"
+include "dataset"
+
+db.flush=true
diff --git a/nio-server/conf/routes b/nio-server/conf/routes
@@ -109,7 +109,7 @@ PATCH         /api/:tenant/organisations/:orgKey/users/:userId
 
 DELETE        /api/:tenant/organisations/:orgKey/users/:userId/offers/:offerKey                                           controllers.ConsentController.deleteOffer(tenant: String, orgKey: String, userId: String, offerKey: String)
 
-GET           /api/:tenant/organisations/:orgKey/users/:userId                                                            controllers.ConsentController.find(tenant: String, orgKey: String, userId: String)
+GET           /api/:tenant/organisations/:orgKey/users/:userId                                                            controllers.ConsentController.find(tenant: String, orgKey: String, userId: String, showExpiredConsents: Boolean ?= false)
 
 GET           /api/:tenant/organisations/:orgKey/users/:userId/logs                                                       controllers.ConsentController.getConsentFactHistory(tenant: String, orgKey: String, userId: String, page: Int ?= 0, pageSize: Int ?= 10)
 

diff --git a/nio-server/javascript/.nvmrc b/nio-server/javascript/.nvmrc
@@ -0,0 +1 @@
+v11.8.0
diff --git a/nio-server/javascript/src/nio/pages/Consents.js b/nio-server/javascript/src/nio/pages/Consents.js
@@ -182,7 +182,10 @@ class Consents extends Component {
                                                    checked={consent.checked}
                                                    onChange={() => this.onChangeConsents(consent.key, !consent.checked)}/>
                                             <label style={{marginLeft: "20px"}}
-                                                   htmlFor={`${this.props.index}-${index}-${consent.key}`}>{consent.label}</label>
+                                                   htmlFor={`${this.props.index}-${index}-${consent.key}`}>{consent.label}
+                                                {consent.expiredAt && (new Date(consent.expiredAt) >= new Date()) && <span> (expire le {new Date(consent.expiredAt).toLocaleString()})</span>}
+                                                {consent.expiredAt && (new Date(consent.expiredAt) < new Date()) && <span> (a expiré le {new Date(consent.expiredAt).toLocaleString()})</span>}
+                                            </label>
                                         </div>
                                     </div>
                                 )

diff --git a/nio-server/javascript/src/nio/pages/GroupPermissionPage.js b/nio-server/javascript/src/nio/pages/GroupPermissionPage.js
@@ -200,6 +200,13 @@ class Permission extends Component {
                              possibleValues={["OptIn", "OptOut"]}
                              errorKey={`${this.props.prefixe}permissions.${this.props.index}.type.required`}/>
 
+                <TextInput label={"Validité de la permission"}
+                           value={this.state.permission.validityPeriod}
+                           onChange={(e) => this.onChange(e, "validityPeriod")}
+                           disabled={this.props.readOnlyMode}
+                           errorMessage={this.props.errors}
+                           errorKey={`${this.props.prefixe}permissions.${this.props.index}.validityPeriod.required`}
+                />
             </div>
         );
     }

diff --git a/nio-server/javascript/src/nio/services/ConsentService.js b/nio-server/javascript/src/nio/services/ConsentService.js
@@ -1,6 +1,6 @@
 export function getConsents(tenant, organisationKey, userId) {
 
-  return fetch(`/api/${tenant}/organisations/${organisationKey}/users/${userId}`, {
+  return fetch(`/api/${tenant}/organisations/${organisationKey}/users/${userId}?showExpiredConsents=true`, {
     method: "GET",
     credentials: 'include',
     headers: {

diff --git a/nio-server/test/utils/TestUtils.scala b/nio-server/test/utils/TestUtils.scala
@@ -94,7 +94,7 @@ trait TestUtils
                       |db.tenants=["$tenant"]
                       |nio.filter.securityMode="default"
        """.stripMargin)
-      .resolve().withFallback(ConfigFactory.load("default.conf"))
+      .resolve().withFallback(ConfigFactory.load("dataset.conf"))
   }
 
   protected lazy val authInfo: AuthInfoMock = new AuthInfoTest