Skip to content

CG-14844: Graph Source SDK - Journal Id Not Returned #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2025
Merged

CG-14844: Graph Source SDK - Journal Id Not Returned #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6a2db
Serialize api response to response object to return journal id.
jakeminard Sep 11, 2025
c083f76
Rename response object class.
jakeminard Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 55 additions & 7 deletions ...ource.Sdk/Optimizely.Graph.Source.Sdk.Tests/RepositoryTests/GraphSourceRepositoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,62 @@ public async Task SaveContentAsync_SerializesData_AndCallsGraphClient()
var request = new HttpRequestMessage(HttpMethod.Post, $"/api/content/v2/data?id={source}") { Content = content };

mockRestClient.Setup(c => c.SendAsync(It.IsAny<HttpRequestMessage>())).ReturnsAsync(response);
mockRestClient.Setup(c => c.HandleResponse(response));
mockRestClient.Setup(c => c.HandleResponse<ContentV2ApiResponse>(response));

// Act
await repository.SaveContentAsync(generateId: (x) => x.ToString(), exampleData);

// Assert
mockRestClient.Verify(c => c.SendAsync(It.Is<HttpRequestMessage>(x => Compare(request, x))), Times.Once);
mockRestClient.Verify(c => c.HandleResponse(response), Times.Once);
mockRestClient.Verify(c => c.HandleResponse<ContentV2ApiResponse>(response), Times.Once);
mockRestClient.VerifyAll();
}

[TestMethod]
public async Task SaveContentAsync_SerializesData_ReturnsJournalId()
{
// Arrange
repository.ConfigureContentType<ExampleClassObject>()
.Field(x => x.FirstName, IndexingType.Searchable)
.Field(x => x.LastName, IndexingType.Searchable)
.Field(x => x.Age, IndexingType.Queryable)
.Field(x => x.SubType, IndexingType.PropertyType);

repository.ConfigurePropertyType<ExampleClassObject.SubType1>()
.Field(x => x.One, IndexingType.Searchable)
.Field(x => x.Two, IndexingType.Queryable);

var exampleData = new ExampleClassObject
{
FirstName = "First",
LastName = "Last",
Age = 99,
SubType = new ExampleClassObject.SubType1
{
One = "one",
Two = 13
}
};

var expectedJsonString = BuildExpectedContentJsonString(x => x.ToString(), exampleData);

var content = new StringContent(expectedJsonString, Encoding.UTF8, "application/json");

var response = new HttpResponseMessage(HttpStatusCode.OK);
var request = new HttpRequestMessage(HttpMethod.Post, $"/api/content/v2/data?id={source}") { Content = content };

var expectedApiResponse = new ContentV2ApiResponse { JournalId = "stream/id" };

mockRestClient.Setup(c => c.SendAsync(It.IsAny<HttpRequestMessage>())).ReturnsAsync(response);
mockRestClient.Setup(c => c.HandleResponse<ContentV2ApiResponse>(response)).ReturnsAsync(expectedApiResponse);

// Act
var actualJournalId = await repository.SaveContentAsync(generateId: (x) => x.ToString(), exampleData);

// Assert
Assert.AreEqual(expectedApiResponse.JournalId, actualJournalId);
mockRestClient.Verify(c => c.SendAsync(It.Is<HttpRequestMessage>(x => Compare(request, x))), Times.Once);
mockRestClient.Verify(c => c.HandleResponse<ContentV2ApiResponse>(response), Times.Once);
mockRestClient.VerifyAll();
}

