@yrpri/api 9.0.110 → 9.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.110",
+  "version": "9.0.112",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -12,7 +12,7 @@
     "!ts-out/config/**/*",
     "!ts-out/migrations/oldMigrations/**/*",
     "!ts-out/oldMigrations/**/*",
-    "server.d.ts"
+    "src/server.d.ts"
   ],
   "type": "module",
   "dependencies": {
@@ -96,8 +96,8 @@
   },
   "devDependencies": {
     "@maxmind/geoip2-node": "^6.1.0",
-    "@tsconfig/node18": "^18.2.4",
     "@tsconfig/node22": "^22.0.1",
+    "@types/bcrypt": "^5.0.2",
     "@types/bunyan": "^1.8.11",
     "@types/bunyan-prettystream": "^0.1.35",
     "@types/compression": "^1.7.5",
@@ -134,15 +134,15 @@
   },
   "scripts": {
     "copyInLocalAgents": "cp -R ../../policy-synth/agents/ts-out/* ./node_modules/@policysynth/agents/;cp ../../policy-synth/agents/src/*.d.ts ./node_modules/@policysynth/agents/;",
-    "publish_live": "npm run build:dev;copyfiles './utils/**/*.d.ts' './controllers/**/*.d.ts' './agents/**/*.d.ts' './models/**/*.d.ts' './active-citizen/controllers/**/*.d.ts' './active-citizen/models/**/*.d.ts' 'ts-out/';npm pack && node repack && node publish.js https://registry.npmjs.org/",
+    "publish_live": "npm run build:dev;copyfiles './src/utils/**/*.d.ts' './src/controllers/**/*.d.ts' './src/agents/**/*.d.ts' './src/models/**/*.d.ts' './src/services/controllers/**/*.d.ts' './src/services/models/**/*.d.ts' 'ts-out/';npm pack && node repack && node publish.js https://registry.npmjs.org/",
     "publish_local": "npm run build;npm pack && node repack && node publish.js http://localhost:4873",
     "start": "nodemon -e ts ts-out/server.js",
-    "watch-start": "DEBUG=router:* tsc --project ./ --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",
+    "watch-start": "DEBUG=router:* tsc --project ./src --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",
     "dev": "nodemon --config nodemon.json ./ts-out/server.js",
     "heroku-postbuild": "echo 'Skipping build'",
     "dev:debug": "nodemon --config nodemon.json --inspect-brk api_app.ts",
-    "build": "tsc --project ./ --outDir ./dist && ncp views dist/views && ncp config dist/config && ncp active-citizen/email_templates dist/active-citizen/email_templates && ncp active-citizen/locales dist/active-citizen/locales",
-    "build:dev": "tsc --project ./ --outDir ./ts-out && ncp views ts-out/views && ncp config ts-out/config && ncp active-citizen/email_templates ts-out/active-citizen/email_templates && ncp active-citizen/locales ts-out/active-citizen/locales"
+    "build": "tsc --project ./src --outDir ./dist && ncp src/views dist/views && ncp config dist/config && ncp src/services/email_templates dist/services/email_templates && ncp src/services/locales dist/services/locales",
+    "build:dev": "tsc --project ./src --outDir ./ts-out && ncp src/views ts-out/views && ncp config ts-out/config && ncp src/services/email_templates ts-out/services/email_templates && ncp src/services/locales ts-out/services/locales"
   },
   "cacheDirectories": [
     "node_modules"

package/scripts/cloning/clearUsersForCommunitiesFromUrl.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/cloneWBFromUrlScriptAndCreateLinks.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
 const copyCommunityWithEverything = require('../../utils/copy_utils').copyCommunityWithEverything;
-const updateTranslation = require('../../active-citizen/utils/translation_helpers').updateTranslation;
+const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];
 const userId = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/cloneWBFromUrlScriptNoUsersOrPoints.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
 const copyCommunityNoUsersNoEndorsementsNoPoints = require('../../utils/copy_utils').copyCommunityNoUsersNoEndorsementsNoPoints;
-const updateTranslation = require('../../active-citizen/utils/translation_helpers').updateTranslation;
+const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];
 const userId = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/cloneWBSerbianFromUrlScriptAndCreateLinks.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
 const copyCommunityWithEverything = require('../../utils/copy_utils').copyCommunityWithEverything;
-const updateTranslation = require('../../active-citizen/utils/translation_helpers').updateTranslation;
+const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];
 const userId = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/copyCommunityConfigAndTranslationsFromURL.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/copyGroupConfigAndTranslationsFromURL.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];
 const urlToConfig = process.argv[4];

package/scripts/cloning/copyPostVideosFromURL.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];
 const urlToAddAddFront = process.argv[4];

