From f14286c57b7dd01f5bbdc12c7013f02199c9bb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Guillaud?= <91874264+ClementGld@users.noreply.github.com> Date: Wed, 3 Aug 2022 14:06:02 +0200 Subject: [PATCH] feat: Update CGU to match server changes --- lib/api/cgu_api.dart | 2 +- lib/api/response_models/cgu_response.dart | 6 +++--- lib/models/cgu_model.dart | 2 +- test/api/response_models/cgu_response_test.dart | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/api/cgu_api.dart b/lib/api/cgu_api.dart index 5597db2..2d3adde 100644 --- a/lib/api/cgu_api.dart +++ b/lib/api/cgu_api.dart @@ -7,7 +7,7 @@ import 'package:client_common/api/response_models/user_accepted_latest_cgu_respo class CguApi { static Future getLatestCgu() => LenraApi.instance.get( "/cgu/latest", - responseMapper: (json, header) => CguResponse.fromJson(json["latest_cgu"]), + responseMapper: (json, header) => CguResponse.fromJson(json), ); static Future acceptCgu(int cguId) => LenraApi.instance.post( diff --git a/lib/api/response_models/cgu_response.dart b/lib/api/response_models/cgu_response.dart index 9dcbd9f..72b050d 100644 --- a/lib/api/response_models/cgu_response.dart +++ b/lib/api/response_models/cgu_response.dart @@ -2,13 +2,13 @@ import 'package:client_common/api/response_models/api_response.dart'; class CguResponse extends ApiResponse { int id; - String link; + String path; String hash; - String version; + int version; CguResponse.fromJson(Map json) : id = json["id"], - link = json["link"], + path = json["path"], hash = json["hash"], version = json["version"]; } diff --git a/lib/models/cgu_model.dart b/lib/models/cgu_model.dart index a136404..e038b4e 100644 --- a/lib/models/cgu_model.dart +++ b/lib/models/cgu_model.dart @@ -34,7 +34,7 @@ class CguModel extends ChangeNotifier { Future getLatestCguAsMd(language) async { var res = await getLatestCgu().then((cgu) { - return http.get(Uri.parse("${Config.instance.httpEndpoint}/web/cgu/${cgu.link}_$language.md")); + return http.get(Uri.parse("${Config.instance.httpEndpoint}/web/cgu/CGU_${language}_${cgu.version}.md")); }); notifyListeners(); return res; diff --git a/test/api/response_models/cgu_response_test.dart b/test/api/response_models/cgu_response_test.dart index 50319be..609d4e4 100644 --- a/test/api/response_models/cgu_response_test.dart +++ b/test/api/response_models/cgu_response_test.dart @@ -3,11 +3,11 @@ import 'package:test/test.dart'; void main() { test('from json', () { - Map json = {"id": 1, "hash": "1234", "link": "/cgu/cgu-1.0.0.html", "version": "1.0.0"}; + Map json = {"id": 1, "hash": "1234", "path": "/cgu/CGU_fr_1.html", "version": 1}; CguResponse cguResponse = CguResponse.fromJson(json); expect(cguResponse.id, 1); expect(cguResponse.hash, "1234"); - expect(cguResponse.link, "/cgu/cgu-1.0.0.html"); - expect(cguResponse.version, "1.0.0"); + expect(cguResponse.path, "/cgu/CGU_fr_1.html"); + expect(cguResponse.version, 1); }); }