Norwegian tag for crude oil assays and enable english crude for norwe… (#3554)

* Norwegian tag for crude oil assays and enable english crude for norwegian users

* Utm tags on newsletter

Author: padms

web/pages/api/newsletter-rss/groq.global.ts

@@ -1,8 +1,7 @@
-
 import { functions } from '../../../lib/queries/common/functions'
 import { ingressForNewsQuery } from '../../../lib/queries/common/newsSubqueries'
 import { publishDateTimeQuery } from '../../../lib/queries/common/publishDateTime'
-import { noDrafts, sameLang } from '../../../lib/queries/common/langAndDrafts'
+import { sameLang } from '../../../lib/queries/common/langAndDrafts'
 import type { ImageWithCaptionData } from '../../../types'
 import type { PortableTextBlock } from '@portabletext/types'
 
@@ -22,7 +21,7 @@ export type LatestNewsType = {
 
 export const latestNews = /* groq */ `
 ${functions}
-  *[_type == "news" && defined(subscriptionType) && ${sameLang} && ${noDrafts}] | order(${publishDateTimeQuery} desc)[0...5] {
+  *[_type == "news" && ((defined(subscriptionType) && ${sameLang}) || subscriptionType == "Crude")] | order(${publishDateTimeQuery} desc)[0...5] {
     _id,
     "type":_type,
     "slug": slug.current,
@@ -36,7 +35,7 @@ ${functions}
 `
 export const latestMagazine = /* groq */ `
 ${functions}
-  *[_type == "magazine" && shouldDistributeMagazine && ${sameLang} && ${noDrafts}] | order(${publishDateTimeQuery} desc)[0...5] {
+  *[_type == "magazine" && shouldDistributeMagazine && ${sameLang}] | order(${publishDateTimeQuery} desc)[0...5] {
     _id,
     "type":_type,
     "slug": slug.current,

web/pages/api/newsletter-rss/index.global.ts

@@ -13,8 +13,8 @@ const generateRssFeed = async (locale: 'en_GB' | 'nb_NO') => {
   try {
     // Fetch both English and Norwegian articles from news and magazine
     const [newsArticles, magazineArticles] = await Promise.all([
-      sanityClient.fetch(latestNews, { lang: locale }),
-      sanityClient.fetch(latestMagazine, { lang: locale }),
+      sanityClient.fetch(latestNews, { lang: locale }, { perspective: 'published' }),
+      sanityClient.fetch(latestMagazine, { lang: locale }, { perspective: 'published' }),
     ])
 
     // Merge the articles and sort by publish date (newest first)
@@ -72,8 +72,8 @@ const generateRssFeed = async (locale: 'en_GB' | 'nb_NO') => {
       rss += `
         <item>
           <title>${title}</title>
-          <link>https://www.equinor.com${langPath}${article.slug}</link>
-          <guid>https://www.equinor.com${langPath}${article.slug}</guid>
+          <link>https://www.equinor.com${langPath}${article.slug}?utm_source=newssubscription&utm_medium=email</link>
+          <guid>https://www.equinor.com${langPath}${article.slug}?utm_source=newssubscription&utm_medium=email</guid>
           <pubDate>${publishDate}</pubDate>
           <description>${toPlainText(article.ingress)}</description>
           ${categoryTag ? `<category>${mapCategoryToId(categoryTag, locale)}</category>` : '<category />'}

web/pages/api/subscriptionNew.ts

@@ -36,13 +36,13 @@ export const mapCategoryToId = (category: string, locale: 'no' | 'en') => {
   if (locale === 'no') {
     switch (category) {
       case 'generalNews':
-        return 'generelle nyheter' 
+        return 'generelle nyheter'
       case 'Company':
-        return 'generelle nyheter' 
+        return 'generelle nyheter'
       case 'crudeOilAssays':
-        return 'crude oil assays' 
+        return 'crude oil assays (englesk)'
       case 'Crude':
-        return 'crude oil assays'
+        return 'crude oil assays (englesk)'
       case 'magazineStories':
         return 'magasinsaker'
       case 'stockMarketAnnouncements':
@@ -53,7 +53,7 @@ export const mapCategoryToId = (category: string, locale: 'no' | 'en') => {
   } else {
     switch (category) {
       case 'generalNews':
-        return 'general news' 
+        return 'general news'
       case 'Company':
         return 'general news'
       case 'crudeOilAssays':