From da0e4f9b6af2c0f9c5f0a55fd547e90c019a2e9d Mon Sep 17 00:00:00 2001 From: "vivien.dufour" Date: Tue, 7 Nov 2023 15:25:19 +0100 Subject: [PATCH 1/6] add MCD for database and the beginning of MLD --- Documentation/database_mcd.puml | 88 +++++++++++++++++++++++ Documentation/database_mld.puml | 89 ++++++++++++++++++++++++ Documentation/{data.puml => models.puml} | 0 3 files changed, 177 insertions(+) create mode 100644 Documentation/database_mcd.puml create mode 100644 Documentation/database_mld.puml rename Documentation/{data.puml => models.puml} (100%) diff --git a/Documentation/database_mcd.puml b/Documentation/database_mcd.puml new file mode 100644 index 0000000..48078cd --- /dev/null +++ b/Documentation/database_mcd.puml @@ -0,0 +1,88 @@ +@startuml + +class Account { + id + token {uniq} + name + age + email + phoneNumber + passwordHash + profilePicture +} + +class Team { + id + name + picture + mainColor + secondColor +} + +usecase have_team [ + to have + -- + role +] + +Account "0,n" -- have_team +have_team -- "1,n" Team + + +class Tactic { + id + name + creationDate +} + +usecase have_tactic [ + to have +] + +Account "0,n" -- have_tactic +have_tactic -- "1,1" Tactic + +usecase is_shared [ + to be shared +] + +Tactic "0,n" -- is_shared +is_shared -- "0,n" Team + +class TacticFolder { + name +} + +usecase contains [ + to contains +] + +usecase contains_other_folder [ + to contains +] + +TacticFolder "0,n" -- contains_other_folder +contains_other_folder -- "0,1" TacticFolder + +TacticFolder "0,n" -- contains +contains -- "0,1" Tactic + + +class PersonalSpace { +} + +usecase have_personal_space [ + to have +] + +usecase is_root [ + to be root of +] + +PersonalSpace "0,n" -- is_root +is_root -- "1,1" TacticFolder + +PersonalSpace "1,1" -- have_personal_space +have_personal_space -- "1,1" Account + +@enduml \ No newline at end of file diff --git a/Documentation/database_mld.puml b/Documentation/database_mld.puml new file mode 100644 index 0000000..8cdd4dc --- /dev/null +++ b/Documentation/database_mld.puml @@ -0,0 +1,89 @@ +@startuml + +class Account { + token + name + age + email + phoneNumber + passwordHash + profilePicture +} + +class Team { + id + name + picture + mainColor + secondColor +} + +class Member { + idAccount + idTeam + role +} + +have_team --> Account +have_team --> Team + + +class Tactic { + id + name + creationDate +} + +class have_tactic { + idAccount + idTactic +} + +Account "0,n" -- have_tactic +have_tactic -- "1,1" Tactic + +class SharedTactic { + idTactic + idTeam +} + +Tactic "0,n" -- SharedTactic +SharedTactic -- "0,n" Team + +class TacticFolder { + name +} + +usecase contains [ + contains +] + +usecase contains_other_folder [ + contains +] + +TacticFolder "0,n" -- contains_other_folder +contains_other_folder -- "0,1" TacticFolder + +TacticFolder "0,n" -- contains +contains -- "0,1" Tactic + + +class PersonalSpace { +} + +usecase have_personal_space [ + have +] + +usecase is_root [ + is root of +] + +PersonalSpace "0,n" -- is_root +is_root -- "1,1" TacticFolder + +PersonalSpace "1,1" -- have_personal_space +have_personal_space -- "1,1" Account + +@enduml \ No newline at end of file diff --git a/Documentation/data.puml b/Documentation/models.puml similarity index 100% rename from Documentation/data.puml rename to Documentation/models.puml -- 2.36.3 From 0c3f2d33c894b9fe2f764a7596991ae2b57b8042 Mon Sep 17 00:00:00 2001 From: "vivien.dufour" Date: Wed, 8 Nov 2023 16:52:29 +0100 Subject: [PATCH 2/6] mcd and mld --- Documentation/database_mcd.puml | 81 ++++++++++++++-------------- Documentation/database_mld.puml | 93 ++++++++++++++++----------------- 2 files changed, 83 insertions(+), 91 deletions(-) diff --git a/Documentation/database_mcd.puml b/Documentation/database_mcd.puml index 48078cd..e7285f2 100644 --- a/Documentation/database_mcd.puml +++ b/Documentation/database_mcd.puml @@ -1,6 +1,6 @@ @startuml -class Account { +object Account { id token {uniq} name @@ -11,7 +11,7 @@ class Account { profilePicture } -class Team { +object Team { id name picture @@ -19,70 +19,67 @@ class Team { secondColor } -usecase have_team [ - to have - -- - role -] - -Account "0,n" -- have_team -have_team -- "1,n" Team - - -class Tactic { +object TacticFolder { id name +} + +object Tactic { + id_json + name creationDate } -usecase have_tactic [ +usecase have_team [ to have + -- + role ] -Account "0,n" -- have_tactic -have_tactic -- "1,1" Tactic +usecase shared_folder_account [ + to share +] -usecase is_shared [ - to be shared +usecase shared_tactic_account [ + to share ] -Tactic "0,n" -- is_shared -is_shared -- "0,n" Team +usecase shared_tactic_team [ + to share +] -class TacticFolder { - name -} +usecase shared_folder_team [ + to share +] -usecase contains [ - to contains +usecase folder_contains_tactic [ + to contain ] usecase contains_other_folder [ - to contains + to contain ] -TacticFolder "0,n" -- contains_other_folder -contains_other_folder -- "0,1" TacticFolder +Account "0,n" -- have_team +have_team -- "1,n" Team -TacticFolder "0,n" -- contains -contains -- "0,1" Tactic +Account "0,n" -- shared_tactic_account +shared_tactic_account -- "0,n" Tactic -class PersonalSpace { -} +Tactic "0,n" -- shared_tactic_team +shared_tactic_team -- "0,n" Team -usecase have_personal_space [ - to have -] +Team "0,n" -- shared_folder_team +shared_folder_team -- "0,n"TacticFolder -usecase is_root [ - to be root of -] +TacticFolder "0,n" -- contains_other_folder +contains_other_folder -- "0,1" TacticFolder -PersonalSpace "0,n" -- is_root -is_root -- "1,1" TacticFolder +TacticFolder "0,n" -- folder_contains_tactic +folder_contains_tactic -- "1,n" Tactic -PersonalSpace "1,1" -- have_personal_space -have_personal_space -- "1,1" Account +Account "0,n" -- shared_folder_account +shared_folder_account -- "0,n" TacticFolder @enduml \ No newline at end of file diff --git a/Documentation/database_mld.puml b/Documentation/database_mld.puml index 8cdd4dc..78b8ef0 100644 --- a/Documentation/database_mld.puml +++ b/Documentation/database_mld.puml @@ -1,7 +1,8 @@ @startuml -class Account { - token +object Account { + id + token {uniq} name age email @@ -10,80 +11,74 @@ class Account { profilePicture } -class Team { +object TacticFolder { id name - picture - mainColor - secondColor + #tacticFolderParent } -class Member { - idAccount - idTeam - role -} +TacticFolder --> TacticFolder -have_team --> Account -have_team --> Team - - -class Tactic { +object Tactic { id name creationDate } -class have_tactic { - idAccount - idTactic +object Team { + id + name + picture + mainColor + secondColor } -Account "0,n" -- have_tactic -have_tactic -- "1,1" Tactic -class SharedTactic { - idTactic - idTeam +object FolderSharedTeam { + #idFolder, #idTeam } -Tactic "0,n" -- SharedTactic -SharedTactic -- "0,n" Team +FolderSharedTeam --> TacticFolder +FolderSharedTeam --> Team -class TacticFolder { - name +object Member { + #idAccount, #idTeam + role } -usecase contains [ - contains -] +Member --> Account +Member --> Team -usecase contains_other_folder [ - contains -] +object TacticSharedTeam { + #idTactic, #idTeam +} -TacticFolder "0,n" -- contains_other_folder -contains_other_folder -- "0,1" TacticFolder +TacticSharedTeam --> Tactic +TacticSharedTeam --> Team -TacticFolder "0,n" -- contains -contains -- "0,1" Tactic +object TacticSharedAccount { + #idTactic, #idAccount +} +TacticSharedAccount --> Tactic +TacticSharedAccount --> Account -class PersonalSpace { +object TacticFolderLink { + #idFolder, #idTactic } -usecase have_personal_space [ - have -] +TacticFolderLink --> Tactic +TacticFolderLink --> TacticFolder + + -usecase is_root [ - is root of -] -PersonalSpace "0,n" -- is_root -is_root -- "1,1" TacticFolder +object FolderSharedAccount { + #idFolder, #idAccount +} + +FolderSharedAccount --> TacticFolder +FolderSharedAccount --> Account -PersonalSpace "1,1" -- have_personal_space -have_personal_space -- "1,1" Account @enduml \ No newline at end of file -- 2.36.3 From 6ddd32a4bdd77c9fad89b579bd9666ec3bd5c092 Mon Sep 17 00:00:00 2001 From: "vivien.dufour" Date: Wed, 8 Nov 2023 16:56:40 +0100 Subject: [PATCH 3/6] export of mcd and mld in svg files --- Documentation/assets/database_mcd.svg | 1 + Documentation/assets/database_mld.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 Documentation/assets/database_mcd.svg create mode 100644 Documentation/assets/database_mld.svg diff --git a/Documentation/assets/database_mcd.svg b/Documentation/assets/database_mcd.svg new file mode 100644 index 0000000..cd40034 --- /dev/null +++ b/Documentation/assets/database_mcd.svg @@ -0,0 +1 @@ +Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n \ No newline at end of file diff --git a/Documentation/assets/database_mld.svg b/Documentation/assets/database_mld.svg new file mode 100644 index 0000000..45cd99e --- /dev/null +++ b/Documentation/assets/database_mld.svg @@ -0,0 +1 @@ +Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParentTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file -- 2.36.3 From c2b88c7ed7b39b7d7a1bc37bb2ad1ef3519616d0 Mon Sep 17 00:00:00 2001 From: "vivien.dufour" Date: Wed, 8 Nov 2023 17:33:57 +0100 Subject: [PATCH 4/6] modification of mcd and mld --- Documentation/assets/database_mcd.svg | 2 +- Documentation/assets/database_mld.svg | 2 +- Documentation/database_mcd.puml | 7 +++++++ Documentation/database_mld.puml | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/assets/database_mcd.svg b/Documentation/assets/database_mcd.svg index cd40034..ab3b2d2 100644 --- a/Documentation/assets/database_mcd.svg +++ b/Documentation/assets/database_mcd.svg @@ -1 +1 @@ -Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n \ No newline at end of file +Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto containto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n1,n1,1 \ No newline at end of file diff --git a/Documentation/assets/database_mld.svg b/Documentation/assets/database_mld.svg index 45cd99e..f586f4a 100644 --- a/Documentation/assets/database_mld.svg +++ b/Documentation/assets/database_mld.svg @@ -1 +1 @@ -Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParentTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file +Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParent#accountTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file diff --git a/Documentation/database_mcd.puml b/Documentation/database_mcd.puml index e7285f2..61a8332 100644 --- a/Documentation/database_mcd.puml +++ b/Documentation/database_mcd.puml @@ -36,6 +36,10 @@ usecase have_team [ role ] +usecase contains_tactic_folder [ + to contain +] + usecase shared_folder_account [ to share ] @@ -82,4 +86,7 @@ folder_contains_tactic -- "1,n" Tactic Account "0,n" -- shared_folder_account shared_folder_account -- "0,n" TacticFolder +Account "1,n" -- contains_tactic_folder +contains_tactic_folder -- "1,1" TacticFolder + @enduml \ No newline at end of file diff --git a/Documentation/database_mld.puml b/Documentation/database_mld.puml index 78b8ef0..67c650c 100644 --- a/Documentation/database_mld.puml +++ b/Documentation/database_mld.puml @@ -15,8 +15,10 @@ object TacticFolder { id name #tacticFolderParent + #account } +Account <-- TacticFolder TacticFolder --> TacticFolder object Tactic { -- 2.36.3 From 5cfb34c96b6b16b1f183cf93fd4a07c478ccb238 Mon Sep 17 00:00:00 2001 From: "vivien.dufour" Date: Fri, 10 Nov 2023 14:29:42 +0100 Subject: [PATCH 5/6] modification of mcd and mld --- Documentation/assets/database_mcd.svg | 2 +- Documentation/assets/database_mld.svg | 2 +- Documentation/database_mcd.puml | 1 - Documentation/database_mld.puml | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/assets/database_mcd.svg b/Documentation/assets/database_mcd.svg index ab3b2d2..cc7bea3 100644 --- a/Documentation/assets/database_mcd.svg +++ b/Documentation/assets/database_mcd.svg @@ -1 +1 @@ -Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto containto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n1,n1,1 \ No newline at end of file +AccountidnameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto containto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n1,n1,1 \ No newline at end of file diff --git a/Documentation/assets/database_mld.svg b/Documentation/assets/database_mld.svg index f586f4a..e3dd880 100644 --- a/Documentation/assets/database_mld.svg +++ b/Documentation/assets/database_mld.svg @@ -1 +1 @@ -Accountidtoken {uniq}nameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParent#accountTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file +AccountidnameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParent#accountTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file diff --git a/Documentation/database_mcd.puml b/Documentation/database_mcd.puml index 61a8332..e698a69 100644 --- a/Documentation/database_mcd.puml +++ b/Documentation/database_mcd.puml @@ -2,7 +2,6 @@ object Account { id - token {uniq} name age email diff --git a/Documentation/database_mld.puml b/Documentation/database_mld.puml index 67c650c..2c33ce2 100644 --- a/Documentation/database_mld.puml +++ b/Documentation/database_mld.puml @@ -2,7 +2,6 @@ object Account { id - token {uniq} name age email -- 2.36.3 From 2bbd53d82156f67ee2aa2bf3a3ade21e01576daf Mon Sep 17 00:00:00 2001 From: samuel Date: Mon, 13 Nov 2023 14:27:20 +0100 Subject: [PATCH 6/6] apply suggestions --- Documentation/assets/database_mcd.svg | 1 - Documentation/assets/database_mld.svg | 1 - 2 files changed, 2 deletions(-) delete mode 100644 Documentation/assets/database_mcd.svg delete mode 100644 Documentation/assets/database_mld.svg diff --git a/Documentation/assets/database_mcd.svg b/Documentation/assets/database_mcd.svg deleted file mode 100644 index cc7bea3..0000000 --- a/Documentation/assets/database_mcd.svg +++ /dev/null @@ -1 +0,0 @@ -AccountidnameageemailphoneNumberpasswordHashprofilePictureTeamidnamepicturemainColorsecondColorTacticFolderidnameTacticid_jsonnamecreationDateto haveroleto containto shareto shareto shareto shareto containto contain0,n1,n0,n0,n0,n0,n0,n0,n0,n0,10,n1,n0,n0,n1,n1,1 \ No newline at end of file diff --git a/Documentation/assets/database_mld.svg b/Documentation/assets/database_mld.svg deleted file mode 100644 index e3dd880..0000000 --- a/Documentation/assets/database_mld.svg +++ /dev/null @@ -1 +0,0 @@ -AccountidnameageemailphoneNumberpasswordHashprofilePictureTacticFolderidname#tacticFolderParent#accountTacticidnamecreationDateTeamidnamepicturemainColorsecondColorFolderSharedTeam#idFolder, #idTeamMember#idAccount, #idTeamroleTacticSharedTeam#idTactic, #idTeamTacticSharedAccount#idTactic, #idAccountTacticFolderLink#idFolder, #idTacticFolderSharedAccount#idFolder, #idAccount \ No newline at end of file -- 2.36.3