package/scripts/cloning/deepCloneSerbianWBFromUrlScriptAndCreateLinks.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
 const deepCopyCommunityOnlyStructureWithAdminsAndPosts = require('../../utils/copy_utils').deepCopyCommunityOnlyStructureWithAdminsAndPosts;
-const updateTranslation = require('../../active-citizen/utils/translation_helpers').updateTranslation;
+const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 let domainId = process.argv[2];
 let userId = process.argv[3];
 let urlToConfig = process.argv[4];

package/scripts/cloning/deepCloneWBFromUrlScriptAndCreateLinks.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
 const deepCopyCommunityOnlyStructureWithAdminsAndPosts = require('../../utils/copy_utils').deepCopyCommunityOnlyStructureWithAdminsAndPosts;
-const updateTranslation = require('../../active-citizen/utils/translation_helpers').updateTranslation;
+const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 let domainId = process.argv[2];
 let userId = process.argv[3];
 let urlToConfig = process.argv[4];

package/scripts/cloning/setAdminsFromURL.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];
 const urlToAddAddFront = process.argv[4];

package/scripts/cloning/setExternalIdsFromURL.js

@@ -3,7 +3,7 @@ const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
 const request = require('request');
-const cloneTranslationForConfig = require('../../active-citizen/utils/translation_cloning').cloneTranslationForConfig;
+const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];
 const urlToAddAddFront = process.argv[4];

package/scripts/gallery/refreshAcApiPostIdsForCommunity.js

