Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"tableName": "wishlists",
"schemaId": "770e8400-e29b-41d4-a716-446655440000",
"ownerEnamePath": "users(user.ename)",
"ownedJunctionTables": [],
"localToUniversalMap": {
"title": "title",
"content": "content",
"isActive": "isActive",
"isPublic": "isPublic",
"metadata": "metadata",
"user": "users(user.id),userId",
"createdAt": "createdAt",
"updatedAt": "updatedAt"
}
}
22 changes: 22 additions & 0 deletions platforms/dreamsync-api/src/web3adapter/watchers/subscriber.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,28 @@ export class PostgresSubscriber implements EntitySubscriberInterface {
}
}

// Special handling for Wishlist entities to ensure user relation is loaded
if (tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository("Wishlist");
const fullWishlist = await wishlistRepository.findOne({
where: { id: entity.id },
relations: ["user"]
});

if (fullWishlist && fullWishlist.user) {
enrichedEntity.user = fullWishlist.user;
} else if (entity.userId) {
// Fallback: load user by userId if relation wasn't loaded
const userRepository = AppDataSource.getRepository("User");
const user = await userRepository.findOne({
where: { id: entity.userId }
});
if (user) {
enrichedEntity.user = user;
}
}
}

return this.entityToPlain(enrichedEntity);
} catch (error) {
console.error("Error loading relations:", error);
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { Request, Response } from "express";
import { CalculationService } from "../services/CalculationService";
import { authGuard } from "../middleware/auth";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class CalculationController {
private calculationService: CalculationService;
Expand All@@ -25,16 +27,36 @@ export class CalculationController {
finalTargetType = "self";
}

if (!finalTargetType || !finalTargetId || !finalTargetName || !userValues) {
if (!finalTargetType || !finalTargetId || !finalTargetName) {
return res.status(400).json({ error: "Missing required fields" });
}

// If userValues is empty, check if wishlist exists
if (!userValues || !userValues.trim()) {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1
});

if (wishlists.length === 0 || !wishlists[0].content || !wishlists[0].content.trim()) {
return res.status(400).json({
error: "Either provide values you care about, or ensure you have an active wishlist in dreamSync"
});
}
}

// Create calculation record
// If userValues is empty, pass empty string - service will use wishlist
const calculation = await this.calculationService.createCalculation({
targetType: finalTargetType,
targetId: finalTargetId,
targetName: finalTargetName,
userValues,
userValues: userValues || "",
calculatorId
});

Expand Down
40 changes: 40 additions & 0 deletions platforms/eReputation-api/src/controllers/UserController.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import { Request, Response } from "express";
import { UserService } from "../services/UserService";
import { AppDataSource } from "../database/data-source";
import { Wishlist } from "../database/entities/Wishlist";

export class UserController {
private userService: UserService;
Expand DownExpand Up@@ -137,4 +139,42 @@ export class UserController {
res.status(500).json({ error: "Internal server error" });
}
};

getMyWishlist = async (req: Request, res: Response) => {
try {
if (!req.user) {
return res.status(401).json({ error: "Authentication required" });
}

const wishlistRepository = AppDataSource.getRepository(Wishlist);
const wishlists = await wishlistRepository.find({
where: {
userId: req.user.id,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length === 0) {
return res.json({ wishlist: null });
}

const wishlist = wishlists[0];
res.json({
wishlist: {
id: wishlist.id,
title: wishlist.title,
content: wishlist.content,
isActive: wishlist.isActive,
isPublic: wishlist.isPublic,
createdAt: wishlist.createdAt,
updatedAt: wishlist.updatedAt,
}
});
} catch (error) {
console.error("Error getting user wishlist:", error);
res.status(500).json({ error: "Internal server error" });
}
};
}
72 changes: 70 additions & 2 deletions platforms/eReputation-api/src/controllers/WebhookController.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";
import { Poll } from "../database/entities/Poll";
import { VoteReputationResult } from "../database/entities/VoteReputationResult";
import { Wishlist } from "../database/entities/Wishlist";
import { AppDataSource } from "../database/data-source";
import axios from "axios";

Expand DownExpand Up@@ -302,6 +303,72 @@ export class WebhookController {
});
}
}
} else if (mapping.tableName === "wishlists") {
const wishlistRepository = AppDataSource.getRepository(Wishlist);
const userRepository = AppDataSource.getRepository(User);

// Get userId from user reference
let userId: string | null = null;
if (local.data.user) {
if (typeof local.data.user === "string" && local.data.user.includes("(")) {
userId = local.data.user.split("(")[1].split(")")[0];
} else if (typeof local.data.user === "object" && local.data.user !== null && "id" in local.data.user) {
userId = (local.data.user as { id: string }).id;
}
} else if (local.data.userId) {
userId = local.data.userId as string;
}

if (!userId) {
return res.status(400).send();
}

// Load user relation
const user = await userRepository.findOne({ where: { id: userId } });
if (!user) {
return res.status(400).send();
}

if (localId) {
// Update existing wishlist
const wishlist = await wishlistRepository.findOne({
where: { id: localId },
relations: ["user"]
});

if (wishlist) {
wishlist.title = local.data.title as string;
wishlist.content = local.data.content as string;
wishlist.isActive = local.data.isActive as boolean ?? true;
wishlist.isPublic = local.data.isPublic as boolean ?? false;
wishlist.metadata = local.data.metadata as any;
wishlist.user = user;
wishlist.userId = userId;

await wishlistRepository.save(wishlist);
finalLocalId = wishlist.id;
}
} else {
// Create new wishlist
const wishlist = wishlistRepository.create({
title: local.data.title as string,
content: local.data.content as string,
isActive: local.data.isActive as boolean ?? true,
isPublic: local.data.isPublic as boolean ?? false,
metadata: local.data.metadata as any,
user: user,
userId: userId
});

const savedWishlist = await wishlistRepository.save(wishlist);

this.adapter.addToLockedIds(savedWishlist.id);
await this.adapter.mappingDb.storeMapping({
localId: savedWishlist.id,
globalId: req.body.id,
});
finalLocalId = savedWishlist.id;
}
}

