From fad8edb0678a1fbd53a1c59d34f745427cea8440 Mon Sep 17 00:00:00 2001
From: Jiri Lojda <lojdaj@seznam.cz>
Date: Mon, 9 Sep 2024 11:58:00 +0200
Subject: [PATCH] Add spaces entity to sync-model

---
 src/modules/sync/constants/filename.ts        |   1 +
 src/modules/sync/diff.ts                      |   7 +++
 src/modules/sync/diff/combinators.ts          |  15 +++++
 src/modules/sync/diff/contentType.ts          |   7 +--
 src/modules/sync/diff/contentTypeSnippet.ts   |   8 +--
 src/modules/sync/diff/space.ts                |  21 +++++++
 src/modules/sync/diff/taxonomy.ts             |   7 +--
 src/modules/sync/generateSyncModel.ts         |  20 +++++-
 .../modelTransfomers/spaceTransformers.ts     |  24 ++++++++
 src/modules/sync/printDiff.ts                 |   5 +-
 src/modules/sync/sync.ts                      |   3 +
 src/modules/sync/sync/spaces.ts               |  57 +++++++++++++++++
 src/modules/sync/types/diffModel.ts           |  16 ++++-
 src/modules/sync/types/fileContentModel.ts    |   2 +
 src/modules/sync/types/syncModel.ts           |   9 +++
 src/modules/sync/utils/diffTemplate.html      |   2 +-
 src/modules/sync/utils/fetchers.ts            |   6 ++
 src/modules/sync/utils/getContentModel.ts     |  34 ++++++----
 src/modules/sync/utils/htmlRenderers.ts       |  22 ++++---
 .../diff/advancedDiff.test.ts.snap.html       |  30 +++++++++
 .../sync/data/sync_test_source.zip            | Bin 51211 -> 51860 bytes
 .../sync/data/sync_test_target.zip            | Bin 38900 -> 39526 bytes
 .../syncModel/contentTypeTransformer.test.ts  |   1 +
 tests/unit/syncModel/diff/combinators.test.ts |  28 +++++++++
 tests/unit/syncModel/diff/space.test.ts       |  58 ++++++++++++++++++
 .../unit/syncModel/snippetTransformer.test.ts |   1 +
 .../unit/syncModel/spacesTransformer.test.ts  |  47 ++++++++++++++
 .../syncModel/webSpotlightTransformer.test.ts |   1 +
 28 files changed, 394 insertions(+), 38 deletions(-)
 create mode 100644 src/modules/sync/diff/space.ts
 create mode 100644 src/modules/sync/modelTransfomers/spaceTransformers.ts
 create mode 100644 src/modules/sync/sync/spaces.ts
 create mode 100644 tests/unit/syncModel/diff/space.test.ts
 create mode 100644 tests/unit/syncModel/spacesTransformer.test.ts

diff --git a/src/modules/sync/constants/filename.ts b/src/modules/sync/constants/filename.ts
index 7f2eb991..6365e09d 100644
--- a/src/modules/sync/constants/filename.ts
+++ b/src/modules/sync/constants/filename.ts
@@ -4,3 +4,4 @@ export const taxonomiesFileName = "taxonomyGroups.json";
 export const collectionsFileName = "collections.json";
 export const webSpotlightFileName = "webSpotlight.json";
 export const assetFoldersFileName = "assetFolders.json";
+export const spacesFileName = "spaces.json";
diff --git a/src/modules/sync/diff.ts b/src/modules/sync/diff.ts
index e87da085..e60b978a 100644
--- a/src/modules/sync/diff.ts
+++ b/src/modules/sync/diff.ts
@@ -3,6 +3,7 @@ import { collectionsHandler } from "./diff/collection.js";
 import { Handler } from "./diff/combinators.js";
 import { makeContentTypeHandler, wholeContentTypesHandler } from "./diff/contentType.js";
 import { makeContentTypeSnippetHandler, wholeContentTypeSnippetsHandler } from "./diff/contentTypeSnippet.js";
