Ph

.gitignore

@@ -5,4 +5,6 @@ yarn-error.log
 .obsidian
 .gitmodules
 /bin/modules/urls.sh
-*.env
+*.env
+config
+packages/app/.expo

bin/modules/paths.sh

@@ -9,5 +9,6 @@ k8s_path=".k8s"
 delete_account_path="packages/delete-account"
 
 # Optional
+github_config_path=".github"
 flower_path="packages/components/src/optional/Flower"
 custom_components_path="packages/components/src/optional/CustomComponents"

bin/modules/pull.sh

@@ -15,6 +15,7 @@ git submodule add $translations_url $translations_path
 git submodule add $delete_account_url $delete_account_path
 
 # Optional modules
+[ -n "$github_config_url" ] && git submodule add $github_config_url $github_config_path
 [ -n "$flower_url" ] && git submodule add $flower_url $flower_path
 [ -n "$custom_components_url" ] && git submodule add $custom_components_url $custom_components_path
 

bin/modules/urls.sh.dist

@@ -9,4 +9,5 @@ k8s_url="[email protected]:Oky-period-tracker/periodtracker_k8s-whitelabelled.git"
 delete_account_url="[email protected]:Oky-period-tracker/periodtracker_delete_account-whitelabelled.git"
 
 # Optional
+# github_config_url=""
 # flower_url="[email protected]:Oky-period-tracker/periodtracker_flower.git"

generate-content-ts.ts

@@ -0,0 +1,76 @@
+import fs from 'fs'
+
+import {
+  fromAvatarMessages,
+  fromDidYouKnows,
+  fromEncyclopedia,
+  fromHelpCenters,
+  fromQuizzes,
+} from '@oky/core/src'
+import { logger } from './logger'
+
+/* 
+    This is for generating content .ts files via the JSON returned from the cms endpoints
+    Send requests to the endpoints, copy paste the data into the file, ensure the locale value is correct.
+
+    Execute this via the terminal:
+    npx ts-node --transpile-only generate-content-ts.ts
+*/
+
+const locale = 'en'
+
+// /mobile/articles/:locale
+const encyclopediaRaw: any = []
+
+// /mobile/quizzes/:locale
+const quizzesRaw = []
+
+// /mobile/didyouknows/:locale
+const didYouKnowsRaw = []
+
+// /mobile/help-center/:locale
+const helpCentersRaw = []
+
+// /mobile/avatar-messages/:locale
+const avatarMessagesRaw = []
+
+const { articles, categories, subCategories } = fromEncyclopedia({
+  encyclopediaResponse: encyclopediaRaw,
+})
+const { quizzes } = fromQuizzes(quizzesRaw)
+const { didYouKnows } = fromDidYouKnows(didYouKnowsRaw)
+const { helpCenters } = fromHelpCenters(helpCentersRaw)
+const { avatarMessages } = fromAvatarMessages(avatarMessagesRaw)
+
+// /mobile/privacy-policy/:locale
+const privacyPolicy = []
+
+// /mobile//terms-and-conditions/:locale
+const termsAndConditions = []
+
+// /mobile/about/:locale
+const about = []
+
+// /mobile/about-banner/:locale
+const aboutBanner = ''
+
+const fileContent = `
+    export const ${locale} = {
+      locale: '${locale}',
+      categories: ${JSON.stringify(categories)},
+      subCategories: ${JSON.stringify(subCategories)},
+      articles: ${JSON.stringify(articles)},
+      quizzes: ${JSON.stringify(quizzes)},
+      didYouKnows: ${JSON.stringify(didYouKnows)},
+      helpCenters: ${JSON.stringify(helpCenters)},
+      avatarMessages: ${JSON.stringify(avatarMessages)},
+      privacyPolicy: ${JSON.stringify(privacyPolicy)},
+      termsAndConditions: ${JSON.stringify(termsAndConditions)},
+      about: ${JSON.stringify(about)},
+      aboutBanner: '${aboutBanner}',
+    }
+`
+
+fs.writeFileSync(`${locale}.ts`, fileContent)
+
+logger(`Successfully generated file: ${locale}.ts`)

generateSQL.ts

@@ -22,7 +22,7 @@ const columnNames = {
     'lang',
   ],
   did_you_know: ['id', 'title', 'content', 'isAgeRestricted', 'live', 'lang'],
-  help_center: ['id', 'title', 'caption', 'contactOne', 'contactTwo', 'address', 'website', 'lang'],
+  help_center: ['title', 'caption', 'contactOne', 'contactTwo', 'address', 'website', 'lang'],
   avatar_messages: ['id', 'content', 'live', 'lang'],
   privacy_policy: ['json_dump', 'timestamp', 'lang'],
   terms_and_conditions: ['json_dump', 'timestamp', 'lang'],
