[BMSPT-24] added project, extensions and documents builder

Tests/Converter/Converter21Tests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using bcf;
 using bcf.Converter;
 using NUnit.Framework;
 
@@ -9,7 +10,7 @@ namespace Tests.Converter;
 public class Converter21Tests {
   [SetUp]
   public void Setup() {
-    _converter = new Converter21();
+    _converter = new bcf.Converter.Bcf21.Converter();
   }
 
   private IConverter _converter = null!;

Tests/Converter/Converter30Tests.cs

@@ -9,7 +9,7 @@ namespace Tests.Converter;
 public class Converter30Tests {
   [SetUp]
   public void Setup() {
-    _converter = new Converter30();
+    _converter = new bcf.Converter.Bcf30.Converter();
   }
 
   private IConverter _converter = null!;

Tests/Converter/Json/JsonConverterTests.cs

@@ -76,7 +76,7 @@ await JsonConverter
     var markup = markups.FirstOrDefault()!;
     Assert.AreEqual(1, markups.Count);
     var documentGuid = markup.Topic.DocumentReferences.FirstOrDefault()?.DocumentGuid;
-    var document = root.document?.Documents.FirstOrDefault()!;
+    var document = root.Document?.Documents.FirstOrDefault()!;
     Assert.AreEqual("b1d1b7f0-60b9-457d-ad12-16e0fb997bc5", documentGuid);
     Assert.AreEqual(documentGuid, document.Guid);
     Assert.AreEqual("ThisIsADocument.txt", document.Filename);

bcf-converter/Builder/Bcf21/IProjectBuilderExtension.cs

@@ -0,0 +1,5 @@
+namespace bcf.Builder.Bcf21;
+
+public interface IProjectBuilderExtension<out TBuilder> {
+  TBuilder AddExtensionSchema(string schema);
+}

bcf-converter/Builder/Bcf21/IVersionBuilderExtension.cs

@@ -0,0 +1,5 @@
+namespace bcf.Builder.Bcf21;
+
+public interface IVersionBuilderExtension<out TBuilder> {
+  TBuilder AddDetailedVersion(string version);
+}

bcf-converter/Builder/Bcf21/ProjectBuilder.cs

@@ -0,0 +1,21 @@
+using bcf.bcf21;
+
+namespace bcf.Builder.Bcf21;
+
+public partial class ProjectBuilder : IProjectBuilder<ProjectBuilder> {
+  private readonly ProjectExtension _project = new();
+
+  public ProjectBuilder AddProjectName(string name) {
+    _project.Project.Name = name;
+    return this;
+  }
+
+  public ProjectBuilder AddProjectId(string id) {
+    _project.Project.ProjectId = id;
+    return this;
+  }
+
+  public IProject Build() {
+    return _project;
+  }
+}

bcf-converter/Builder/Bcf21/ProjectBuilderExtensions.cs

@@ -0,0 +1,8 @@
+namespace bcf.Builder.Bcf21;
+
+public partial class ProjectBuilder : IProjectBuilderExtension<ProjectBuilder> {
+  public ProjectBuilder AddExtensionSchema(string schema) {
+    _project.ExtensionSchema = schema;
+    return this;
+  }
+}

bcf-converter/Builder/Bcf21/VersionBuilder.cs

@@ -0,0 +1,16 @@
+using bcf.bcf21;
+
+namespace bcf.Builder.Bcf21;
+
+public partial class VersionBuilder : IVersionBuilder<VersionBuilder> {
+  private readonly Version _version = new();
+
+  public VersionBuilder AddVersionId(string id) {
+    _version.VersionId = id;
+    return this;
+  }
+
+  public IVersion Build() {
+    return _version;
+  }
+}

bcf-converter/Builder/Bcf21/VersionBuilderExtensions.cs

@@ -0,0 +1,8 @@
+namespace bcf.Builder.Bcf21;
+
+public partial class VersionBuilder : IVersionBuilderExtension<VersionBuilder> {
+  public VersionBuilder AddDetailedVersion(string version) {
+    _version.DetailedVersion = version;
+    return this;
+  }
+}

bcf-converter/Builder/Bcf30/DocumentBuilder.cs

@@ -0,0 +1,26 @@
+using bcf.bcf30;
+
+namespace bcf.Builder.Bcf30;
+
+public class DocumentBuilder : IDocumentBuilder<DocumentBuilder> {
+  private readonly Document _document = new();
+
+  public DocumentBuilder AddGuid(string guid) {
+    _document.Guid = guid;
+    return this;
+  }
+
+  public DocumentBuilder AddFileName(string name) {
+    _document.Filename = name;
+    return this;
+  }
+
+  public DocumentBuilder AddDescription(string description) {
+    _document.Description = description;
+    return this;
+  }
+
+  public IDocument Build() {
+    return _document;
+  }
+}

bcf-converter/Builder/Bcf30/DocumentInfoBuilder.cs

@@ -0,0 +1,19 @@
+using System;
+using bcf.bcf30;
+
+namespace bcf.Builder.Bcf30;
+
+public class DocumentInfoBuilder : IDocumentInfoBuilder<DocumentInfoBuilder, DocumentBuilder> {
+  private readonly DocumentInfo _documentInfo = new();
+
+  public DocumentInfoBuilder AddDocument(Action<DocumentBuilder> builder) {
+    var document =
+      (Document)BuilderUtils.BuildItem<DocumentBuilder, IDocument>(builder);
+    _documentInfo.Documents.Add(document);
+    return this;
+  }
+
+  public IDocumentInfo Build() {
+    return _documentInfo;
+  }
+}

bcf-converter/Builder/Bcf30/ExtensionsBuilder.cs

@@ -0,0 +1,46 @@
+using bcf.bcf30;
+
+namespace bcf.Builder.Bcf30;
+
+public class ExtensionsBuilder : IExtensionsBuilder<ExtensionsBuilder> {
+  private readonly Extensions _extensions = new();
+
+  public ExtensionsBuilder AddTopicType(string type) {
+    _extensions.TopicTypes.Add(type);
+    return this;
+  }
+
+  public ExtensionsBuilder AddTopicStatus(string status) {
+    _extensions.TopicStatuses.Add(status);
+    return this;
+  }
+
+  public ExtensionsBuilder AddPriority(string priority) {
+    _extensions.Priorities.Add(priority);
+    return this;
+  }
+
+  public ExtensionsBuilder AddTopicLabel(string label) {
+    _extensions.TopicLabels.Add(label);
+    return this;
+  }
+
+  public ExtensionsBuilder AddUser(string user) {
+    _extensions.Users.Add(user);
+    return this;
+  }
+
+  public ExtensionsBuilder AddSnippetType(string type) {
+    _extensions.SnippetTypes.Add(type);
+    return this;
+  }
+
+  public ExtensionsBuilder AddStage(string stage) {
+    _extensions.Stages.Add(stage);
+    return this;
+  }
+
+  public IExtensions Build() {
+    return _extensions;
+  }
+}

bcf-converter/Builder/Bcf30/ProjectBuilder.cs

@@ -0,0 +1,21 @@
+using bcf.bcf30;
+
+namespace bcf.Builder.Bcf30;
+
+public class ProjectBuilder : IProjectBuilder<ProjectBuilder> {
+  private readonly ProjectInfo _project = new();
+
+  public ProjectBuilder AddProjectName(string name) {
+    _project.Project.Name = name;
+    return this;
+  }
+
+  public ProjectBuilder AddProjectId(string id) {
+    _project.Project.ProjectId = id;
+    return this;
+  }
+
+  public IProject Build() {
+    return _project;
+  }
+}

bcf-converter/Builder/Bcf30/VersionBuilder.cs

@@ -0,0 +1,16 @@
+using bcf.bcf30;
+
+namespace bcf.Builder.Bcf30;
+
+public class VersionBuilder : IVersionBuilder<VersionBuilder> {
+  private readonly Version _version = new();
+
+  public VersionBuilder AddVersionId(string id) {
+    _version.VersionId = id;
+    return this;
+  }
+
+  public IVersion Build() {
+    return _version;
+  }
+}

bcf-converter/Builder/IDocumentBuilder.cs

@@ -0,0 +1,7 @@
+namespace bcf.Builder;
+
+public interface IDocumentBuilder<out TBuilder> : IBuilder<IDocument> {
+  TBuilder AddGuid(string guid);
+  TBuilder AddFileName(string name);
+  TBuilder AddDescription(string description);
+}

bcf-converter/Builder/IDocumentInfoBuilder.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace bcf.Builder;
+
+public interface IDocumentInfoBuilder<out TBuilder, out TDocumentBuilder> : IBuilder<IDocumentInfo> {
+  TBuilder AddDocument(Action<TDocumentBuilder> builder);
+}

bcf-converter/Builder/IExtensionsBuilder.cs

@@ -0,0 +1,11 @@
+namespace bcf.Builder;
+
+public interface IExtensionsBuilder<out TBuilder> : IBuilder<IExtensions> {
+  TBuilder AddTopicType(string type);
+  TBuilder AddTopicStatus(string status);
+  TBuilder AddPriority(string priority);
+  TBuilder AddTopicLabel(string label);
+  TBuilder AddUser(string user);
+  TBuilder AddSnippetType(string type);
+  TBuilder AddStage(string stage);
+}

bcf-converter/Builder/IMarkupBuilder.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.ObjectModel;
 
 namespace bcf.Builder;
 
@@ -29,14 +28,10 @@ public interface IMarkupBuilder<
   TBuilder AddDescription(string description);
   TBuilder AddStage(string stage);
   TBuilder AddBimSnippet(Action<TBimSnippetBuilder> builder);
-
   TBuilder
     AddDocumentReference(Action<TDocumentReferenceBuilder> builder);
-
   TBuilder AddComment(Action<TCommentBuilder> builder);
-
   TBuilder AddViewPoint(Action<TViewPointBuilder> viewPointBuilder,
     string snapshot);
-
   TBuilder AddRelatedTopic(string relatedTopicGuid);
 }

bcf-converter/Builder/IProjectBuilder.cs

@@ -0,0 +1,6 @@
+namespace bcf.Builder;
+
+public interface IProjectBuilder<out TBuilder> : IBuilder<IProject> {
+  TBuilder AddProjectName(string name);
+  TBuilder AddProjectId(string id);
+}

bcf-converter/Builder/IVersionBuilder.cs

@@ -0,0 +1,5 @@
+namespace bcf.Builder;
+
+public interface IVersionBuilder<out TBuilder> : IBuilder<IVersion> {
+  TBuilder AddVersionId(string id);
+}

bcf-converter/Converter/Converter21.cs → bcf-converter/Converter/Bcf21/Converter.cs

@@ -1,14 +1,16 @@
+using System.Collections.Concurrent;
 using System.IO;
 using System.Threading.Tasks;
 using bcf.bcf21;
+using bcf.Converter;
 
-namespace bcf.Converter;
+namespace bcf.Converter.Bcf21;
 
 /// <summary>
 ///   Converter strategy class for converting BCF 2.1 files to JSON
 ///   and back.
 /// </summary>
-public class Converter21 : IConverter {
+public class Converter : IConverter {
   /// <summary>
   ///   The method parses the BCF file of version 2.1 and writes into JSON.
   ///   The root of the BCF zip contains the following files:
@@ -27,7 +29,7 @@ public async Task BcfToJson(string source, string target) {
     // Parsing BCF root file structure
     var project = await BcfConverter.ParseProject<ProjectExtension>(source);
     var root = new Root {
-      project = project
+      Project = project
     };
 
     // Parsing topics folder (markups)
@@ -60,9 +62,9 @@ await BcfConverter.WriteBcf<Markup, VisualizationInfo, Root, Version>(
       target, markups, root);
   }
 
-  // public async Task ToBcf(string target, ConcurrentBag<IMarkup> markups) {
-  //   //TODO fill root
-  //   var root = new Root();
-  //   await BcfConverter.WriteBcf<Markup, VisualizationInfo, Root, Version>(target, markups, root);
-  // }
+  public async Task ToBcf(string target, ConcurrentBag<IMarkup> markups) {
+    //TODO fill root
+    var root = new Root();
+    await BcfConverter.WriteBcf<Markup, VisualizationInfo, Root, Version>(target, markups, root);
+  }
 }

bcf-converter/Converter/Converter30.cs → bcf-converter/Converter/Bcf30/Converter.cs

@@ -1,13 +1,14 @@
+using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using bcf.bcf30;
 
-namespace bcf.Converter;
+namespace bcf.Converter.Bcf30;
 
 /// <summary>
 ///   Converter strategy class for converting BCF 3.0 files to JSON
 ///   and back.
 /// </summary>
-public class Converter30 : IConverter {
+public class Converter : IConverter {
   /// <summary>
   ///   The method parses the BCF file of version 3.0 and writes into JSON.
   ///   The root of the BCF zip contains the following files:
@@ -30,9 +31,9 @@ public async Task BcfToJson(string source, string target) {
     var projectInfo = await BcfConverter.ParseProject<ProjectInfo>(source);
     var documentInfo = await BcfConverter.ParseDocuments<DocumentInfo>(source);
     var root = new Root {
-      extensions = extensions,
-      project = projectInfo,
-      document = documentInfo
+      Extensions = extensions,
+      Project = projectInfo,
+      Document = documentInfo
     };
 
     // Parsing topics folder (markups)
@@ -60,4 +61,8 @@ public async Task JsonToBcf(string source, string target) {
     // Writing bcf files
     await BcfConverter.WriteBcf<Markup, VisualizationInfo, Root, Version>(target, markups, root);
   }
+
+  public async Task ToBcf(string target, ConcurrentBag<IMarkup> markups, IRoot root) {
+    await BcfConverter.WriteBcf<Markup, VisualizationInfo, Root, Version>(target, markups, root);
+  }
 }