Skip to content

Commit b1d2bec

Browse files
justcoding121justcoding121
committed
Fix table names
1 parent 1252bcb commit b1d2bec

File tree

13 files changed

+69
-911
lines changed

13 files changed

+69
-911
lines changed

‎.tools/Bible.Alarm.AudioLinksHarvestor/Harvestors/Bible/JwBibleHarvester.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private async Task<Dictionary<string, string>> DiscoverLanguagesFromApi(string p
165165
{
166166
// Use case-insensitive dictionary to avoid duplicates from case differences
167167
var discoveredLanguages = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
168-
var harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&sectionnum=1&fileformat=MP3&alllangs=1&langwritten=E&txtCMSLang=E";
168+
var harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&booknum=1&fileformat=MP3&alllangs=1&langwritten=E&txtCMSLang=E";
169169

170170
var jsonString = await downloadUtility.GetAsync(harvestLink);
171171
using var doc = JsonDocument.Parse(jsonString);
@@ -212,7 +212,7 @@ private async Task<bool> HarvestBibleLinks(string languageCode, string publicati
212212
var sectionNumberTrackMap = new Dictionary<int, Dictionary<int, BiblePublicationTrack>>();
213213

214214
var sectionNumber = 1;
215-
var harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&sectionnum={sectionNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";
215+
var harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&booknum={sectionNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";
216216

217217
while (sectionNumber <= 66)
218218
{
@@ -368,7 +368,7 @@ private static bool TryExtractSectionFileData(JsonElement sectionFile, out strin
368368

369369
track = trackElement.GetInt32();
370370

371-
if (!sectionFile.TryGetProperty("sectionnum", out var sectionNumElement))
371+
if (!sectionFile.TryGetProperty("booknum", out var sectionNumElement))
372372
{
373373
return false;
374374
}
@@ -489,7 +489,7 @@ private static string FormatSectionName(string name, string languageCode, int se
489489
private static void AdvanceToNextSection(ref int sectionNumber, ref string harvestLink, string publicationCode, string languageCode)
490490
{
491491
sectionNumber++;
492-
harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&sectionnum={sectionNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";
492+
harvestLink = $"{AppConstants.ApiEndpoints.JwOrgIndexServiceBaseUrl}?output=json&pub={publicationCode}&booknum={sectionNumber}&fileformat=MP3&alllangs=0&langwritten={languageCode}&txtCMSLang=E";
493493
}
494494

495495
private static void SaveSectionsAndTracks(

‎.tools/Bible.Alarm.DbMigration/Migrations/MediaDbContextModelSnapshot.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
5353
b.ToTable("AudioSourceBaseUrls");
5454
});
5555

56-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublication", b =>
56+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublication", b =>
5757
{
5858
b.Property<int>("Id")
5959
.ValueGeneratedOnAdd()
@@ -87,7 +87,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
8787
b.ToTable("BiblePublications");
8888
});
8989

90-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationSection", b =>
90+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationSection", b =>
9191
{
9292
b.Property<int>("Id")
9393
.ValueGeneratedOnAdd()
@@ -112,7 +112,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
112112
b.ToTable("BiblePublicationSections");
113113
});
114114

115-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationTrack", b =>
115+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationTrack", b =>
116116
{
117117
b.Property<int>("Id")
118118
.ValueGeneratedOnAdd()
@@ -198,7 +198,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
198198

199199
b.HasIndex("DisplayLanguageId");
200200

201-
b.ToTable("MelodyMusics");
201+
b.ToTable("MelodyMusic");
202202
});
203203

204204
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Music.MusicTrack", b =>
@@ -266,7 +266,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
266266
b.HasIndex("Code", "LanguageId")
267267
.IsUnique();
268268

269-
b.ToTable("VocalMusics");
269+
b.ToTable("VocalMusic");
270270
});
271271

272272
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.AudioSource", b =>
@@ -280,7 +280,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
280280
b.Navigation("BaseUrlEntity");
281281
});
282282

283-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublication", b =>
283+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublication", b =>
284284
{
285285
b.HasOne("Bible.Alarm.Shared.Models.Media.Language", "DisplayLanguage")
286286
.WithMany()
@@ -299,9 +299,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
299299
b.Navigation("Language");
300300
});
301301

302-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationSection", b =>
302+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationSection", b =>
303303
{
304-
b.HasOne("Bible.Alarm.Shared.Models.Media.Bible.BiblePublication", "BiblePublication")
304+
b.HasOne("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublication", "BiblePublication")
305305
.WithMany("Sections")
306306
.HasForeignKey("BiblePublicationId")
307307
.OnDelete(DeleteBehavior.Cascade)
@@ -310,15 +310,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
310310
b.Navigation("BiblePublication");
311311
});
312312

313-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationTrack", b =>
313+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationTrack", b =>
314314
{
315-
b.HasOne("Bible.Alarm.Shared.Models.Media.Bible.BiblePublication", "Publication")
315+
b.HasOne("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublication", "Publication")
316316
.WithMany("Tracks")
317317
.HasForeignKey("BiblePublicationId")
318318
.OnDelete(DeleteBehavior.Cascade)
319319
.IsRequired();
320320

321-
b.HasOne("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationSection", "Section")
321+
b.HasOne("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationSection", "Section")
322322
.WithMany("Tracks")
323323
.HasForeignKey("BiblePublicationSectionId");
324324

@@ -380,14 +380,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
380380
b.Navigation("Language");
381381
});
382382

383-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublication", b =>
383+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublication", b =>
384384
{
385385
b.Navigation("Sections");
386386

387387
b.Navigation("Tracks");
388388
});
389389

390-
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.Bible.BiblePublicationSection", b =>
390+
modelBuilder.Entity("Bible.Alarm.Shared.Models.Media.BiblePublications.BiblePublicationSection", b =>
391391
{
392392
b.Navigation("Tracks");
393393
});

‎.tools/Bible.Alarm.DbMigration/Migrations/ScheduleDbContextModelSnapshot.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
7373

7474
b.HasIndex("PublicationCode", "LanguageCode");
7575

76-
b.ToTable("AlarmMusics");
76+
b.ToTable("AlarmMusic");
7777
});
7878

7979
modelBuilder.Entity("Bible.Alarm.Models.Schedule.AlarmNotification", b =>

‎.tools/_index/index.zip‎

-150 KB
Binary file not shown.

0 commit comments

Comments
 (0)