@@ -204,7 +204,6 @@ const getDidYouKnows = (content: StaticContent) => {
 const getHelpCenters = (content: StaticContent) => {
   return content.helpCenters.map((entry) => {
     return [
-      entry.id,
       entry.title,
       entry.caption,
       entry.contactOne,

packages/api/src/application/oky/OkyUserApplicationService.ts

@@ -51,6 +51,7 @@ export class OkyUserApplicationService {
     accommodationRequirement,
     religion,
     encyclopediaVersion,
+    city,
   }: SignupCommand) {
     const id = preferredId || (await this.okyUserRepository.nextIdentity())
     if (await this.okyUserRepository.byId(id)) {
@@ -79,6 +80,7 @@ export class OkyUserApplicationService {
       accommodationRequirement,
       religion,
       encyclopediaVersion,
+      city,
     })
     return this.okyUserRepository.save(user)
   }
@@ -132,6 +134,12 @@ export class OkyUserApplicationService {
     location,
     gender,
     secretQuestion,
+    genderIdentity,
+    accommodationRequirement,
+    religion,
+    encyclopediaVersion,
+    city,
+    isProfileUpdateSkipped,
   }: EditInfoCommand) {
     const user = await this.okyUserRepository.byId(userId)
     if (!user) {
@@ -144,10 +152,12 @@ export class OkyUserApplicationService {
       location,
       gender,
       secretQuestion,
-      genderIdentity: user.getGenderIdentity(),
-      accommodationRequirement: user.getAccommodationRequirement(),
-      religion: user.getReligion(),
-      encyclopediaVersion: user.getEncyclopediaVersion(),
+      genderIdentity,
+      accommodationRequirement,
+      religion,
+      encyclopediaVersion,
+      city,
+      isProfileUpdateSkipped,
     })
 
     return this.okyUserRepository.save(user)

packages/api/src/application/oky/commands/EditInfoCommand.ts

@@ -5,4 +5,10 @@ export interface EditInfoCommand {
   gender: 'Male' | 'Female' | 'Other'
   location: string
   secretQuestion: string
+  genderIdentity?: string
+  accommodationRequirement?: string
+  religion?: string
+  encyclopediaVersion?: string
+  city?: string
+  isProfileUpdateSkipped?: boolean
 }

packages/api/src/application/oky/commands/SignupCommand.ts

@@ -16,4 +16,5 @@ export interface SignupCommand {
   accommodationRequirement?: string
   religion?: string
   encyclopediaVersion?: string
+  city?: string
 }

packages/api/src/domain/oky/OkyUser.ts

@@ -22,6 +22,8 @@ interface OkyUserProps {
   accommodationRequirement?: string
   religion?: string
   encyclopediaVersion?: string
+  city?: string
+  isProfileUpdateSkipped?: boolean
 }
 
 @Entity()
@@ -41,10 +43,14 @@ export class OkyUser {
   @Column({ name: 'location' })
   private location: string
 
-  @Column({ name: 'country', default: '00', nullable: true })
+  @Column({
+    name: 'country',
+    default: 'PH', // @TODO:PH default kept in submodule?
+    nullable: true,
+  })
   private country: string
 
-  @Column({ name: 'province', default: '0', nullable: true })
+  @Column({ name: 'province', default: '', nullable: true })
   private province: string
 
   @Column((type) => HashedPassword)
@@ -77,6 +83,12 @@ export class OkyUser {
   @Column({ name: 'encyclopediaVersion' })
   private encyclopediaVersion: string
 
+  @Column({ name: 'city', default: '', nullable: true })
+  private city: string
+
+  @Column({ name: 'isProfileUpdateSkipped', default: false, nullable: true })
+  private isProfileUpdateSkipped: boolean
+
   private constructor(props?: OkyUserProps) {
     if (props !== undefined) {
       const {
@@ -94,6 +106,8 @@ export class OkyUser {
         accommodationRequirement,
         religion,
         encyclopediaVersion,
+        city,
+        isProfileUpdateSkipped,
       } = props
 
       this.id = id
@@ -111,6 +125,8 @@ export class OkyUser {
       this.accommodationRequirement = accommodationRequirement
       this.religion = religion
       this.encyclopediaVersion = encyclopediaVersion
+      this.city = city
+      this.isProfileUpdateSkipped = isProfileUpdateSkipped
     }
   }
 
@@ -131,6 +147,7 @@ export class OkyUser {
     accommodationRequirement,
     religion,
     encyclopediaVersion,
+    city,
   }: {
     id: string
     name: string
@@ -149,6 +166,7 @@ export class OkyUser {
     accommodationRequirement?: string
     religion?: string
     encyclopediaVersion?: string
+    city?: string
   }): Promise<OkyUser> {
     if (!id) {
       throw new Error(`The user id must be provided`)
@@ -178,6 +196,7 @@ export class OkyUser {
       accommodationRequirement,
       religion,
       encyclopediaVersion,
+      city,
     })
   }
 
@@ -198,6 +217,8 @@ export class OkyUser {
     accommodationRequirement,
     religion,
     encyclopediaVersion,
+    isProfileUpdateSkipped,
+    city,
   }: {
     name: string
     dateOfBirth: Date
@@ -209,6 +230,8 @@ export class OkyUser {
     accommodationRequirement?: string
     religion?: string
     encyclopediaVersion?: string
+    city?: string
+    isProfileUpdateSkipped?: boolean
   }) {
     if (!name) {
       throw new Error(`The user name must be provided`)
@@ -224,6 +247,8 @@ export class OkyUser {
     this.accommodationRequirement = accommodationRequirement
     this.religion = religion
     this.encyclopediaVersion = encyclopediaVersion
+    this.city = city
+    this.isProfileUpdateSkipped = isProfileUpdateSkipped
   }
 
   public async editSecretAnswer(previousSecretAnswer: string, nextSecretAnswer: string) {
@@ -306,4 +331,12 @@ export class OkyUser {
   public getEncyclopediaVersion() {
     return this.encyclopediaVersion
   }
+
+  public getCity() {
+    return this.city
+  }
+
+  public getIsProfileUpdateSkipped() {
+    return this.isProfileUpdateSkipped
+  }
 }

packages/api/src/interfaces/api/controllers/account/AccountController.ts

@@ -55,6 +55,7 @@ export class AccountController {
       accommodationRequirement,
       religion,
       encyclopediaVersion,
+      city,
     }: SignupRequest,
   ) {
     if (country === null || country === '00') {
@@ -79,6 +80,7 @@ export class AccountController {
       accommodationRequirement,
       religion,
       encyclopediaVersion,
+      city,
     })
 
     return this.signTokenResponse(user)
@@ -149,14 +151,35 @@ export class AccountController {
     @CurrentUser({ required: true }) userId: string,
     @Body() request: EditInfoRequest,
   ) {
-    const { name, gender, dateOfBirth, location, secretQuestion } = request
+    const {
+      name,
+      gender,
+      dateOfBirth,
+      secretQuestion,
+      location,
+      genderIdentity,
+      accommodationRequirement,
+      religion,
+      encyclopediaVersion,
+      city,
+    } = request
+    let isProfileUpdateSkipped = false
+    if (!city) {
+      isProfileUpdateSkipped = true
+    }
     await this.okyUserApplicationService.editInfo({
       userId,
       name,
       gender,
       dateOfBirth: new Date(dateOfBirth),
       location,
       secretQuestion,
+      genderIdentity,
+      accommodationRequirement,
+      religion,
+      encyclopediaVersion,
+      city,
+      isProfileUpdateSkipped,
     })
 
     return { userId }
@@ -201,6 +224,12 @@ export class AccountController {
       secretQuestion: user.getMemorableQuestion(),
       secretAnswer: user.getHashedMemorableAnswer(),
       dateSignedUp: user.getDateSignedUp(),
+      genderIdentity: user.getGenderIdentity(),
+      accommodationRequirement: user.getAccommodationRequirement(),
+      religion: user.getReligion(),
+      encyclopediaVersion: user.getEncyclopediaVersion(),
+      city: user.getCity(),
+      isProfileUpdateSkipped: user.getIsProfileUpdateSkipped(),
     }
 
     const appToken = jwt.sign(userDescriptor, env.app.secret, {

packages/api/src/interfaces/api/controllers/account/requests/EditInfoRequest.ts

@@ -14,6 +14,16 @@ export class EditInfoRequest {
   @IsIn(['Male', 'Female', 'Other'])
   public readonly gender: 'Male' | 'Female' | 'Other'
 
+  public readonly genderIdentity?: string
+
+  public readonly accommodationRequirement?: string
+
+  public readonly religion?: string
+
+  public readonly encyclopediaVersion?: string
+
+  public readonly city?: string
+
   @IsNotEmpty()
   public readonly location: string