Merge remote-tracking branch 'origin/master' into indexing

Author: hjwp

chapter_01_domain_model.asciidoc

@@ -126,6 +126,7 @@ image::images/apwp_0102.png[]
 [plantuml, apwp_0102]
 @startuml Allocation Context Diagram
 !include images/C4_Context.puml
+scale 2
 
 System(systema, "Allocation", "Allocates stock to customer orders")
 
@@ -437,6 +438,8 @@ image::images/apwp_0103.png[]
 [role="image-source"]
 ----
 [plantuml, apwp_0103, config=plantuml.cfg]
+@startuml
+scale 4
 
 left to right direction
 hide empty members

chapter_03_abstractions.asciidoc

@@ -50,7 +50,7 @@ We can reduce the degree of coupling within((("coupling", "reducing by abstracti
 image::images/apwp_0301.png[]
 [role="image-source"]
 ----
-[ditaa,apwp_0301]
+[ditaa, apwp_0301]
 +--------+      +--------+
 | System | ---> | System |
 |   A    | ---> |   B    |
@@ -66,7 +66,7 @@ image::images/apwp_0301.png[]
 image::images/apwp_0302.png[]
 [role="image-source"]
 ----
-[ditaa,apwp_0302]
+[ditaa, apwp_0302]
 +--------+                           +--------+
 | System |      /-------------\      | System |
 |   A    | ---> |             | ---> |   B    |

chapter_07_aggregate.asciidoc

@@ -233,6 +233,7 @@ image::images/apwp_0702.png[]
 ----
 [plantuml, apwp_0702, config=plantuml.cfg]
 @startuml
+scale 4
 
 hide empty members
 
@@ -283,6 +284,7 @@ image::images/apwp_0703.png[]
 ----
 [plantuml, apwp_0703, config=plantuml.cfg]
 @startuml
+scale 4
 
 hide empty members
 
@@ -581,6 +583,7 @@ image::images/apwp_0704.png[]
 ----
 [plantuml, apwp_0704, config=plantuml.cfg]
 @startuml
+scale 4
 
 entity Model
 collections Transaction1

chapter_09_all_messagebus.asciidoc

@@ -495,6 +495,8 @@ image::images/apwp_0904.png[]
 ----
 [plantuml, apwp_0904, config=plantuml.cfg]
 @startuml
+scale 4
+
 API -> MessageBus : BatchQuantityChanged event
 
 group BatchQuantityChanged Handler + Unit of Work 1

chapter_11_external_events.asciidoc

@@ -87,6 +87,7 @@ image::images/apwp_1103.png[]
 ----
 [plantuml, apwp_1103, config=plantuml.cfg]
 @startuml
+scale 4
 
 actor Customer
 entity Orders
@@ -163,6 +164,7 @@ image::images/apwp_1104.png[]
 ----
 [plantuml, apwp_1104, config=plantuml.cfg]
 @startuml
+scale 4
 
 actor w as "Warehouse worker"
 entity Warehouse
@@ -215,6 +217,7 @@ image::images/apwp_1105.png[]
 ----
 [plantuml, apwp_1105, config=plantuml.cfg]
 @startuml
+scale 4
 
 actor Customer
 entity Orders
@@ -333,8 +336,8 @@ image::images/apwp_1106.png[]
 [role="image-source"]
 ----
 [plantuml, apwp_1106, config=plantuml.cfg]
-
 @startuml
+scale 4
 
 Redis -> MessageBus : BatchQuantityChanged event
 

chapter_12_cqrs.asciidoc

@@ -688,7 +688,9 @@ image::images/apwp_1202.png[]
 ----
 [plantuml, apwp_1202, config=plantuml.cfg]
 @startuml
+scale 4
 !pragma teoz true
+
 actor User order 1
 boundary Flask order 2
 participant MessageBus order 3

chapter_13_dependency_injection.asciidoc

@@ -241,7 +241,7 @@ image::images/apwp_1303.png[]
 [ditaa, apwp_1303]
 
 +---------------+
-|  Entrpyoints  |
+|  Entrypoints  |
 | (Flask/Redis) |
 +---------------+
         |

epilogue_1_how_to_get_there_from_here.asciidoc

@@ -65,7 +65,9 @@ image::images/apwp_ep01.png[]
 ----
 [plantuml, apwp_ep01, config=plantuml.cfg]
 @startuml
+scale 4
 hide empty members
+
 Workspace *- Folder : contains
 Account *- Workspace : owns
 Account *-- Package : has
@@ -264,78 +266,75 @@ image::images/apwp_ep02.png[]
 ----
 [plantuml, apwp_ep02, config=plantuml.cfg]
 @startuml
+scale 4
 hide empty members
 
-class Document {
-
-  add_version ()
-
-  workspace: Workspace
-  parent: Folder
-
-  versions: List[DocumentVersion]
-
+together {
+    class Document {
+      add_version()
+      workspace: Workspace
+      parent: Folder
+      versions: List[DocumentVersion]
+
+    }
+
+    class DocumentVersion {
+      title : str
+      version_number: int
+      document: Document
+
+    }
+    class Folder {
+      parent: Workspace
+      children: List[Folder]
+      copy_to(target: Folder)
+      add_document(document: Document)
+    }
 }
 
-class DocumentVersion {
-
-  title : str
-  version_number: int
+together {
+    class User {
+      account: Account
+    }
 
-  document: Document
 
-}
-
-class Account {
-  add_package ()
-
-  owner : User
-  packages : List[BillingPackage]
-  workspaces: List[Workspace]
+    class Account {
+      add_package()
+      owner : User
+      packages : List[BillingPackage]
+      workspaces: List[Workspace]
+    }
 }
 
 
 class BillingPackage {
 }
 
 class Workspace {
-
   add_member(member: User)
-
   account: Account
   owner: User
   members: List[User]
-
 }
 
-class Folder {
-  parent: Workspace
-  children: List[Folder]
-
-  copy_to(target: Folder)
-  add_document(document: Document)
-}
 
-class User {
-  account: Account
-}
 
 Account --> Workspace
-Account --> BillingPackage
-Account --> User
+Account -left-> BillingPackage
+Account -right-> User
 Workspace --> User
 Workspace --> Folder
 Workspace --> Account
 Folder --> Folder
 Folder --> Document
 Folder --> Workspace
 Folder --> User
-Document --> DocumentVersion
+Document -right-> DocumentVersion
 Document --> Folder
 Document --> User
-DocumentVersion --> Document
+DocumentVersion -right-> Document
 DocumentVersion --> User
-User --> Account
+User -left-> Account
 
 @enduml
 
@@ -348,13 +347,14 @@ image::images/apwp_ep03.png[]
 ----
 [plantuml, apwp_ep03, config=plantuml.cfg]
 @startuml
+scale 4
 hide empty members
 
 frame Document {
 
   class Document {
 
-    add_version ()
+    add_version()
 
     workspace_id: int
     parent_folder: int
@@ -374,7 +374,7 @@ frame Document {
 frame Account {
 
   class Account {
-    add_package ()
+    add_package()
 
     owner : int
     packages : List[BillingPackage]
@@ -481,14 +481,17 @@ image::images/apwp_ep04.png[]
 @startuml Ecommerce Context
 !include images/C4_Context.puml
 
+LAYOUT_LEFT_RIGHT
+scale 2
+
 Person_Ext(customer, "Customer", "Wants to buy furniture")
 
-System(fulfilment, "Fulfilment System", "Manages order fulfilment and logistics")
+System(fulfillment, "Fulfillment System", "Manages order fulfillment and logistics")
 System(ecom, "Ecommerce website", "Allows customers to buy furniture")
 
 Rel(customer, ecom, "Uses")
-Rel(fulfilment, ecom, "Updates stock and orders", "xml-rpc")
-Rel(ecom, fulfilment, "Sends orders", "xml-rpc")
+Rel(fulfillment, ecom, "Updates stock and orders", "xml-rpc")
+Rel(ecom, fulfillment, "Sends orders", "xml-rpc")
 
 @enduml
 ----
@@ -504,17 +507,20 @@ image::images/apwp_ep05.png[]
 @startuml Ecommerce Context
 !include images/C4_Context.puml
 
+LAYOUT_LEFT_RIGHT
+scale 2
+
 Person_Ext(customer, "Customer", "Wants to buy furniture")
 
 System(av, "Availability Service", "Calculates stock availability")
-System(fulfilment, "Fulfilment System", "Manages order fulfilment and logistics")
+System(fulfillment, "Fulfillment System", "Manages order fulfillment and logistics")
 System(ecom, "Ecommerce website", "Allows customers to buy furniture")
 
 Rel(customer, ecom, "Uses")
 Rel(customer, av, "Uses")
-Rel(fulfilment, av, "Publishes batch_created", "events")
+Rel(fulfillment, av, "Publishes batch_created", "events")
 Rel(av, ecom, "Publishes out_of_stock", "events")
-Rel(ecom, fulfilment, "Sends orders", "xml-rpc")
+Rel(ecom, fulfillment, "Sends orders", "xml-rpc")
 
 @enduml
 ----
@@ -733,16 +739,14 @@ image::images/apwp_ep06.png[]
 @startuml View Fetcher Component Diagram
 !include images/C4_Component.puml
 
-LAYOUT_LEFT_RIGHT
-
 ComponentDb(db, "Database", "RDBMS")
 Component(fetch, "View Fetcher", "Reads data from db, returning list of tuples or dicts")
 Component(build, "View Builder", "Filters and maps tuples")
 Component(api, "API", "Handles HTTP and serialization concerns")
 
-Rel(fetch, db, "Read data from")
-Rel(build, fetch, "Invokes")
 Rel(api, build, "Invokes")
+Rel_R(build, fetch, "Invokes")
+Rel_D(fetch, db, "Reads data from")
 
 @enduml
 ----

introduction.asciidoc

@@ -176,7 +176,7 @@ One of the most common examples is the _three-layered architecture_ shown in
 image::images/apwp_0002.png[]
 [role="image-source"]
 ----
-[ditaa,apwp_0002]
+[ditaa, apwp_0002]
 +----------------------------------------------------+
 |                Presentation Layer                  |
 +----------------------------------------------------+