Read API: Adapt the code to #72

Author: ilankri

src/api_saisie_read_piqi.ml

@@ -179,4 +179,9 @@ module Api_saisie_read = struct
     decode Translate.Api_saisie_read.ProtocToPiqi.identifier_person
       Api_saisie_read_protoc.decode_pb_identifier_person
       Api_saisie_read_protoc.decode_json_identifier_person
+
+  let decode_paginated_data_parameters =
+    decode Translate.Api_saisie_read.ProtocToPiqi.paginated_data_parameters
+      Api_saisie_read_protoc.decode_pb_paginated_data_parameters
+      Api_saisie_read_protoc.decode_json_paginated_data_parameters
 end

src/decoders.ml

@@ -51,4 +51,6 @@ module Api_saisie_read : sig
   val decode_index_person : Api_saisie_read_piqi.index_person t
   val decode_fiche_parameters : Api_saisie_read_piqi.fiche_parameters t
   val decode_identifier_person : Api_saisie_read_piqi.identifier_person t
+  val decode_paginated_data_parameters :
+    Api_saisie_read_piqi.paginated_data_parameters t
 end

src/decoders.mli

@@ -158,6 +158,18 @@ module Api_saisie_read = struct
     encode Translate.Api_saisie_read.PiqiToProtoc.nb_ancestors
       Api_saisie_read_protoc.encode_pb_nb_ancestors
       Api_saisie_read_protoc.encode_json_nb_ancestors
+
+  let encode_paginated_personal_events =
+    encode
+      Translate.Api_saisie_read.PiqiToProtoc.paginated_personal_events
+      Api_saisie_read_protoc.encode_pb_paginated_personal_events
+      Api_saisie_read_protoc.encode_json_paginated_personal_events
+
+  let encode_paginated_witnessed_events =
+    encode
+      Translate.Api_saisie_read.PiqiToProtoc.paginated_witnessed_events
+      Api_saisie_read_protoc.encode_pb_paginated_witnessed_events
+      Api_saisie_read_protoc.encode_json_paginated_witnessed_events
 end
 
 let encode_int32 i = function

src/encoders.ml

@@ -41,6 +41,10 @@ module Api_saisie_read : sig
   val encode_person : Api_saisie_read_piqi.person t
   val encode_graph_tree : Api_saisie_read_piqi.graph_tree t
   val encode_nb_ancestors : Api_saisie_read_piqi.nb_ancestors t
+  val encode_paginated_personal_events :
+    Api_saisie_read_piqi.paginated_personal_events t
+  val encode_paginated_witnessed_events :
+    Api_saisie_read_piqi.paginated_witnessed_events t
 end
 
 val encode_int32 : int32 t

src/encoders.mli

@@ -55,16 +55,16 @@ let get_paginated_data conf base =
     let params =
       Plugin_api_lib.Api_util.get_params
         conf
-        Plugin_api_lib.Api_saisie_read_piqi_ext.parse_paginated_data_parameters
+        Plugin_api_lib.Decoders.Api_saisie_read.decode_paginated_data_parameters
     in
     match
       Plugin_api_lib.Api_saisie_read.get_paginated_data ~conf ~base params
     with
     | `Personal_events events ->
-       Plugin_api_lib.Api_saisie_read_piqi_ext.gen_paginated_personal_events
+       Plugin_api_lib.Encoders.Api_saisie_read.encode_paginated_personal_events
          events
     | `Witnessed_events events ->
-       Plugin_api_lib.Api_saisie_read_piqi_ext.gen_paginated_witnessed_events
+       Plugin_api_lib.Encoders.Api_saisie_read.encode_paginated_witnessed_events
          events
   in
   Plugin_api_lib.Api_util.print_result conf data

src/plugin_api.ml

@@ -2952,6 +2952,24 @@ module Api_saisie_read = struct
       Api_saisie_read_protoc.(
         ({ event_witness_type; husband; wife; witness_note } : event_witness))
 