res.status(200).send();
Expand All@@ -315,11 +382,12 @@ export class WebhookController {
if (!poll.groupId) return;

const group = await this.groupService.getGroupById(poll.groupId);
if (!group || !group.charter) return;
if (!group) return;

const charter = (group.charter && group.charter.trim()) ? group.charter : "";
const reputationResults = await this.votingReputationService.calculateGroupMemberReputations(
poll.groupId,
group.charter
charter
);

const voteReputationResult = await this.votingReputationService.saveReputationResults(
Expand Down
3 changes: 2 additions & 1 deletion platforms/eReputation-api/src/database/data-source.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { Vote } from "./entities/Vote";
import { Poll } from "./entities/Poll";
import { VoteReputationResult } from "./entities/VoteReputationResult";
import { Message } from "./entities/Message";
import { Wishlist } from "./entities/Wishlist";
import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";

// Use absolute path for better CLI compatibility
Expand All@@ -20,7 +21,7 @@ export const dataSourceOptions: DataSourceOptions = {
type: "postgres",
url: process.env.EREPUTATION_DATABASE_URL,
synchronize: false, // Auto-sync in development
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message],
entities: [User, Group, Reference, Calculation, Vote, Poll, VoteReputationResult, Message, Wishlist],
migrations: [path.join(__dirname, "migrations", "*.ts")],
logging: process.env.NODE_ENV === "development",
subscribers: [PostgresSubscriber],
Expand Down
4 changes: 4 additions & 0 deletions platforms/eReputation-api/src/database/entities/User.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
} from "typeorm";
import { Vote } from "./Vote";
import { Poll } from "./Poll";
import { Wishlist } from "./Wishlist";

@Entity("users")
export class User {
Expand DownExpand Up@@ -73,4 +74,7 @@ export class User {

@OneToMany(() => Vote, (vote) => vote.user)
votes!: Vote[];

@OneToMany(() => Wishlist, (wishlist) => wishlist.user)
wishlists!: Wishlist[];
}
50 changes: 50 additions & 0 deletions platforms/eReputation-api/src/database/entities/Wishlist.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
import {
Entity,
PrimaryGeneratedColumn,
Column,
CreateDateColumn,
UpdateDateColumn,
ManyToOne,
JoinColumn,
} from "typeorm";
import { User } from "./User";

@Entity("wishlists")
export class Wishlist {
@PrimaryGeneratedColumn("uuid")
id!: string;

@Column({ type: "varchar", length: 255 })
title!: string;

@Column({ type: "text" })
content!: string; // Markdown content

@Column({ type: "boolean", default: true })
isActive!: boolean;

@Column({ type: "boolean", default: false })
isPublic!: boolean;

@Column({ type: "jsonb", nullable: true })
metadata?: {
tags?: string[];
categories?: string[];
lastAnalyzed?: Date;
analysisVersion?: number;
};

@ManyToOne(() => User, (user) => user.wishlists, { onDelete: "CASCADE" })
@JoinColumn({ name: "userId" })
user!: User;

@Column({ type: "uuid" })
userId!: string;

@CreateDateColumn()
createdAt!: Date;

@UpdateDateColumn()
updatedAt!: Date;
}

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763660768132 implements MigrationInterface {
name = 'Migration1763660768132'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`CREATE TABLE "wishlists" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying(255) NOT NULL, "content" text NOT NULL, "isActive" boolean NOT NULL DEFAULT true, "isPublic" boolean NOT NULL DEFAULT false, "metadata" jsonb, "userId" uuid NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_d0a37f2848c5d268d315325f359" PRIMARY KEY ("id"))`);
await queryRunner.query(`ALTER TABLE "wishlists" ADD CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "wishlists" DROP CONSTRAINT "FK_4f3c30555daa6ab0b70a1db772c"`);
await queryRunner.query(`DROP TABLE "wishlists"`);
}

}
1 change: 1 addition & 0 deletions platforms/eReputation-api/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@ app.get("/api/users/me", authGuard, userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/:id", authGuard, userController.getProfileById);
app.patch("/api/users", authGuard, userController.updateProfile);
app.get("/api/users/me/wishlist", authGuard, userController.getMyWishlist);

// Group routes
app.get("/api/groups/search", groupController.search);
Expand Down
24 changes: 23 additions & 1 deletion platforms/eReputation-api/src/services/CalculationService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,16 +2,19 @@ import { Repository } from "typeorm";
import { AppDataSource } from "../database/data-source";
import { Calculation } from "../database/entities/Calculation";
import { Reference } from "../database/entities/Reference";
import { Wishlist } from "../database/entities/Wishlist";
import OpenAI from "openai";

export class CalculationService {
calculationRepository: Repository<Calculation>;
referenceRepository: Repository<Reference>;
wishlistRepository: Repository<Wishlist>;
private openai: OpenAI;

constructor() {
this.calculationRepository = AppDataSource.getRepository(Calculation);
this.referenceRepository = AppDataSource.getRepository(Reference);
this.wishlistRepository = AppDataSource.getRepository(Wishlist);

if (!process.env.OPENAI_API_KEY) {
throw new Error("OPENAI_API_KEY environment variable is required");
Expand DownExpand Up@@ -76,7 +79,26 @@ export class CalculationService {
author: ref.author.ename || ref.author.name || "Anonymous"
}));

const prompt = this.buildPrompt(calculation.userValues, referencesData, calculation.targetName);
// Fetch user's wishlist if userValues is not provided or empty
let effectiveUserValues = calculation.userValues;
if (!effectiveUserValues || !effectiveUserValues.trim()) {
const wishlists = await this.wishlistRepository.find({
where: {
userId: calculation.calculatorId,
isActive: true
},
order: { updatedAt: "DESC" },
take: 1 // Get the most recent active wishlist
});

if (wishlists.length > 0 && wishlists[0].content && wishlists[0].content.trim()) {
effectiveUserValues = wishlists[0].content;
} else {
effectiveUserValues = "General good qualities: integrity, reliability, constructive contributions, respectfulness, and positive interactions.";
}
}

const prompt = this.buildPrompt(effectiveUserValues, referencesData, calculation.targetName);

const response = await this.openai.chat.completions.create({
model: "gpt-4",
Expand Down
Loading