Expand Down Expand Up @@ -284,11 +332,11 @@ public async Task SaveContentAsync_WithMultipleTypes_ShouldGenerateJsonForConten
{""index"":{""_id"":""Location-London"",""language_routing"":""en""}}
{""Status$$String"":""Published"",""__typename"":""Location"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Location""],""Language"":{""Name$$String"":""en""},""Longitude$$Float"":0.1275,""Latitude$$Float"":51.5072,""Name$$String___searchable"":""London""}
{""index"":{""_id"":""Event-Future of Project Management"",""language_routing"":""en""}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""Stockholm"",""Time$$DateTime"":""2024-10-21T22:00:00Z"",""Name$$String___searchable"":""Future of Project Management"",""AdditionalInfo"":{""Example1$$String___skip"":""test1"",""Example2$$Int"":1}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""Stockholm"",""Time$$DateTime"":""2024-10-22T04:00:00Z"",""Name$$String___searchable"":""Future of Project Management"",""AdditionalInfo"":{""Example1$$String___skip"":""test1"",""Example2$$Int"":1}}
{""index"":{""_id"":""Event-Week of Hope: Football Camp for Homeless Children in Hanoi!"",""language_routing"":""en""}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""Hanoi"",""Time$$DateTime"":""2024-10-26T22:00:00Z"",""Name$$String___searchable"":""Week of Hope: Football Camp for Homeless Children in Hanoi!"",""AdditionalInfo"":{""Example1$$String___skip"":""test2"",""Example2$$Int"":2}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""Hanoi"",""Time$$DateTime"":""2024-10-27T04:00:00Z"",""Name$$String___searchable"":""Week of Hope: Football Camp for Homeless Children in Hanoi!"",""AdditionalInfo"":{""Example1$$String___skip"":""test2"",""Example2$$Int"":2}}
{""index"":{""_id"":""Event-Optimizing Project Management: Strategies for Success"",""language_routing"":""en""}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""London"",""Time$$DateTime"":""2024-11-02T23:00:00Z"",""Name$$String___searchable"":""Optimizing Project Management: Strategies for Success"",""AdditionalInfo"":{""Example1$$String___skip"":""test3"",""Example2$$Int"":3}}
{""Status$$String"":""Published"",""__typename"":""Event"",""_rbac"":""r:Everyone:Read"",""ContentType$$String"":[""Event""],""Language"":{""Name$$String"":""en""},""LocationName$$String"":""London"",""Time$$DateTime"":""2024-11-03T04:00:00Z"",""Name$$String___searchable"":""Optimizing Project Management: Strategies for Success"",""AdditionalInfo"":{""Example1$$String___skip"":""test3"",""Example2$$Int"":3}}
";

Func<object, string> generateId = (x) =>
Expand All @@ -313,7 +361,7 @@ public async Task SaveContentAsync_WithMultipleTypes_ShouldGenerateJsonForConten
var request = new HttpRequestMessage(HttpMethod.Post, $"/api/content/v2/data?id={source}") { Content = content };

mockRestClient.Setup(c => c.SendAsync(It.IsAny<HttpRequestMessage>())).ReturnsAsync(response);
mockRestClient.Setup(c => c.HandleResponse(response));
mockRestClient.Setup(c => c.HandleResponse<ContentV2ApiResponse>(response));

// Act
await repository.SaveContentAsync<object>(generateId, locationStockholm, locationLondon, event1, event2, event3);
Expand All @@ -322,7 +370,7 @@ public async Task SaveContentAsync_WithMultipleTypes_ShouldGenerateJsonForConten
Assert.AreEqual(expectedJsonString, jsonString);

mockRestClient.Verify(c => c.SendAsync(It.Is<HttpRequestMessage>(x => Compare(request, x))), Times.Once);
mockRestClient.Verify(c => c.HandleResponse(response), Times.Once);
mockRestClient.Verify(c => c.HandleResponse<ContentV2ApiResponse>(response), Times.Once);
mockRestClient.VerifyAll();
}

Expand Down
14 changes: 5 additions & 9 deletions ...mizely.Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/Repositories/GraphSourceRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,11 @@ public async Task<string> SaveContentAsync<T>(Func<T, string> generateId, params
{
var content = CreateContent(generateId, data);

using (var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"{DataUrl}?id={source}"))
{
requestMessage.Content = content;
using (var responseMessage = await client.SendAsync(requestMessage))
{
await client.HandleResponse(responseMessage);
}
}
return string.Empty;
using var requestMessage = new HttpRequestMessage(HttpMethod.Post, $"{DataUrl}?id={source}");
requestMessage.Content = content;
using var responseMessage = await client.SendAsync(requestMessage);
var response = await client.HandleResponse<ContentV2ApiResponse>(responseMessage);
return response?.JournalId ?? string.Empty;
}

public StringContent CreateContent<T>(Func<T, string> generateId, params T[] data)
Expand Down
4 changes: 4 additions & 0 deletions ....Graph.Source.Sdk/Optimizely.Graph.Source.Sdk/Repositories/Models/ContentV2ApiResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
public class ContentV2ApiResponse
{
public string JournalId { get; set; }
}