+    and translate_paginated_personal_events
+          {Api_saisie_read_piqi.Paginated_personal_events.elements;
+           page_number;
+           total_count} :
+          Api_saisie_read_protoc.paginated_personal_events =
+      {Api_saisie_read_protoc.elements = List.map translate_event elements;
+       page_number;
+       total_count}
+
+    and translate_paginated_witnessed_events
+          {Api_saisie_read_piqi.Paginated_witnessed_events.elements;
+           page_number;
+           total_count} :
+          Api_saisie_read_protoc.paginated_witnessed_events =
+      {Api_saisie_read_protoc.elements = List.map event_witness elements;
+       page_number;
+       total_count}
+
     and fiche_person person_protoc
         Api_saisie_read_piqi.Fiche_person.
           {
@@ -3084,8 +3102,10 @@ module Api_saisie_read = struct
       let mother = Option.map simple_person mother in
       let families = List.map translate_family families in
       let sosa = translate_sosa sosa in
-      let events = List.map translate_event events in
-      let events_witnesses = List.map event_witness events_witnesses in
+      let events = translate_paginated_personal_events events in
+      let events_witnesses =
+        translate_paginated_witnessed_events events_witnesses
+      in
       let person =
         Api_saisie_read_protoc.(
           ({
@@ -3135,8 +3155,8 @@ module Api_saisie_read = struct
              mother;
              families;
              sosa;
-             events;
-             events_witnesses;
+             events = Some events;
+             events_witnesses = Some events_witnesses;
              baseprefix;
              is_contemporary;
              name_is_hidden;
@@ -3251,6 +3271,12 @@ module Api_saisie_read = struct
 
     let nb_ancestors Api_saisie_read_piqi.Nb_ancestors.{ nb } =
       Api_saisie_read_protoc.(({ nb } : nb_ancestors))
+
+    let paginated_personal_events events =
+      translate_paginated_personal_events events
+
+    let paginated_witnessed_events events =
+      translate_paginated_witnessed_events events
   end
 
   module ProtocToPiqi = struct
@@ -3295,5 +3321,21 @@ module Api_saisie_read = struct
           simple_graph_info;
           no_event;
         }
+
+    let page {Api_saisie_read_protoc.number; element_count} =
+      {Api_saisie_read_piqi.Page.number; element_count}
+
+    let paginated_data_type = function
+      | Api_saisie_read_protoc.Personal_event -> `personal_event
+      | Api_saisie_read_protoc.Witnessed_event -> `witnessed_event
+
+    let paginated_data_parameters
+          {Api_saisie_read_protoc.person_id; type_; page = page_} =
+      {Api_saisie_read_piqi.Paginated_data_parameters.person_id;
+       type_ = paginated_data_type type_;
+       page =
+         page
+           (Option.value
+              ~default:(Api_saisie_read_protoc.default_page ()) page_)}
   end
 end

src/translate.ml

@@ -212,6 +212,14 @@ module Api_saisie_read : sig
 
     val nb_ancestors :
       Api_saisie_read_piqi.nb_ancestors -> Api_saisie_read_protoc.nb_ancestors
+
+    val paginated_personal_events :
+      Api_saisie_read_piqi.paginated_personal_events ->
+      Api_saisie_read_protoc.paginated_personal_events
+
+    val paginated_witnessed_events :
+      Api_saisie_read_piqi.paginated_witnessed_events ->
+      Api_saisie_read_protoc.paginated_witnessed_events
   end
 
   module ProtocToPiqi : sig
@@ -229,5 +237,9 @@ module Api_saisie_read : sig
     val identifier_person :
       Api_saisie_read_protoc.identifier_person ->
       Api_saisie_read_piqi.identifier_person
+
+    val paginated_data_parameters :
+      Api_saisie_read_protoc.paginated_data_parameters ->
+      Api_saisie_read_piqi.paginated_data_parameters
   end
 end