@@ -1,4 +1,4 @@
-const queue = require('../../active-citizen/workers/queue.cjs');
+const queue = require('../../services/workers/queue.cjs');
 const models = require("../../models/index.cjs");
 (async () => {
     console.log("Start");

package/scripts/importAllLocalesFromLocalFolders.js

@@ -7,7 +7,7 @@ var clientAppImportPath = importFolderPath + '/clientApp/';
 var serverApiImportPath = importFolderPath + '/serverApi/';
 var yourPrioritiesPath = process.argv[3] ? process.argv[3] : '/home/robert/production-your-priorities-app';
 var clientAppLocales = yourPrioritiesPath + '/client_app/locales/';
-var serverApiLocales = yourPrioritiesPath + '/server_api/active-citizen/locales/';
+var serverApiLocales = yourPrioritiesPath + '/server_api/services/locales/';
 async.series([
     (callback) => {
         fs.readdir(clientAppImportPath, function (err, files) {

package/scripts/landUseGame/export3Ddata.js

@@ -1,5 +1,5 @@
 const { post } = require("request");
-const queue = require("../../active-citizen/workers/queue.cjs");
+const queue = require("../../services/workers/queue.cjs");
 const models = require("../../models/index.cjs");
 const fs = require("fs");
 const axios = require("axios");

package/{active-citizen → services}/engine/analytics/importer.js

@@ -2,11 +2,11 @@ const models = require('../../../models/index.cjs');
 const _ = require('lodash');
 const async = require('async');
 const log = require('../../../utils/logger.cjs');
-const importDomain = require('./utils').importDomain;
-const importCommunity = require('./utils').importCommunity;
-const importGroup = require('./utils').importGroup;
-const importPost = require('./utils').importPost;
-const importPoint = require('./utils').importPoint;
+const importDomain = require('./utils.js').importDomain;
+const importCommunity = require('./utils.js').importCommunity;
+const importGroup = require('./utils.js').importGroup;
+const importPost = require('./utils.js').importPost;
+const importPoint = require('./utils.js').importPoint;
 let updateAsyncLimit = 5;
 let lineCrCounter = 0;
 const processDots = () => {

package/{active-citizen → services}/engine/old/exporters/categories_dataset.js

@@ -10,9 +10,9 @@ var classesCategoriesCsvFilename = 'datasets/better_reykjavik/categories/classes
 var categories = {};
 var categoriesIds = [];
 MAX_CATEGORY_LENGTH = 1700;
-var clean = require('./dataset_tools').clean;
-var shuffleArray = require('./dataset_tools').shuffleArray;
-var replaceBetterReykjavikCategoryId = require('./dataset_tools').replaceBetterReykjavikCategoryId;
+var clean = require('./dataset_tools.js').clean;
+var shuffleArray = require('./dataset_tools.js').shuffleArray;
+var replaceBetterReykjavikCategoryId = require('./dataset_tools.js').replaceBetterReykjavikCategoryId;
 async.series([
     function (callback) {
         var categoriesCsvRows = [];

package/{active-citizen → services}/engine/old/exporters/sentiment_dataset.js

@@ -14,8 +14,8 @@ var negative = [];
 var categories = { 0: [], 1: [] };
 var categoriesIds = [0, 1];
 MAX_SENTIMENT_LENGTH = 700;
-var clean = require('./dataset_tools').clean;
-var shuffleArray = require('./dataset_tools').shuffleArray;
+var clean = require('./dataset_tools.js').clean;
+var shuffleArray = require('./dataset_tools.js').shuffleArray;
 async.series([
     function (callback) {
         var categoriesCsvRows = [];

package/{active-citizen → services}/scripts/kue_watch_stuck_jobs.js

@@ -1,7 +1,7 @@
 var kue = require('kue'), url = require('url');
 var log = require('../utils/logger.cjs');
-var email = require('./email');
-var activity = require('./activity');
+var email = require('./email.js');
+var activity = require('./activity.js');
 var toJson = require('../utils/to_json.cjs');
 var airbrake = null;
 if (process.env.AIRBRAKE_PROJECT_ID) {

package/src/models/index.d.ts

@@ -0,0 +1,66 @@
+import type {
+  Sequelize as SequelizeBaseType,
+  Model,
+  ModelStatic,
+} from "sequelize";
+
+// Yp...Data types (e.g., YpAudioData, YpDomainData) are assumed to be globally available
+// due to their declaration in files like 'webApps/client/src/types.d.ts',
+// which should be included in the tsconfig's "types" or "include" arrays.
+
+declare module "models/index.cjs" { // Module path relative to baseUrl ("server_api/src/")
+
+  // --- Reusable Generic Type for Model Instances (local to this module declaration) ---
+  type ModelInstance<TAttributes> = Model<TAttributes, Partial<TAttributes>> & TAttributes;
+
+  // --- Specific Model Instance Types (local to this module declaration) ---
+  // These rely on the globally available Yp...Data interfaces.
+  type AudioInstance = ModelInstance<YpAudioData>;
+  type BulkStatusUpdateInstance = ModelInstance<YpBulkStatusUpdateData>;
+  type CategoryInstance = ModelInstance<YpCategoryData>;
+  type CommunityInstance = ModelInstance<YpCommunityData>;
+  type DomainInstance = ModelInstance<YpDomainData>;
+  type EndorsementInstance = ModelInstance<YpEndorsement>;
+  type GroupInstance = ModelInstance<YpGroupData>;
+  type ImageInstance = ModelInstance<YpImageData>;
+  type PageInstance = ModelInstance<YpHelpPageData>; // Assuming YpHelpPageData for page.cjs
+  type PointInstance = ModelInstance<YpPointData>;
+  type PointQualityInstance = ModelInstance<YpPointQuality>;
+  type PointRevisionInstance = ModelInstance<YpPointRevision>;
+  type PostInstance = ModelInstance<YpPostData>;
+  type PostStatusChangeInstance = ModelInstance<YpPostStatusChange>;
+  type OrganizationInstance = ModelInstance<YpOrganizationData>;
+  type RatingInstance = ModelInstance<YpRatingData>;
+  type UserInstance = ModelInstance<YpUserData>;
+  type VideoInstance = ModelInstance<YpVideoData>;
+  // Add other specific instance types if new models are included
+
+  // --- Interface for the Exported DB Object (local to this module declaration) ---
+  interface DeclaredYpModels {
+    sequelize: SequelizeBaseType;
+    Sequelize: typeof SequelizeBaseType;
+
+    Audio: ModelStatic<AudioInstance>;
+    BulkStatusUpdate: ModelStatic<BulkStatusUpdateInstance>;
+    Category: ModelStatic<CategoryInstance>;
+    Community: ModelStatic<CommunityInstance>;
+    Domain: ModelStatic<DomainInstance>;
+    Endorsement: ModelStatic<EndorsementInstance>;
+    Group: ModelStatic<GroupInstance>;
+    Image: ModelStatic<ImageInstance>;
+    Page: ModelStatic<PageInstance>;
+    Point: ModelStatic<PointInstance>;
+    PointQuality: ModelStatic<PointQualityInstance>;
+    PointRevision: ModelStatic<PointRevisionInstance>;
+    Post: ModelStatic<PostInstance>;
+    PostStatusChange: ModelStatic<PostStatusChangeInstance>;
+    Organization: ModelStatic<OrganizationInstance>;
+    Rating: ModelStatic<RatingInstance>;
+    User: ModelStatic<UserInstance>;
+    Video: ModelStatic<VideoInstance>;
+    // Add other ModelStatic types as new models are included
+  }
+
+  const models: DeclaredYpModels;
+  export default models; // This makes `DeclaredYpModels` the type of the default import.
+}

package/src/server.d.ts

@@ -0,0 +1,104 @@
+declare module 'logger';
+declare module 'iso-639-1';
+declare module 'newrelic';
+declare module 'html-to-docx';
+
+interface Logger {
+  debug(text: string): void;
+  info(text: string): void;
+  warn(text: string): void;
+  error(text: string): void;
+}
+
+interface Models {
+  [key: string]: typeof DbData; // Assuming all models extend DbData
+  Post?: typeof PostData;
+  Domain?: typeof DomainData;
+  User?: typeof UserData;
+}
+
+interface DbData extends Model {
+  created_at: string;
+  updated_at: string;
+  id: number;
+  static findOne(options: any): Promise<any>;
+  static findAll(options: any): Promise<any>;
+  static destroy(options: any): Promise<any>;
+  static update(options: any, data: any): Promise<any>;
+  static create(options: any): Promise<any>;
+  static count(options: any | undefined = undefined): Promise<any>;
+  static build(options: any): Promise<any>;
+  save(): Promise<any>;
+  set(col: string, value: any): void;
+}
+
+interface DomainClass extends DbData {
+  configuration: {
+    ltp?: {
+      crt?: LtpCurrentRealityTreeData
+    }
+  };
+}
+
+interface CommunityClass extends DbData {
+  Domain: DomainClass;
+}
+
+interface PostClass extends DbData {
+  data?: {
+    crt?: LtpCurrentRealityTreeData
+  };
+}
+
+interface GroupClass extends DbData {
+  description: string;
+  configuration: YpGroupConfiguration;
+  hasGroupAdmins(user: UserClass): Promise<boolean>;
+  addGroupAdmins(user: UserClass): Promise<void>;
+  hasGroupUsers(user: UserClass): Promise<boolean>;
+  addGroupUsers(user: UserClass): Promise<void>;
+  changed(field: string, value: any): void;
+
+}
+
+interface UserClass extends DbData {
+  email: string;
+  name: string;
+  new (): Promise<UserClass>;
+}
+
+
+interface AcBackgroundJobClass extends DbData {
+  static updateDataAsync(jobId: number, data: any): Promise<any>;
+  static updateErrorAsync(jobId: number, error: string): Promise<any>;
+  static createJob(data: any, dataTwo: any, done: Function): Promise<any>;
+}
+
+interface AcXlsExportJobData {
+  jobId: number;
+  userId: number;
+  exportType: string;
+  fileName: string;
+  utmSource: string;
+  questionId: number;
+}
+
+interface ImageClass extends DbData {
+  formats: string[];
+}
+
+type YpChatBotMemoryStageTypes = PsMemoryStageTypes | "chatbot-conversation";
+
+interface PsChatBotMemoryData extends PsBaseMemoryData {
+  stages: Record<any, any>;
+  chatLog?: YpSimpleChatLog[];
+  problemStatement?: PsProblemStatement;
+  currentStage: YpChatBotMemoryStageTypes;
+  groupId?: number;
+  communityId?: number;
+  domainId?: number;
+  totalCost?: number;
+  customInstructions?: object,
+  subProblems?: IEngineSubProblem[],
+  currentStageData?: undefined;
+}

package/src/services/controllers/activities.d.ts

@@ -0,0 +1,5 @@
+declare module '@yrpri/api/services/controllers/activities.cjs' {
+  import { Router } from 'express';
+  const router: Router;
+  export default router;
+}

package/src/services/controllers/notifications.d.ts

@@ -0,0 +1,5 @@
+declare module '@yrpri/api/services/controllers/notifications.cjs' {
+  import { Router } from 'express';
+  const router: Router;
+  export default router;
+}

package/utils/copy_utils.cjs

@@ -1,10 +1,10 @@
 "use strict";
 var models = require("../models/index.cjs");
 var async = require("async");
-const { cloneTranslationForGroup, } = require("../active-citizen/utils/translation_cloning.cjs");
-const { cloneTranslationForCommunity, } = require("../active-citizen/utils/translation_cloning.cjs");
-const { cloneTranslationForPoint, } = require("../active-citizen/utils/translation_cloning.cjs");
-const { cloneTranslationForPost, } = require("../active-citizen/utils/translation_cloning.cjs");
+const { cloneTranslationForGroup, } = require("../services/utils/translation_cloning.cjs");
+const { cloneTranslationForCommunity, } = require("../services/utils/translation_cloning.cjs");
+const { cloneTranslationForPoint, } = require("../services/utils/translation_cloning.cjs");
+const { cloneTranslationForPost, } = require("../services/utils/translation_cloning.cjs");
 const { recountCommunity } = require("./recount_utils.cjs");
 const clonePagesForCollection = (model, modelRelField, inCollection, outCollection, done) => {
     const oldToNewHash = {};