Skip to content

Commit 7eab45c

Browse files
committed
Refactor to use MappedService instead of Certification
Updated ProcessFile.cs to deserialize to MappedService and validate JSON schema accordingly. Modified GenerateEmbeddings method to use MappedService data. Removed unused using directives in SkillsMeasured.cs. Added new MappedService class with JSON properties.
1 parent be363ad commit 7eab45c

File tree

3 files changed

+32
-13
lines changed

3 files changed

+32
-13
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using Newtonsoft.Json;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
8+
namespace azure_project_generator
9+
{
10+
internal class MappedService
11+
{
12+
[JsonProperty("certificationCode")]
13+
public string CertificationCode { get; set; }
14+
15+
[JsonProperty("certificationName")]
16+
public string CertificationName { get; set; }
17+
18+
[JsonProperty("skillName")]
19+
public string SkillName { get; set; }
20+
21+
[JsonProperty("topicName")]
22+
public string TopicName { get; set; }
23+
24+
[JsonProperty("serviceName")]
25+
public string ServiceName { get; set; }
26+
}
27+
}

azure-project-generator/ProcessFile.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public async Task Run([BlobTrigger("certdata/{name}", Connection = "AzureWebJobs
8585
// TODO generate embeddings
8686

8787

88-
var certificationData = JsonConvert.DeserializeObject<Certification>(content);
89-
await GenerateEmbeddings(certificationData.CertificationName);
88+
var mappedServiceData = JsonConvert.DeserializeObject<MappedService>(content);
89+
await GenerateEmbeddings(mappedServiceData.CertificationName);
9090

9191

9292

@@ -113,11 +113,8 @@ private async Task GenerateEmbeddings(string content)
113113
}
114114
private void ValidateJsonContent(string content)
115115
{
116-
var generator = new JSchemaGenerator
117-
{
118-
ContractResolver = new CamelCasePropertyNamesContractResolver()
119-
};
120-
JSchema schema = generator.Generate(typeof(Certification));
116+
var generator = new JSchemaGenerator();
117+
JSchema schema = generator.Generate(typeof(MappedService));
121118

122119
JToken jsonContent = JToken.Parse(content);
123120
IList<string> messages;

azure-project-generator/SkillsMeasured.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.ComponentModel.DataAnnotations;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
1+
using System.ComponentModel.DataAnnotations;
72

83
namespace azure_project_generator
94
{

0 commit comments

Comments
 (0)