fix(sync): rename contributor fields in data

trigger67 · trigger67 · commit 0ad72ebf7a31 · 2025-03-14T09:55:15.000+01:00
diff --git a/apps/web/src/routes/$lang/_content/courses/$courseId.$chapterName-$chapterId.tsx b/apps/web/src/routes/$lang/_content/courses/$courseId.$chapterName-$chapterId.tsx
@@ -696,7 +696,7 @@ function CourseChapter() {
           isOriginalLanguage={isOriginalLanguage}
           mode="light"
           proofreadingData={{
-            contributors: proofreading.contributorsId,
+            contributors: proofreading.contributorNames,
             reward: proofreading.reward,
           }}
         />
diff --git a/apps/web/src/routes/$lang/_content/courses/$courseId/-components/course-conclusion/conclusion-finish.tsx b/apps/web/src/routes/$lang/_content/courses/$courseId/-components/course-conclusion/conclusion-finish.tsx
@@ -121,18 +121,18 @@ const Credits = ({ course }: { course: JoinedCourseWithAll }) => {
         </h4>
 
         <p className="mt-[15px] md:mt-6 label-large-20px md:display-small-32px text-black">
-          {proofreading?.contributorsId?.length > 0
+          {proofreading?.contributorNames?.length > 0
             ? t('courses.details.hasBeenProofreadBy')
             : t('courses.details.hasNotBeenProofread')}
           <span className="text-darkOrange-5 label-large-20px md:display-small-32px">
             {' '}
-            {proofreading?.contributorsId?.length > 0
-              ? proofreading.contributorsId.map((proofreader, index) => (
+            {proofreading?.contributorNames?.length > 0
+              ? proofreading.contributorNames.map((proofreader, index) => (
                   <React.Fragment key={proofreader}>
                     <span>{proofreader}</span>
-                    {index < proofreading.contributorsId.length - 2
+                    {index < proofreading.contributorNames.length - 2
                       ? ', '
-                      : index === proofreading.contributorsId.length - 2
+                      : index === proofreading.contributorNames.length - 2
                         ? ' & '
                         : ''}
                   </React.Fragment>
@@ -147,7 +147,7 @@ const Credits = ({ course }: { course: JoinedCourseWithAll }) => {
               isOriginalLanguage={isOriginalLanguage}
               mode="light"
               proofreadingData={{
-                contributors: proofreading?.contributorsId || [],
+                contributors: proofreading?.contributorNames || [],
                 reward: proofreading?.reward,
               }}
               standalone
diff --git a/apps/web/src/routes/$lang/_content/resources/books/$bookName-$bookId.tsx b/apps/web/src/routes/$lang/_content/resources/books/$bookName-$bookId.tsx
@@ -120,7 +120,7 @@ function Book() {
               isOriginalLanguage={true}
               mode="dark"
               proofreadingData={{
-                contributors: proofreading.contributorsId,
+                contributors: proofreading.contributorNames,
                 reward: proofreading.reward,
               }}
             />
diff --git a/apps/web/src/routes/$lang/_content/resources/conferences/$conferenceName-$conferenceId.tsx b/apps/web/src/routes/$lang/_content/resources/conferences/$conferenceName-$conferenceId.tsx
@@ -180,7 +180,7 @@ function Conference() {
             <ProofreadingProgress
               mode="dark"
               proofreadingData={{
-                contributors: proofreading.contributorsId,
+                contributors: proofreading.contributorNames,
                 reward: proofreading.reward,
               }}
               isOriginalLanguage={false}
diff --git a/apps/web/src/routes/$lang/_content/resources/glossary/$wordId.tsx b/apps/web/src/routes/$lang/_content/resources/glossary/$wordId.tsx
@@ -108,7 +108,7 @@ function GlossaryWord() {
               isOriginalLanguage={isOriginalLanguage}
               mode="dark"
               proofreadingData={{
-                contributors: proofreading.contributorsId,
+                contributors: proofreading.contributorNames,
                 reward: proofreading.reward,
               }}
             />
diff --git a/apps/web/src/routes/$lang/_content/resources/projects/$projectName-$projectId.tsx b/apps/web/src/routes/$lang/_content/resources/projects/$projectName-$projectId.tsx
@@ -146,7 +146,7 @@ function Project() {
                 isOriginalLanguage={isOriginalLanguage}
                 mode="dark"
                 proofreadingData={{
-                  contributors: proofreading.contributorsId,
+                  contributors: proofreading.contributorNames,
                   reward: proofreading.reward,
                 }}
               />
diff --git a/apps/web/src/routes/$lang/_content/tutorials/$category/$subcategory.$name-$id.tsx b/apps/web/src/routes/$lang/_content/tutorials/$category/$subcategory.$name-$id.tsx
@@ -183,18 +183,18 @@ const Credits = ({
         </h4>
 
         <p className="mt-[15px] md:mt-6 label-large-20px md:display-small-32px text-black">
-          {proofreading?.contributorsId?.length > 0
+          {proofreading?.contributorNames?.length > 0
             ? t('tutorials.hasBeenProofreadBy')
             : t('tutorials.hasNotBeenProofread')}
           <span className="text-darkOrange-5 label-large-20px md:display-small-32px">
             {' '}
-            {proofreading?.contributorsId?.length > 0
-              ? proofreading.contributorsId.map((proofreader, index) => (
+            {proofreading?.contributorNames?.length > 0
+              ? proofreading.contributorNames.map((proofreader, index) => (
                   <React.Fragment key={proofreader}>
                     <span>{proofreader}</span>
-                    {index < proofreading.contributorsId.length - 2
+                    {index < proofreading.contributorNames.length - 2
                       ? ', '
-                      : index === proofreading.contributorsId.length - 2
+                      : index === proofreading.contributorNames.length - 2
                         ? ' & '
                         : ''}
                   </React.Fragment>
@@ -209,7 +209,7 @@ const Credits = ({
               isOriginalLanguage={isOriginalLanguage}
               mode="light"
               proofreadingData={{
-                contributors: proofreading?.contributorsId || [],
+                contributors: proofreading?.contributorNames || [],
                 reward: proofreading?.reward,
               }}
               standalone
@@ -458,7 +458,7 @@ function TutorialDetails() {
               isOriginalLanguage={isOriginalLanguage}
               mode="light"
               proofreadingData={{
-                contributors: proofreading.contributorsId,
+                contributors: proofreading.contributorNames,
                 reward: proofreading.reward,
               }}
             />
diff --git a/packages/schemas/src/content/proofreading.ts b/packages/schemas/src/content/proofreading.ts
@@ -12,6 +12,6 @@ export const proofreadingContributorSchema = createSelectSchema(
 );
 export const joinedProofreadingSchema = proofreadingSchema.merge(
   z.object({
-    contributorsId: z.string().array(),
+    contributorNames: z.string().array(),
   }),
 );
diff --git a/packages/service-content/src/lib/blogs/import/main.ts b/packages/service-content/src/lib/blogs/import/main.ts
@@ -9,7 +9,7 @@ import type { ChangedBlog } from './index.js';
 interface BlogMain {
   id: string;
   date?: string;
-  builder?: string;
+  author?: string;
   tags?: string[];
 }
 
@@ -29,7 +29,7 @@ export const createProcessMainFile = (transaction: TransactionSql) => {
           ${parsedBlog.id},
           ${blog.path},
           ${blog.category},
-          ${parsedBlog.builder},
+          ${parsedBlog.author},
           ${lastUpdated.time},
           ${lastUpdated.commit},
           NOW(),
diff --git a/packages/service-content/src/lib/courses/import/index.ts b/packages/service-content/src/lib/courses/import/index.ts
@@ -495,8 +495,8 @@ export const createUpdateCourses = ({ postgres }: Dependencies) => {
                   RETURNING *;
                 `.then(firstRow);
 
-              if (p.contributors_id) {
-                for (const [index, contrib] of p.contributors_id.entries()) {
+              if (p.contributor_names) {
+                for (const [index, contrib] of p.contributor_names.entries()) {
                   await transaction`INSERT INTO content.contributors (id) VALUES (${contrib}) ON CONFLICT DO NOTHING`;
                   await transaction`
                       INSERT INTO content.proofreading_contributor(proofreading_id, contributor_id, "order")
diff --git a/packages/service-content/src/lib/proofreadings/queries/get-proofreading.ts b/packages/service-content/src/lib/proofreadings/queries/get-proofreading.ts
@@ -44,11 +44,11 @@ export const getProofreadingQuery = ({
       p.last_contribution_date,
       p.urgency,
       p.reward,
-      COALESCE(c.contributors_id, ARRAY[]::text[]) AS contributors_id
+      COALESCE(c.contributor_names, ARRAY[]::text[]) AS contributor_names
     FROM content.proofreading p
 
     LEFT JOIN LATERAL (
-      SELECT COALESCE(ARRAY_AGG(pc.contributor_id), ARRAY[]::text[]) AS contributors_id
+      SELECT COALESCE(ARRAY_AGG(pc.contributor_id), ARRAY[]::text[]) AS contributor_names
       FROM content.proofreading_contributor pc
       WHERE p.id = pc.proofreading_id
     ) c ON TRUE
diff --git a/packages/service-content/src/lib/resources/import/categories/bet.ts b/packages/service-content/src/lib/resources/import/categories/bet.ts
@@ -93,8 +93,8 @@ export const createProcessChangedBet = (
                   RETURNING *;
                 `.then(firstRow);
 
-              if (p.contributors_id) {
-                for (const [index, contrib] of p.contributors_id.entries()) {
+              if (p.contributor_names) {
+                for (const [index, contrib] of p.contributor_names.entries()) {
                   await transaction`INSERT INTO content.contributors (id) VALUES (${contrib}) ON CONFLICT DO NOTHING`;
                   await transaction`
                       INSERT INTO content.proofreading_contributor(proofreading_id, contributor_id, "order")
diff --git a/packages/service-content/src/lib/resources/import/categories/conferences.ts b/packages/service-content/src/lib/resources/import/categories/conferences.ts
@@ -151,8 +151,8 @@ export const createProcessChangedConference = (
                   RETURNING *;
                 `.then(firstRow);
 
-              if (p.contributors_id) {
-                for (const [index, contrib] of p.contributors_id.entries()) {
+              if (p.contributor_names) {
+                for (const [index, contrib] of p.contributor_names.entries()) {
                   await transaction`INSERT INTO content.contributors (id) VALUES (${contrib}) ON CONFLICT DO NOTHING`;
                   await transaction`
                       INSERT INTO content.proofreading_contributor(proofreading_id, contributor_id, "order")
diff --git a/packages/service-content/src/lib/resources/import/categories/glossary.ts b/packages/service-content/src/lib/resources/import/categories/glossary.ts
@@ -75,8 +75,8 @@ export const createProcessChangedGlossaryWord = (
                   RETURNING *;
                 `.then(firstRow);
 
-              if (p.contributors_id) {
-                for (const [index, contrib] of p.contributors_id.entries()) {
+              if (p.contributor_names) {
+                for (const [index, contrib] of p.contributor_names.entries()) {
                   await transaction`INSERT INTO content.contributors (id) VALUES (${contrib}) ON CONFLICT DO NOTHING`;
                   await transaction`
                       INSERT INTO content.proofreading_contributor(proofreading_id, contributor_id, "order")
diff --git a/packages/service-content/src/lib/resources/import/categories/newsletters.ts b/packages/service-content/src/lib/resources/import/categories/newsletters.ts
@@ -14,7 +14,7 @@ interface NewsletterMain {
   link?: Array<{ website?: string }>;
   publication_date: string;
   tags?: string[];
-  contributors?: string[];
+  contributor_names?: string[];
   language?: string;
   description?: string;
 }
@@ -67,7 +67,7 @@ export const createProcessChangedNewsletter = (
               ${parsed.title || ''},
               ${parsed.description || ''},
               ${parsed.tags || []},
-              ${parsed.contributors || []},
+              ${parsed.contributor_names || []},
               ${parsed.language || 'en'}
             )
             ON CONFLICT (resource_id) DO UPDATE SET
diff --git a/packages/service-content/src/lib/resources/import/index.ts b/packages/service-content/src/lib/resources/import/index.ts
@@ -26,7 +26,7 @@ interface ResourceDetails {
 }
 
 export interface BaseResource {
-  contributors?: string[];
+  contributor_names?: string[];
 }
 
 export interface ChangedResource extends ChangedContent {
diff --git a/packages/service-content/src/lib/tutorials/import/main.ts b/packages/service-content/src/lib/tutorials/import/main.ts
@@ -181,8 +181,8 @@ export const createProcessMainFile = (transaction: TransactionSql) => {
           RETURNING *;
         `.then(firstRow);
 
-        if (p.contributors_id) {
-          for (const [index, contrib] of p.contributors_id.entries()) {
+        if (p.contributor_names) {
+          for (const [index, contrib] of p.contributor_names.entries()) {
             await transaction`INSERT INTO content.contributors (id) VALUES (${contrib}) ON CONFLICT DO NOTHING`;
             await transaction`
               INSERT INTO content.proofreading_contributor(proofreading_id, contributor_id, "order")
diff --git a/packages/service-content/src/lib/types.ts b/packages/service-content/src/lib/types.ts
@@ -18,6 +18,6 @@ export interface ProofreadingEntry {
   language: string;
   last_contribution_date: string | null;
   urgency: number;
-  contributors_id?: string[];
+  contributor_names?: string[];
   reward: number;
 }
diff --git a/packages/types/src/generated/content/proofreading.ts b/packages/types/src/generated/content/proofreading.ts
@@ -27,5 +27,5 @@ export interface JoinedProofreading {
   lastContributionDate: Date | null;
   urgency: number | null;
   reward: number | null;
-  contributorsId: string[];
+  contributorNames: string[];
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ interface ResourceDetails {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`export interface BaseResource {`
`29`		`- contributors?: string[];`
	`29`	`+ contributor_names?: string[];`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export interface ChangedResource extends ChangedContent {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ export interface ProofreadingEntry {`
`18`	`18`	`language: string;`
`19`	`19`	`last_contribution_date: string \| null;`
`20`	`20`	`urgency: number;`
`21`		`- contributors_id?: string[];`
	`21`	`+ contributor_names?: string[];`
`22`	`22`	`reward: number;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ export interface JoinedProofreading {`
`27`	`27`	`lastContributionDate: Date \| null;`
`28`	`28`	`urgency: number \| null;`
`29`	`29`	`reward: number \| null;`
`30`		`- contributorsId: string[];`
	`30`	`+ contributorNames: string[];`
`31`	`31`	`}`