+import { spaceHandler, wholeSpacesHandler } from "./diff/space.js";
 import { taxonomyGroupHandler, wholeTaxonomyGroupsHandler } from "./diff/taxonomy.js";
 import {
   transformSnippetToAddModel,
@@ -70,6 +71,11 @@ export const diff = (params: DiffParams): DiffModel => {
     params.targetEnvModel.assetFolders,
   );
 
+  const spacesDiffModel = createDiffModel(
+    wholeSpacesHandler(params.sourceEnvModel.spaces, params.targetEnvModel.spaces),
+    spaceHandler,
+  );
+
   return {
     // All the arrays are mutable in the SDK (even though they shouldn't) and readonly in our models. Unfortunately, TS doesn't allow casting it without casting to unknown first.
     taxonomyGroups: mapAdded(taxonomyDiffModel, transformTaxonomyToAddModel),
@@ -78,6 +84,7 @@ export const diff = (params: DiffParams): DiffModel => {
     collections: collectionDiffModel,
     webSpotlight: webSpotlightDiffModel,
     assetFolders: assetFoldersDiffModel,
+    spaces: spacesDiffModel,
   };
 };
 
diff --git a/src/modules/sync/diff/combinators.ts b/src/modules/sync/diff/combinators.ts
index 56bb82c3..b4a8a8a7 100644
--- a/src/modules/sync/diff/combinators.ts
+++ b/src/modules/sync/diff/combinators.ts
@@ -333,3 +333,18 @@ export const baseHandler: Handler<string | boolean | number> = (sourceVal, targe
  * Never creates a patch operation. Use for values that can never change (e.g. property "type" in elements).
  */
 export const constantHandler: Handler<unknown> = () => [];
+
+/**
+ * Compares objects on the "codename" property and creates "addInto", "remove" and "replace" operations for the whole objects.
+ * You should then use a different handler for comparing the same objects (those in the "replace" operations).
+ * The main puprose of this is to determine what objects (e.g. types or spaces) need to be added, removed or replaced.
+ *
+ * @param propertyName - the name of any property it is used to mark any two objects with the same codename as different
+ */
+export const makeWholeObjectsHandler = <
+  Object extends { readonly codename: string },
+>(propertyName: Omit<keyof Object, "codename">): Handler<ReadonlyArray<Object>> =>
+  makeArrayHandler(
+    el => el.codename,
+    makeLeafObjectHandler({ [propertyName as string]: () => false } as { [k in keyof Object]: () => false }),
+  );
diff --git a/src/modules/sync/diff/contentType.ts b/src/modules/sync/diff/contentType.ts
index 603680ac..4a89d258 100644
--- a/src/modules/sync/diff/contentType.ts
+++ b/src/modules/sync/diff/contentType.ts
@@ -10,10 +10,10 @@ import {
   Handler,
   makeAdjustOperationHandler,
   makeArrayHandler,
-  makeLeafObjectHandler,
   makeObjectHandler,
   makeOrderingHandler,
   makeUnionHandler,
+  makeWholeObjectsHandler,
   optionalHandler,
 } from "./combinators.js";
 import {
@@ -137,7 +137,4 @@ const patchOpToOrdNumber = (op: PatchOperation) => {
 const contentTypeOperationsComparator = (el1: PatchOperation, el2: PatchOperation): number =>
   patchOpToOrdNumber(el1) - patchOpToOrdNumber(el2);
 
-export const wholeContentTypesHandler: Handler<ReadonlyArray<ContentTypeSyncModel>> = makeArrayHandler(
-  t => t.codename,
-  makeLeafObjectHandler({ name: () => false }), // always replace types with the same codename as this handler only handles whole types not their parts
-);
+export const wholeContentTypesHandler: Handler<ReadonlyArray<ContentTypeSyncModel>> = makeWholeObjectsHandler("name");
diff --git a/src/modules/sync/diff/contentTypeSnippet.ts b/src/modules/sync/diff/contentTypeSnippet.ts
index 97683088..9ec051d0 100644
--- a/src/modules/sync/diff/contentTypeSnippet.ts
+++ b/src/modules/sync/diff/contentTypeSnippet.ts
@@ -5,10 +5,10 @@ import {
   Handler,
   makeAdjustOperationHandler,
   makeArrayHandler,
-  makeLeafObjectHandler,
   makeObjectHandler,
   makeOrderingHandler,
   makeUnionHandler,
+  makeWholeObjectsHandler,
 } from "./combinators.js";
 import {
   makeAssetElementHandler,
@@ -98,7 +98,5 @@ const patchOpToOrdNumber = (op: PatchOperation) => {
 const snippetOperationsComparator = (el1: PatchOperation, el2: PatchOperation): number =>
   patchOpToOrdNumber(el1) - patchOpToOrdNumber(el2);
 
-export const wholeContentTypeSnippetsHandler: Handler<ReadonlyArray<ContentTypeSnippetsSyncModel>> = makeArrayHandler(
-  s => s.codename,
-  makeLeafObjectHandler({ name: () => false }), // always replace snippets with the same codename as this handler only handles whole snippets not their parts
-);
+export const wholeContentTypeSnippetsHandler: Handler<ReadonlyArray<ContentTypeSnippetsSyncModel>> =
+  makeWholeObjectsHandler("name");
diff --git a/src/modules/sync/diff/space.ts b/src/modules/sync/diff/space.ts
new file mode 100644
index 00000000..2f663d41
--- /dev/null
+++ b/src/modules/sync/diff/space.ts
@@ -0,0 +1,21 @@
+import { zip } from "../../../utils/array.js";
+import { SpaceSyncModel } from "../types/syncModel.js";
+import {
+  baseHandler,
+  Handler,
+  makeLeafObjectHandler,
+  makeObjectHandler,
+  makeWholeObjectsHandler,
+  optionalHandler,
+} from "./combinators.js";
+
+export const spaceHandler: Handler<SpaceSyncModel> = makeObjectHandler({
+  name: baseHandler,
+  web_spotlight_root_item: optionalHandler(makeLeafObjectHandler({})),
+  collections: (source, target) =>
+    source.length !== target.length || zip(source, target).some(([s, t]) => s.codename !== t.codename)
+      ? [{ op: "replace", path: "", value: source, oldValue: target }]
+      : [],
+});
+
+export const wholeSpacesHandler: Handler<ReadonlyArray<SpaceSyncModel>> = makeWholeObjectsHandler("name");
diff --git a/src/modules/sync/diff/taxonomy.ts b/src/modules/sync/diff/taxonomy.ts
index 26cf6662..76e02547 100644
--- a/src/modules/sync/diff/taxonomy.ts
+++ b/src/modules/sync/diff/taxonomy.ts
@@ -11,10 +11,10 @@ import {
   makeAdjustEntityHandler,
   makeAdjustOperationHandler,
   makeArrayHandler,
-  makeLeafObjectHandler,
   makeObjectHandler,
   makeOrderingHandler,
   makeProvideHandler,
+  makeWholeObjectsHandler,
 } from "./combinators.js";
 
 export const taxonomyGroupHandler: Handler<TaxonomySyncModel> = makeObjectHandler({
@@ -33,10 +33,7 @@ export const taxonomyGroupHandler: Handler<TaxonomySyncModel> = makeObjectHandle
   },
 });
 
-export const wholeTaxonomyGroupsHandler: Handler<ReadonlyArray<TaxonomySyncModel>> = makeArrayHandler(
-  g => g.codename,
-  makeLeafObjectHandler({ name: () => false }), // always replace taxonomy groups with the same codename as this handler only handles whole taxonomy groups not their parts
-);
+export const wholeTaxonomyGroupsHandler: Handler<ReadonlyArray<TaxonomySyncModel>> = makeWholeObjectsHandler("name");
 
 type FlattenedSyncTaxonomy = Replace<TaxonomySyncModel, { terms: [] }> & Readonly<{ position: ReadonlyArray<string> }>;
 
diff --git a/src/modules/sync/generateSyncModel.ts b/src/modules/sync/generateSyncModel.ts
index d4dd39c0..a2f40b1b 100644
--- a/src/modules/sync/generateSyncModel.ts
+++ b/src/modules/sync/generateSyncModel.ts
@@ -4,6 +4,7 @@ import {
   CollectionContracts,
   ContentItemContracts,
   ManagementClient,
+  SpaceContracts,
   TaxonomyContracts,
   WebSpotlightContracts,
 } from "@kontent-ai/management-sdk";
@@ -14,11 +15,13 @@ import * as path from "path";
 import packageJson from "../../../package.json" with { type: "json" };
 import { logInfo, LogOptions } from "../../log.js";
 import { serializeDateForFileName } from "../../utils/files.js";
+import { notNullOrUndefined } from "../../utils/typeguards.js";
 import {
   assetFoldersFileName,
   collectionsFileName,
   contentTypesFileName,
   contentTypeSnippetsFileName,
+  spacesFileName,
   taxonomiesFileName,
   webSpotlightFileName,
 } from "./constants/filename.js";
@@ -26,6 +29,7 @@ import { transformAssetFolderModel } from "./modelTransfomers/assetFolder.js";
 import { transformCollectionsModel } from "./modelTransfomers/collections.js";
 import { transformContentTypeModel } from "./modelTransfomers/contentTypes.js";
 import { transformContentTypeSnippetsModel } from "./modelTransfomers/contentTypeSnippets.js";
+import { transformSpacesModel } from "./modelTransfomers/spaceTransformers.js";
 import { transformTaxonomyGroupsModel } from "./modelTransfomers/taxonomyGroups.js";
 import { transformWebSpotlightModel } from "./modelTransfomers/webSpotlight.js";
 import { ContentTypeSnippetsWithUnionElements, ContentTypeWithUnionElements } from "./types/contractModels.js";
@@ -38,6 +42,7 @@ import {
   fetchContentTypeSnippets,
   fetchRequiredAssets,
   fetchRequiredContentItems,
+  fetchSpaces,
   fetchTaxonomies,
   fetchWebSpotlight,
 } from "./utils/fetchers.js";
@@ -49,6 +54,7 @@ export type EnvironmentModel = {
   collections: ReadonlyArray<CollectionContracts.ICollectionContract>;
   webSpotlight: WebSpotlightContracts.IWebSpotlightStatus;
   assetFolders: ReadonlyArray<AssetFolderContracts.IAssetFolderContract>;
+  spaces: ReadonlyArray<SpaceContracts.ISpaceContract>;
   assets: ReadonlyArray<AssetContracts.IAssetModelContract>;
   items: ReadonlyArray<ContentItemContracts.IContentItemModelContract>;
 };
@@ -64,6 +70,8 @@ export const fetchModel = async (client: ManagementClient): Promise<EnvironmentM
 
   const assetFolders = await fetchAssetFolders(client);
 
+  const spaces = await fetchSpaces(client);
+
   const collections = await fetchCollections(client);
 
   const allIds = [...contentTypes, ...contentTypeSnippets].reduce<{ assetIds: Set<string>; itemIds: Set<string> }>(
@@ -75,7 +83,10 @@ export const fetchModel = async (client: ManagementClient): Promise<EnvironmentM
         itemIds: new Set([...previous.itemIds, ...ids.itemIds]),
       };
     },
-    { assetIds: new Set(), itemIds: new Set() },
+    {
+      assetIds: new Set(),
+      itemIds: new Set(spaces.map(s => s.web_spotlight_root_item?.id).filter(notNullOrUndefined)),
+    },
   );
 
   const assets = await fetchRequiredAssets(client, Array.from(allIds.assetIds));
@@ -87,6 +98,7 @@ export const fetchModel = async (client: ManagementClient): Promise<EnvironmentM
     taxonomyGroups: taxonomies,
     collections,
     webSpotlight,
+    spaces,
     assets,
     items,
     assetFolders,
@@ -100,6 +112,7 @@ export const transformSyncModel = (environmentModel: EnvironmentModel, logOption
   const collectionsModel = transformCollectionsModel(environmentModel.collections);
   const webSpotlightModel = transformWebSpotlightModel(environmentModel);
   const assetFoldersModel = environmentModel.assetFolders.map(transformAssetFolderModel);
+  const spacesModel = transformSpacesModel(environmentModel);
 
   return {
     contentTypes: contentTypeModel,
@@ -108,6 +121,7 @@ export const transformSyncModel = (environmentModel: EnvironmentModel, logOption
     collections: collectionsModel,
     webSpotlight: webSpotlightModel,
     assetFolders: assetFoldersModel,
+    spaces: spacesModel,
   };
 };
 
@@ -159,6 +173,10 @@ export const saveSyncModel = async (params: SaveModelParams) => {
     path.resolve(folderName, collectionsFileName),
     JSON.stringify(finalModel.collections, null, 2),
   );
+  await fsPromises.writeFile(
+    path.resolve(folderName, spacesFileName),
+    JSON.stringify(finalModel.spaces, null, 2),
+  );
   await fsPromises.writeFile(path.resolve(folderName, "metadata.json"), JSON.stringify(finalModel.metadata, null, 2));
 
   return folderName;
diff --git a/src/modules/sync/modelTransfomers/spaceTransformers.ts b/src/modules/sync/modelTransfomers/spaceTransformers.ts
new file mode 100644
index 00000000..5ce29905
--- /dev/null
+++ b/src/modules/sync/modelTransfomers/spaceTransformers.ts
@@ -0,0 +1,24 @@
+import { throwError } from "../../../utils/error.js";
+import { omit } from "../../../utils/object.js";
+import { EnvironmentModel } from "../generateSyncModel.js";
+import { SpaceSyncModel } from "../types/syncModel.js";
+
+export const transformSpacesModel = (
+  environmentModel: EnvironmentModel,
+): ReadonlyArray<SpaceSyncModel> =>
+  environmentModel.spaces.map(space => ({
+    ...omit(space, ["id"]),
+    web_spotlight_root_item: space.web_spotlight_root_item
+      ? {
+        codename: environmentModel.items.find(i => i.id === space.web_spotlight_root_item?.id)?.codename
+          ?? throwError(
+            `Cannot find web spotlight root item { id: ${space.web_spotlight_root_item.id} } for space { codename: ${space.codename}}.`,
+          ),
+      }
+      : undefined,
+    collections: space.collections
+      ?.map(collection => ({
+        codename: environmentModel.collections.find(i => i.id === collection.id)?.codename
+          ?? throwError(`Cannot find collection { id: ${collection.id} } for space { codename: ${space.codename}}.`),
+      })) ?? [],
+  }));
diff --git a/src/modules/sync/printDiff.ts b/src/modules/sync/printDiff.ts
index b2031a48..a6228979 100644
--- a/src/modules/sync/printDiff.ts
+++ b/src/modules/sync/printDiff.ts
@@ -29,6 +29,9 @@ export const printDiff = (diffModel: DiffModel, logOptions: LogOptions) => {
     logInfo(logOptions, "standard", "No collections to update.");
   }
 
+  logInfo(logOptions, "standard", chalk.blue.bold("\nSPACES:"));
+  printDiffEntity(diffModel.spaces, "spaces", logOptions);
+
   logInfo(logOptions, "standard", chalk.blue.bold("\nTAXONOMY GROUPS:"));
   printDiffEntity(diffModel.taxonomyGroups, "taxonomy groups", logOptions);
 
@@ -59,7 +62,7 @@ export const printDiff = (diffModel: DiffModel, logOptions: LogOptions) => {
 
 const printDiffEntity = (
   diffObject: DiffObject<unknown>,
-  entityName: "content types" | "content type snippets" | "taxonomy groups",
+  entityName: "content types" | "content type snippets" | "taxonomy groups" | "spaces",
   logOptions: LogOptions,
 ) => {
   if (diffObject.added.length) {
diff --git a/src/modules/sync/sync.ts b/src/modules/sync/sync.ts
index a495ee85..056a9b3f 100644
--- a/src/modules/sync/sync.ts
+++ b/src/modules/sync/sync.ts
@@ -11,6 +11,7 @@ import {
   deleteSnippet,
   updateSnippets,
 } from "./sync/snippets.js";
+import { syncSpaces } from "./sync/spaces.js";
 import { syncTaxonomies } from "./sync/taxonomy.js";
 import { addTypesWithoutReferences, deleteContentType, updateContentTypesAndAddReferences } from "./sync/types.js";
 import { isOp } from "./sync/utils.js";
@@ -24,6 +25,8 @@ export const sync = async (client: ManagementClient, diff: DiffModel, logOptions
   logInfo(logOptions, "standard", "Syncing Collections");
   await syncAddAndReplaceCollections(client, diff.collections);
 
+  await syncSpaces(client, diff.spaces, logOptions);
+
   await syncRemoveCollections(client, diff.collections);
 
   await syncTaxonomies(client, diff.taxonomyGroups, logOptions);
diff --git a/src/modules/sync/sync/spaces.ts b/src/modules/sync/sync/spaces.ts
new file mode 100644
index 00000000..4ee30e02
--- /dev/null
+++ b/src/modules/sync/sync/spaces.ts
@@ -0,0 +1,57 @@
+import { ManagementClient, SpaceModels } from "@kontent-ai/management-sdk";
+import { match, P } from "ts-pattern";
+
+import { logInfo, LogOptions } from "../../../log.js";
+import { throwError } from "../../../utils/error.js";
+import { serially } from "../../../utils/requests.js";
+import { DiffModel } from "../types/diffModel.js";
+import { PatchOperation } from "../types/patchOperation.js";
+
+export const syncSpaces = async (
+  client: ManagementClient,
+  model: DiffModel["spaces"],
+  logOptions: LogOptions,
+) => {
+  logInfo(logOptions, "standard", "Adding new spaces");
+
+  await serially(model.added.map(space => () =>
+    client
+      .addSpace()
+      .withData(space as SpaceModels.IAddSpaceData)
+      .toPromise()
+  ));
+
+  logInfo(logOptions, "standard", "Updating spaces");
+
+  await serially([...model.updated].map(([spaceCodename, operations]) => () =>
+    client
+      .modifySpace()
+      .bySpaceCodename(spaceCodename)
+      .withData(operations.map(convertOperation))
+      .toPromise()
+  ));
+
+  logInfo(logOptions, "standard", "Removing spaces");
+
+  await serially([...model.deleted].map(spaceCodename => () =>
+    client
+      .deleteSpace()
+      .bySpaceCodename(spaceCodename)
+      .toPromise()
+  ));
+};
+
+const convertOperation = (operation: PatchOperation): SpaceModels.IModifySpaceData =>
+  match(operation)
+    .with({ op: "replace" }, op =>
+      match(op.path.split("/").pop())
+        .with(
+          P.union("name", "web_spotlight_root_item", "collections"),
+          pName => ({ op: "replace", property_name: pName, value: op.value as any }) as const,
+        )
+        .otherwise(() =>
+          throwError(`Patch operation "${JSON.stringify(op)}" has missing or invalid property name in path.`)
+        ))
+    .with({ op: P.union("addInto", "remove", "move") }, () =>
+      throwError(`Patch operation "${operation.op}" is not supported for spaces.`))
+    .exhaustive();
diff --git a/src/modules/sync/types/diffModel.ts b/src/modules/sync/types/diffModel.ts
index 472bbf92..9a3f7543 100644
--- a/src/modules/sync/types/diffModel.ts
+++ b/src/modules/sync/types/diffModel.ts
@@ -1,6 +1,12 @@
-import { ContentTypeModels, ContentTypeSnippetModels, TaxonomyModels } from "@kontent-ai/management-sdk";
+import {
+  ContentTypeModels,
+  ContentTypeSnippetModels,
+  SharedContracts,
+  SpaceModels,
+  TaxonomyModels,
+} from "@kontent-ai/management-sdk";
 
-import { RequiredCodename } from "../../../utils/types.js";
+import { Replace, RequiredCodename } from "../../../utils/types.js";
 import { PatchOperation } from "./patchOperation.js";
 
 type Codename = string;
@@ -25,4 +31,10 @@ export type DiffModel = Readonly<{
   collections: ReadonlyArray<PatchOperation>;
   webSpotlight: WebSpotlightDiffModel;
   assetFolders: ReadonlyArray<PatchOperation>;
+  spaces: DiffObject<
+    Replace<
+      RequiredCodename<SpaceModels.IAddSpaceData>,
+      { collections: ReadonlyArray<SharedContracts.IReferenceObjectContract> }
+    >
+  >;
 }>;
diff --git a/src/modules/sync/types/fileContentModel.ts b/src/modules/sync/types/fileContentModel.ts
index f89dd46d..8dee9941 100644
--- a/src/modules/sync/types/fileContentModel.ts
+++ b/src/modules/sync/types/fileContentModel.ts
@@ -3,6 +3,7 @@ import {
   CollectionSyncModel,
   ContentTypeSnippetsSyncModel,
   ContentTypeSyncModel,
+  SpaceSyncModel,
   TaxonomySyncModel,
   WebSpotlightSyncModel,
 } from "./syncModel.js";
@@ -14,4 +15,5 @@ export type FileContentModel = Readonly<{
   webSpotlight: WebSpotlightSyncModel;
   assetFolders: ReadonlyArray<AssetFolderSyncModel>;
   collections: ReadonlyArray<CollectionSyncModel>;
+  spaces: ReadonlyArray<SpaceSyncModel>;
 }>;
diff --git a/src/modules/sync/types/syncModel.ts b/src/modules/sync/types/syncModel.ts
index d950d82d..3699bd59 100644
--- a/src/modules/sync/types/syncModel.ts
+++ b/src/modules/sync/types/syncModel.ts
@@ -4,6 +4,7 @@ import {
   ContentTypeContracts,
   ContentTypeElements,
   ContentTypeSnippetContracts,
+  SpaceContracts,
   TaxonomyContracts,
   WebSpotlightContracts,
 } from "@kontent-ai/management-sdk";
@@ -132,6 +133,14 @@ export type AssetFolderSyncModel = Replace<
   Readonly<{ folders: ReadonlyArray<AssetFolderSyncModel> }>
 >;
 
+export type SpaceSyncModel = Replace<
+  Omit<SpaceContracts.ISpaceContract, "id">,
+  Readonly<{
+    web_spotlight_root_item?: Readonly<{ codename: string }>;
+    collections: ReadonlyArray<Readonly<{ codename: string }>>;
+  }>
+>;
+
 export const isSyncCustomElement = (entity: unknown): entity is SyncCustomElement =>
   typeof entity === "object" && entity !== null && "type" in entity && entity.type === "custom";
 
diff --git a/src/modules/sync/utils/diffTemplate.html b/src/modules/sync/utils/diffTemplate.html
index fcc3047f..c34b31af 100644
--- a/src/modules/sync/utils/diffTemplate.html
+++ b/src/modules/sync/utils/diffTemplate.html
@@ -345,7 +345,7 @@ <h2>Modified entities</h2>
         <div>state from <strong>{{datetime_generated}}</strong></div>
         {{types_section}} {{snippets_section}} {{taxonomies_section}}
         {{asset_folders_section}} {{collections_section}}
-        {{web_spotlight_section}}
+        {{web_spotlight_section}} {{spaces_section}}
       </div>
     </div>
     <script>
diff --git a/src/modules/sync/utils/fetchers.ts b/src/modules/sync/utils/fetchers.ts
index 9cd844a6..5476168e 100644
--- a/src/modules/sync/utils/fetchers.ts
+++ b/src/modules/sync/utils/fetchers.ts
@@ -98,6 +98,12 @@ export const fetchAssetFolders = (client: ManagementClient) =>
     .toPromise()
     .then(res => res.rawData.folders);
 
+export const fetchSpaces = (client: ManagementClient) =>
+  client
+    .listSpaces()
+    .toPromise()
+    .then(res => res.rawData);
+
 export const fetchCollections = (client: ManagementClient) =>
   client
     .listCollections()
diff --git a/src/modules/sync/utils/getContentModel.ts b/src/modules/sync/utils/getContentModel.ts
index 89466574..672c9b57 100644
--- a/src/modules/sync/utils/getContentModel.ts
+++ b/src/modules/sync/utils/getContentModel.ts
@@ -2,11 +2,13 @@ import { ManagementClient } from "@kontent-ai/management-sdk";
 import * as fs from "fs/promises";
 
 import { LogOptions } from "../../../log.js";
+import { notNullOrUndefined } from "../../../utils/typeguards.js";
 import {
   assetFoldersFileName,
   collectionsFileName,
   contentTypesFileName,
   contentTypeSnippetsFileName,
+  spacesFileName,
   taxonomiesFileName,
   webSpotlightFileName,
 } from "../constants/filename.js";
@@ -16,6 +18,7 @@ import {
   AssetFolderSyncModel,
   ContentTypeSnippetsSyncModel,
   ContentTypeSyncModel,
+  SpaceSyncModel,
   TaxonomySyncModel,
   WebSpotlightSyncModel,
 } from "../types/syncModel.js";
@@ -47,6 +50,10 @@ export const readContentModelFromFolder = async (folderName: string): Promise<Fi
     await fs.readFile(`${folderName}/${assetFoldersFileName}`, "utf8").catch(() => "[]"),
   ) as ReadonlyArray<AssetFolderSyncModel>;
 
+  const spaces = JSON.parse(
+    await fs.readFile(`${folderName}/${spacesFileName}`, "utf8").catch(() => "[]"),
+  ) as ReadonlyArray<SpaceSyncModel>;
+
   return {
     contentTypes,
     contentTypeSnippets: snippets,
@@ -54,6 +61,7 @@ export const readContentModelFromFolder = async (folderName: string): Promise<Fi
     collections,
     webSpotlight,
     assetFolders,
+    spaces,
   };
 };
 
@@ -63,19 +71,23 @@ type AssetItemsCodenames = Readonly<{
 }>;
 
 export const getSourceItemAndAssetCodenames = (sourceModel: FileContentModel): AssetItemsCodenames =>
-  [...sourceModel.contentTypes, ...sourceModel.contentTypeSnippets].reduce<
-    { assetCodenames: Set<string>; itemCodenames: Set<string> }
-  >(
-    (previous, type) => {
-      const requiredIds = getRequiredCodenames(type.elements);
+  [...sourceModel.contentTypes, ...sourceModel.contentTypeSnippets]
+    .reduce<{ assetCodenames: Set<string>; itemCodenames: Set<string> }>(
+      (previous, type) => {
+        const requiredIds = getRequiredCodenames(type.elements);
 
-      requiredIds.assetCodenames.forEach(c => previous.assetCodenames.add(c));
-      requiredIds.itemCodenames.forEach(c => previous.itemCodenames.add(c));
+        requiredIds.assetCodenames.forEach(c => previous.assetCodenames.add(c));
+        requiredIds.itemCodenames.forEach(c => previous.itemCodenames.add(c));
 
-      return previous;
-    },
-    { assetCodenames: new Set(), itemCodenames: new Set() },
-  );
+        return previous;
+      },
+      {
+        assetCodenames: new Set(),
+        itemCodenames: new Set(
+          sourceModel.spaces.map(s => s.web_spotlight_root_item?.codename).filter(notNullOrUndefined),
+        ),
+      },
+    );
 
 export const getTargetContentModel = async (
   targetClient: ManagementClient,
diff --git a/src/modules/sync/utils/htmlRenderers.ts b/src/modules/sync/utils/htmlRenderers.ts
index bb645c58..b01ed1cf 100644
--- a/src/modules/sync/utils/htmlRenderers.ts
+++ b/src/modules/sync/utils/htmlRenderers.ts
@@ -38,7 +38,7 @@ type Operation = PatchOperation["op"];
 type TypeOrSnippet = ContentTypeModels.IAddContentTypeData | ContentTypeSnippetModels.IAddContentTypeSnippetData;
 type ElementOrTerm = ContentTypeElements.Element | TaxonomyModels.IAddTaxonomyRequestModel;
 type RenderFunction<T extends PatchOperation> = (patchOp: T) => string;
-type EntityType = "taxonomies" | "types" | "snippets";
+type EntityType = "taxonomies" | "types" | "snippets" | "spaces";
 type EntityActionType = "added" | "updated" | "deleted";
 type AdvancedDiffParams =
   & Readonly<{
@@ -330,16 +330,17 @@ const renderEntitySection = (
   entityType: EntityType,
   { added, updated, deleted }: DiffObject<unknown>,
 ) => {
-  const entityTypeNameMap: ReadonlyMap<typeof entityType, string> = new Map([
-    ["snippets", "Snippets"],
-    ["taxonomies", "Taxonomy groups"],
-    ["types", "Content types"],
-  ]);
+  const entityTypeNameMap: Readonly<Record<typeof entityType, string>> = {
+    snippets: "Snippets",
+    taxonomies: "Taxonomy groups",
+    types: "Content types",
+    spaces: "Spaces",
+  };
 
   return renderSection({
     id: entityType,
     header: `
-    <div>${entityTypeNameMap.get(entityType)}</div>
+    <div>${entityTypeNameMap[entityType]}</div>
     ${modifiedNum([...updated.values()].filter(ops => ops.length).length, true)}
     ${addedNum(added.length)}
     ${removedNum(deleted.size)}
@@ -503,6 +504,13 @@ const rendererMap: ReadonlyMap<string, (data: DiffData) => string> = new Map([
         })
         : "<h3>No changes to collections</h3>",
   ],
+  [
+    "{{spaces_section}}",
+    ({ spaces }: DiffData) =>
+      getCombinedOpLength(spaces)
+        ? renderEntitySection("spaces", spaces)
+        : "<h3>No changes to spaces.</h3>",
+  ],
 ]);
 
 const patchOpRendererMap: ReadonlyMap<
diff --git a/tests/integration/diff/advancedDiff.test.ts.snap.html b/tests/integration/diff/advancedDiff.test.ts.snap.html
index 9d6ab5ba..c7ca4acc 100644
--- a/tests/integration/diff/advancedDiff.test.ts.snap.html
+++ b/tests/integration/diff/advancedDiff.test.ts.snap.html
@@ -2380,6 +2380,36 @@ <h3>
             </div>
           </div>
         </div>
+
+        <div class="entity-section">
+          <div
+            class="entity-section-header"
+            onclick="toggleVisibility('spaces')"
+          >
+            <div>Spaces</div>
+            <div class="num-modified push">✎ 2</div>
+            <div class="num-added">+ 1</div>
+            <div class="num-removed">− 1</div>
+          </div>
+          <div id="spaces" class="entity-section-content">
+            <div class="updated">
+              <h3>updated</h3>
+              {{updated_spaces}}
+            </div>
+
+            <div class="added-and-deleted">
+              <div class="deleted">
+                <h3>deleted</h3>
+                {{deleted_spaces}}
+              </div>
+
+              <div class="added">
+                <h3>added</h3>
+                {{added_spaces}}
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <script>
diff --git a/tests/integration/sync/data/sync_test_source.zip b/tests/integration/sync/data/sync_test_source.zip
index bd45bf725594381e3073952bd613f39fa5815042..f489bb5c9d54923280173893a65b03e9953230a1 100644
GIT binary patch
delta 3070
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
MDKM^}4yNM&090iLi~s-t

delta 2466
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

diff --git a/tests/integration/sync/data/sync_test_target.zip b/tests/integration/sync/data/sync_test_target.zip
index 23f55b6771eb75a3682a40a5012f2ec2fee9bf60..f57d1e6b2c319f9f1cfb77434b95b274238e2fa6 100644
GIT binary patch
delta 2195
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

delta 1500
zcmaF1h3U(BCf)#VW)=|!4j|-lQQgSP$H)w%C(AL)O#V4V4#eKvz*NTq7Gz|Xub=8?
z&DCHavb!r~-Ge(fqdQJ)uJzhlcj20ARe9j*=Gl@$9!?$`4`+C!2)<k?UuDG6V`89E
zly@R}`kB*LHWqa*-T3v25zCb&mfODEZEA?r4my{^^HS{m^p8s}W}dh;D<pnz^r!P%
z1x_&sc(ZfNbYAM8!N9<98i=9JtcSQW5-0)(0zg(lQEFLcYI$f;PO)BAaem(FFfBa~
zAHQDzljnWUoY4;3)YW%2P)oy0_q300zrOCNPJIs@O;6pX6IYmkMzeDyEn<_>0h*%+
z#3&(xViOm`WC_k1aG*@*tOSSDW?}AdNa##dli1wK&neE#3k<V~YAQ@%#tw}MEMSJW
zt}r8*k*GH%1;m*AW0GurP;CEg1%W^Mzu)vWHrW4=t$n4r$zYA_I*Dku)mh5_zfYb#
z$M5alJBln(yl2iC?74H`oZ^JDb$tu+H(YYicJ+3DD4UURzVZ0K`=9y_?h|)tRO_;A
ztlKHlzq=`P4)2@`1+N3H#Ux!`EfyWLDs-x?cd#R4S((ULmj#N!r((ZZ2GoDw)e~^w
z0dwj61DBci$g{|97vS>vr{5^HHDFD{pLEL?e^T7E;>E32Y%^_W%Rc9QDK#@_(VPip
zDSy74el#s(Yw;P8&nM3XM|v+lw|C8k<qO@9X}9;?kz5<_B<tal?3kP0t6GKALoP{7
znYQ(Y)$$9W+qN@jN8UAg+P-}Go87D4ZLcr?$+hd@rivGD);&3%&9+veTI#>d@o=j{
z?f++F_NpC-Ygn8TzF)>uUh=NO42!(9KY3UF8`#R#?-vp9Id#{>+P=c-UvGkwQn1D>
z`Iwi#ZA^Q@oBp@_{lo@}(|-ORD&dR_43$jCaS9B1M4V23I>iVa7gAFbz;x|Y?fQhD
zmUk3tSCy#ko~UtPV(%T7oz-dkc6_n8Z5Qys$B2(R?RC|;we<l9rZL}?zWHNA_Qx0t
z>G{{y#a`^VwXuI)@;z2o%bbhXC#-n2ds3;VM~KZ{i&ZJp6jnd@&JJ=__+7Kj>A+N0
z2u^8?OuEeQ+!s0FRBXrP$?DTg`GEN@QggQtFAGo=6T{@JY1&#Kp&yJZd0l{FHarXr
z{6HxPP+(Zn=m+#@Nn%BQUVd)o<ihE~njq!K8Hf+2ngOKzJSzi3PGVkqX<|A^wE{>r
zavlKXDF^_mE@qpoHyvCUO!l8H&2*P-a?W&#7?7SnhjUjt0Ij|b3}aLqve_9J%JYk|
z({l35A$c;u8`ZZZO*<Zo06nuB=otx^bzs*$=a~Fpx*E95;hZ7O<j6Z&ZHBx8DCXvE
zyS@Jf(7w-X3=D!OdQw#;r$QB-HCdz?05sT3n1MkQMNyC1<Rvqd!7+UbXt2EY<mWTw
z!CcOn(oCj0lMD20bdcQ%vJ*KSaibV_X2RsYnUY}rt7b~q$4mlxIW;LGKR+AO#~_nF
zKZ%P}0h*u$#Hg;H4bd80kYAFMnVwMsF2v9sf}C`CQ5^CQs6BVG%PbkT1(QJ%0AVQX
AvH$=8

diff --git a/tests/unit/syncModel/contentTypeTransformer.test.ts b/tests/unit/syncModel/contentTypeTransformer.test.ts
index d0798d09..e7c930e5 100644
--- a/tests/unit/syncModel/contentTypeTransformer.test.ts
+++ b/tests/unit/syncModel/contentTypeTransformer.test.ts
@@ -39,6 +39,7 @@ const createEnvironmentModel = (contentTypes: ReadonlyArray<ContentTypeWithUnion
   taxonomyGroups: [],
   assetFolders: [],
   collections: [],
+  spaces: [],
   webSpotlight: {
     enabled: false,
     root_type: null,
diff --git a/tests/unit/syncModel/diff/combinators.test.ts b/tests/unit/syncModel/diff/combinators.test.ts
index 673f031b..5a49c4ad 100644
--- a/tests/unit/syncModel/diff/combinators.test.ts
+++ b/tests/unit/syncModel/diff/combinators.test.ts
@@ -14,6 +14,7 @@ import {
   makePrefixHandler,
   makeProvideHandler,
   makeUnionHandler,
+  makeWholeObjectsHandler,
   optionalHandler,
 } from "../../../../src/modules/sync/diff/combinators.ts";
 import { PatchOperation } from "../../../../src/modules/sync/types/patchOperation.ts";
@@ -590,3 +591,30 @@ describe("makePrefixHandler", () => {
     ]);
   });
 });
+
+describe("makeWholeObjectsHandler", () => {
+  it("Replaces the whole object when it has the same codename in source and target, even when they are the same", () => {
+    type Obj = Readonly<{ codename: string; name: string }>;
+
+    const source: ReadonlyArray<Obj> = [{ codename: "test", name: "source" }];
+    const target: ReadonlyArray<Obj> = source;
+
+    const result = makeWholeObjectsHandler<Obj>("name")(source, target);
+
+    expect(result).toStrictEqual([{ op: "replace", path: "/codename:test", value: source[0], oldValue: target[0] }]);
+  });
+
+  it("Adds objects with no matching codename in target and removes those with no matching codename in source", () => {
+    type Obj = Readonly<{ codename: string; name: string }>;
+
+    const source: ReadonlyArray<Obj> = [{ codename: "testSource", name: "source" }];
+    const target: ReadonlyArray<Obj> = [{ codename: "testTarget", name: "target" }];
+
+    const result = makeWholeObjectsHandler<Obj>("name")(source, target);
+
+    expect(result).toStrictEqual([
+      { op: "addInto", path: "", value: source[0] },
+      { op: "remove", path: "/codename:testTarget", oldValue: target[0] },
+    ]);
+  });
+});
diff --git a/tests/unit/syncModel/diff/space.test.ts b/tests/unit/syncModel/diff/space.test.ts
new file mode 100644
index 00000000..bfff42f3
--- /dev/null
+++ b/tests/unit/syncModel/diff/space.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+
+import { spaceHandler } from "../../../../src/modules/sync/diff/space.ts";
+import { SpaceSyncModel } from "../../../../src/modules/sync/types/syncModel.ts";
+
+describe("spaceHandler", () => {
+  it("creates a replace operation for every changed property", () => {
+    const source: SpaceSyncModel = {
+      name: "name source",
+      codename: "space",
+      web_spotlight_root_item: { codename: "item1" },
+      collections: [{ codename: "collection1" }],
+    };
+    const target: SpaceSyncModel = {
+      name: "name target",
+      codename: "space",
+      web_spotlight_root_item: { codename: "item2" },
+      collections: [{ codename: "collection2" }],
+    };
+
+    const result = spaceHandler(source, target);
+
+    expect(result).toStrictEqual([
+      { op: "replace", path: "/name", value: "name source", oldValue: "name target" },
+      {
+        op: "replace",
+        path: "/web_spotlight_root_item",
+        value: { codename: "item1" },
+        oldValue: { codename: "item2" },
+      },
+      {
+        op: "replace",
+        path: "/collections",
+        value: [{ codename: "collection1" }],
+        oldValue: [{ codename: "collection2" }],
+      },
+    ]);
+  });
+
+  it("does not create any operations for the same spaces", () => {
+    const source: SpaceSyncModel = {
+      name: "name",
+      codename: "space",
+      web_spotlight_root_item: { codename: "item" },
+      collections: [{ codename: "collection" }],
+    };
+    const target: SpaceSyncModel = {
+      name: "name",
+      codename: "space",
+      web_spotlight_root_item: { codename: "item" },
+      collections: [{ codename: "collection" }],
+    };
+
+    const result = spaceHandler(source, target);
+
+    expect(result).toStrictEqual([]);
+  });
+});
diff --git a/tests/unit/syncModel/snippetTransformer.test.ts b/tests/unit/syncModel/snippetTransformer.test.ts
index 47ea9e2c..77ec7798 100644
--- a/tests/unit/syncModel/snippetTransformer.test.ts
+++ b/tests/unit/syncModel/snippetTransformer.test.ts
@@ -41,6 +41,7 @@ describe("content type snippet transfomers", () => {
       taxonomyGroups: [],
       assetFolders: [],
       collections: [],
+      spaces: [],
       webSpotlight: {
         enabled: false,
         root_type: null,
diff --git a/tests/unit/syncModel/spacesTransformer.test.ts b/tests/unit/syncModel/spacesTransformer.test.ts
new file mode 100644
index 00000000..d623e8e4
--- /dev/null
+++ b/tests/unit/syncModel/spacesTransformer.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from "vitest";
+
+import { EnvironmentModel } from "../../../src/modules/sync/generateSyncModel.ts";
+import { transformSpacesModel } from "../../../src/modules/sync/modelTransfomers/spaceTransformers.ts";
+
+describe("transformSpacesModel", () => {
+  it("Replaces WS root item id and collection ids for codenames", () => {
+    const environmentModel: EnvironmentModel = {
+      spaces: [
+        {
+          id: "fd7e46fc-451f-47be-801a-f9c645fb6a39",
+          name: "space1",
+          codename: "space1",
+          web_spotlight_root_item: { id: "cbf1bdb1-9399-47cf-8ab1-b6afab184f9c" },
+          collections: [{ id: "6b3df4c1-fa0a-4da6-8231-9526d0c91dfc" }],
+        },
+      ],
+      items: [{
+        id: "cbf1bdb1-9399-47cf-8ab1-b6afab184f9c",
+        name: "root item",
+        codename: "rootItem",
+        type: { id: "ad2d7314-19d8-43ca-a015-8b82e6f6f152" },
+        collection: { id: "6b3df4c1-fa0a-4da6-8231-9526d0c91dfc" },
+        spaces: [],
+        last_modified: new Date(),
+      }],
+      collections: [{ id: "6b3df4c1-fa0a-4da6-8231-9526d0c91dfc", name: "collection", codename: "collection" }],
+      webSpotlight: { enabled: false, root_type: null },
+      taxonomyGroups: [],
+      contentTypes: [],
+      contentTypeSnippets: [],
+      assetFolders: [],
+      assets: [],
+    };
+
+    const result = transformSpacesModel(environmentModel);
+
+    expect(result).toStrictEqual([
+      {
+        name: "space1",
+        codename: "space1",
+        web_spotlight_root_item: { codename: "rootItem" },
+        collections: [{ codename: "collection" }],
+      },
+    ]);
+  });
+});
diff --git a/tests/unit/syncModel/webSpotlightTransformer.test.ts b/tests/unit/syncModel/webSpotlightTransformer.test.ts
index 6d73e45a..281ca53e 100644
--- a/tests/unit/syncModel/webSpotlightTransformer.test.ts
+++ b/tests/unit/syncModel/webSpotlightTransformer.test.ts
@@ -19,6 +19,7 @@ const createEnvironmentModel = (isWebSpotlightEnabled: boolean, rootTypeId: stri
   taxonomyGroups: [],
   assetFolders: [],
   collections: [],
+  spaces: [],
   webSpotlight: {
     enabled: isWebSpotlightEnabled,
     root_type: rootTypeId ? { id: rootTypeId } : null,