From 4b35ee3e92cf65f0c1b658a185212d31c375fe14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Wed, 29 May 2024 16:28:38 +0200 Subject: [PATCH] Add mapping v3 --- generator/src/main/kotlin/main.kt | 12 ++-- .../src/main/kotlin/mapping/Endpoints.kt | 61 ++++++++++--------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/generator/src/main/kotlin/main.kt b/generator/src/main/kotlin/main.kt index f9ae23e..4d2ac79 100644 --- a/generator/src/main/kotlin/main.kt +++ b/generator/src/main/kotlin/main.kt @@ -1,8 +1,5 @@ import kotlinx.serialization.encodeToString -import mapping.ApiEndpointsMap -import mapping.ApiEndpointsVHeaders -import mapping.ApiEndpointsVTokenMap -import mapping.ApiEndpointsVTokenSchemeMap +import mapping.* import java.io.File fun main() { @@ -22,6 +19,12 @@ fun main() { vTokenSchemeMap = ApiEndpointsVTokenSchemeMap, vHeaders = ApiEndpointsVHeaders, ) + val mappingV3 = generateMappingJson( + endpoints = ApiEndpointsMapV3, + vTokenMap = ApiEndpointsVTokenMap, + vTokenSchemeMap = ApiEndpointsVTokenSchemeMap, + vHeaders = ApiEndpointsVHeaders, + ) val html = generateHtml(filteredMessages) val end = json.encodeToString(endMessage) @@ -29,5 +32,6 @@ fun main() { File("../dist/end.json").writeText(end) File("../dist/mapping1.json").writeText(mappingV1) File("../dist/mapping2.json").writeText(mappingV2) + File("../dist/mapping3.json").writeText(mappingV3) File("../dist/index.html").writeText(html) } diff --git a/generator/src/main/kotlin/mapping/Endpoints.kt b/generator/src/main/kotlin/mapping/Endpoints.kt index 323d156..b84e2f9 100644 --- a/generator/src/main/kotlin/mapping/Endpoints.kt +++ b/generator/src/main/kotlin/mapping/Endpoints.kt @@ -521,31 +521,34 @@ val ApiEndpointsMap = mapOf( // "MoveTrash" to "", // "RestoreTrash" to "", // ), - "uonetplus-uczenplus" to mapOf( - "Context" to "ae16b392-8e5b-4271-b80a-0d954240a9e6", - // "AutoryzacjaPesel" to "", - "Frekwencja" to "447fa101-471d-469d-b2b8-2489d161a309", - "Usprawiedliwienia" to "4ff776fa-834b-4229-9f7d-2b0f0026171a", - "FrekwencjaStatystyki" to "e12177fd-0e93-426c-a40b-be85bde85174", - "ZarejestrowaneUrzadzenia" to "b0ae7ba1-0f7b-486c-a82b-1ed44e8f35fb", - "RejestracjaUrzadzeniaToken" to "78e99410-3f64-40bd-967d-70e12b1b0d31", - "Zebrania" to "bd8b5098-ad21-4f5a-a40b-90dfa8aace49", - "RealizacjaZajec" to "d9d81db0-a35f-4eab-a814-33f092f91d2d", - "SprawdzianyZadaniaDomowe" to "c8e90f55-fced-479a-ac7b-c894c6e20e22", - "SprawdzianSzczegoly" to "cf81bfc5-40ce-4ecf-9d41-4c52a7acf24a", - "ZadanieDomoweSzczegoly" to "af3350a2-d7ad-4ad0-a7ed-e594af649888", - "PlanZajec" to "53ac956d-f908-4706-8b9e-772aa65c314b", - "DniWolne" to "4aa65ba3-7d1e-47b9-8e74-332bef7284aa", - "Uwagi" to "0cd59af2-9eda-47ce-a1cd-58c943da17c4", - "Nauczyciele" to "1ef69305-72c0-4444-987c-418f6f6858db", - "Informacje" to "dcc8a117-f2f2-4280-8a3d-5e3700c72135", - "DaneUcznia" to "3d909ec9-406c-4de4-86a8-472abf8ae13c", - "UczenZdjecie" to "8d12d3e0-3fee-4f93-95d7-643a94b6046b", - "OkresyKlasyfikacyjne" to "d916a801-3a4c-44d1-b39a-2fb835f2cd54", - "Oceny" to "4f2f158b-29cf-48d3-8078-50c74ccb6c9c", - ), + "uonetplus-uczenplus" to mapOf( + "Context" to "ae16b392-8e5b-4271-b80a-0d954240a9e6", + // "AutoryzacjaPesel" to "", + "Frekwencja" to "447fa101-471d-469d-b2b8-2489d161a309", + "Usprawiedliwienia" to "4ff776fa-834b-4229-9f7d-2b0f0026171a", + "FrekwencjaStatystyki" to "e12177fd-0e93-426c-a40b-be85bde85174", + "ZarejestrowaneUrzadzenia" to "b0ae7ba1-0f7b-486c-a82b-1ed44e8f35fb", + "RejestracjaUrzadzeniaToken" to "78e99410-3f64-40bd-967d-70e12b1b0d31", + "Zebrania" to "bd8b5098-ad21-4f5a-a40b-90dfa8aace49", + "RealizacjaZajec" to "d9d81db0-a35f-4eab-a814-33f092f91d2d", + "SprawdzianyZadaniaDomowe" to "c8e90f55-fced-479a-ac7b-c894c6e20e22", + "SprawdzianSzczegoly" to "cf81bfc5-40ce-4ecf-9d41-4c52a7acf24a", + "ZadanieDomoweSzczegoly" to "af3350a2-d7ad-4ad0-a7ed-e594af649888", + "PlanZajec" to "53ac956d-f908-4706-8b9e-772aa65c314b", + "DniWolne" to "4aa65ba3-7d1e-47b9-8e74-332bef7284aa", + "Uwagi" to "0cd59af2-9eda-47ce-a1cd-58c943da17c4", + "Nauczyciele" to "1ef69305-72c0-4444-987c-418f6f6858db", + "Informacje" to "dcc8a117-f2f2-4280-8a3d-5e3700c72135", + "DaneUcznia" to "3d909ec9-406c-4de4-86a8-472abf8ae13c", + "UczenZdjecie" to "8d12d3e0-3fee-4f93-95d7-643a94b6046b", + "OkresyKlasyfikacyjne" to "d916a801-3a4c-44d1-b39a-2fb835f2cd54", + "Oceny" to "4f2f158b-29cf-48d3-8078-50c74ccb6c9c", + ), ), - "24.04.0010.58863-d" to mapOf( +) + +val ApiEndpointsMapV3 = ApiEndpointsMap + mapOf( + "24.04.0010.58863" to mapOf( "uonetplus-uczen" to mapOf( // "Autoryzacja" to "", "EgzaminyZewnetrzne" to "fe6b40ba-8a2f-4ad3-a519-343226a66a23", @@ -553,17 +556,17 @@ val ApiEndpointsMap = mapOf( "FrekwencjaStatystyki" to "fcefe7af-4324-4e70-ae42-c63dbe988099", "FrekwencjaStatystykiPrzedmioty" to "bb36d4b5-a481-43f7-aae6-89b004451911", "Homework" to "250e6ac4-ab2c-4784-9110-112b6c7b0410", - "LekcjeZrealizowane.mvc/GetPrzedmioty" to "ca9358ca-bab9-4e35-85c9-2c8eb1691a6e", - "LekcjeZrealizowane.mvc/GetZrealizowane" to "1a83b152-3160-43db-8683-0fd25c65b78a", + "LekcjeZrealizowane.mvc/GetPrzedmioty" to "ca9358ca-bab9-4e35-85c9-2c8eb1691a6e.mvc/Get", + "LekcjeZrealizowane.mvc/GetZrealizowane" to "1a83b152-3160-43db-8683-0fd25c65b78a.mvc/Get", "Oceny" to "837fd82d-3b34-4ef2-9b6c-bbb4032b6975", "Ogloszenia" to "ff3e1b2d-9106-4842-91e1-8db7af1b7819", "PlanZajec" to "dbef1773-0db6-4d08-9a5b-85146a06dfae", "RejestracjaUrzadzeniaToken" to "e581158e-8ff5-4461-9c35-0d9389fbd651", "RejestracjaUrzadzeniaTokenCertyfikat" to "afd176b2-d574-470c-b83e-77ab45dfa8a1", "Sprawdziany" to "81037688-53b4-4f1e-ab43-bc5eabe72501", - "Statystyki.mvc/GetOcenyCzastkowe" to "c56368dc-3530-4960-94e2-2b5435732bae", - "Statystyki.mvc/GetPunkty" to "387d3492-5d9d-44f5-b028-4948a16e3e42", - "Statystyki.mvc/GetOcenyRoczne" to "462d4b6d-f1d2-4c4b-8ebc-1aee25c69354", + "Statystyki.mvc/GetOcenyCzastkowe" to "c56368dc-3530-4960-94e2-2b5435732bae.mvc/Get", + "Statystyki.mvc/GetPunkty" to "387d3492-5d9d-44f5-b028-4948a16e3e42.mvc/Get", + "Statystyki.mvc/GetOcenyRoczne" to "462d4b6d-f1d2-4c4b-8ebc-1aee25c69354.mvc/Get", "SzkolaINauczyciele" to "0e484bbe-bc2e-4f80-9bc8-7ee67097f426", "Uczen" to "630cd54b-b952-43ee-aeb4-4438a2b21e75", "UczenCache" to "333dce23-9766-4f2a-bc30-689bc04f0765",