Skip to content
Snippets Groups Projects
Commit 2781338c authored by Cédric Moreau's avatar Cédric Moreau
Browse files

[enh] Abstract queries in a finder

parent 1d301083
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 65 additions and 21 deletions
routes/willMembers2.ts
+ 65
− 21
View file @ 2781338c
import {Server} from 'duniter/server' import {Server} from 'duniter/server'
import {DBMembership} from 'duniter/app/lib/dal/sqliteDAL/MembershipDAL' import {DBMembership} from 'duniter/app/lib/dal/sqliteDAL/MembershipDAL'
import {DBIdentity} from 'duniter/app/lib/dal/sqliteDAL/IdentityDAL'
const constants = require(__dirname + '/../lib/constants') const constants = require(__dirname + '/../lib/constants')
const timestampToDatetime = require(__dirname + '/../lib/timestampToDatetime') const timestampToDatetime = require(__dirname + '/../lib/timestampToDatetime')
...@@ -24,10 +25,11 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -24,10 +25,11 @@ module.exports = async (req: any, res: any, next: any) => {
const locals: { duniterServer: Server } = req.app.locals const locals: { duniterServer: Server } = req.app.locals
const duniterServer = locals.duniterServer const duniterServer = locals.duniterServer
const dataFinder = new DataFinder(duniterServer)
try { try {
// get blockchain timestamp // get blockchain timestamp
let resultQueryCurrentBlock = await duniterServer.dal.peerDAL.query('SELECT `medianTime`,`number`,`hash`,`membersCount` FROM block ORDER BY `medianTime` DESC LIMIT 1 '); let resultQueryCurrentBlock = await dataFinder.getCurrentBlockOrNull();
const currentBlockchainTimestamp = resultQueryCurrentBlock[0].medianTime; const currentBlockchainTimestamp = resultQueryCurrentBlock[0].medianTime;
const currentMembersCount = resultQueryCurrentBlock[0].membersCount; const currentMembersCount = resultQueryCurrentBlock[0].membersCount;
const currentBlockNumber = resultQueryCurrentBlock[0].number; const currentBlockNumber = resultQueryCurrentBlock[0].number;
...@@ -85,7 +87,7 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -85,7 +87,7 @@ module.exports = async (req: any, res: any, next: any) => {
sentries = wotbInstance.getSentries(dSen); sentries = wotbInstance.getSentries(dSen);
// Récupérer la liste des identités en piscine // Récupérer la liste des identités en piscine
const resultQueryIdtys = await duniterServer.dal.peerDAL.query('SELECT `buid`,`pubkey`,`uid`,`hash`,`expires_on`,`revocation_sig` FROM identities_pending WHERE `member`=0'); const resultQueryIdtys: DBIdentity[] = await dataFinder.findPendingMembers()
// Récupérer pour chaque identité, l'ensemble des certifications qu'elle à reçue. // Récupérer pour chaque identité, l'ensemble des certifications qu'elle à reçue.
for (let i=0;i<resultQueryIdtys.length;i++) for (let i=0;i<resultQueryIdtys.length;i++)
...@@ -95,12 +97,10 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -95,12 +97,10 @@ module.exports = async (req: any, res: any, next: any) => {
let idtyBlockNumber = idtyBlockStamp[0]; let idtyBlockNumber = idtyBlockStamp[0];
// récupérer le medianTime et le hash du bloc d'émission de l'identité // récupérer le medianTime et le hash du bloc d'émission de l'identité
let idtyEmittedBlock = await duniterServer.dal.peerDAL.query('SELECT `medianTime`,`hash` FROM block WHERE `number`=\''+idtyBlockNumber+'\' AND fork=0 LIMIT 1'); let idtyEmittedBlock = await dataFinder.getBlockMedianTimeAndHash(idtyBlockNumber);
// Récupérer l'identifiant wotex de l'identité (en cas d'identité multiple) // Récupérer l'identifiant wotex de l'identité (en cas d'identité multiple)
let idties = await duniterServer.dal.idtyDAL.query('' + let idties = await dataFinder.getWotexInfos(resultQueryIdtys[i].uid);
'SELECT hash, uid, pub, wotb_id FROM i_index WHERE uid = ? ' +
'UNION ALL ' + 'SELECT hash, uid, pubkey as pub, (SELECT NULL) AS wotb_id FROM idty WHERE uid = ?', [resultQueryIdtys[i].uid, resultQueryIdtys[i].uid]);
let wotexId = ''; let wotexId = '';
if (idties.length > 1) if (idties.length > 1)
{ {
...@@ -126,13 +126,13 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -126,13 +126,13 @@ module.exports = async (req: any, res: any, next: any) => {
// Stocker les informations de l'identité // Stocker les informations de l'identité
identitiesList.push({ identitiesList.push({
BlockNumber: idtyBlockNumber, BlockNumber: parseInt(idtyBlockNumber),
creationTimestamp: (typeof(idtyEmittedBlock[0]) == 'undefined' ) ? currentBlockchainTimestamp:idtyEmittedBlock[0].medianTime, creationTimestamp: (typeof(idtyEmittedBlock[0]) == 'undefined' ) ? currentBlockchainTimestamp:idtyEmittedBlock[0].medianTime,
pubkey: resultQueryIdtys[i].pubkey, pubkey: resultQueryIdtys[i].pubkey,
uid: resultQueryIdtys[i].uid, uid: resultQueryIdtys[i].uid,
hash: resultQueryIdtys[i].hash, hash: resultQueryIdtys[i].hash,
wotexId: wotexId, wotexId: wotexId,
expires_on: (resultQueryIdtys[i].expires_on=="") ? 0:resultQueryIdtys[i].expires_on, expires_on: resultQueryIdtys[i].expires_on || 0,
nbCert: 0, nbCert: 0,
nbValidPendingCert: 0, nbValidPendingCert: 0,
registrationAvailability: 0, registrationAvailability: 0,
...@@ -142,18 +142,17 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -142,18 +142,17 @@ module.exports = async (req: any, res: any, next: any) => {
idtysPendingCertifsList.push([]) idtysPendingCertifsList.push([])
// récupérer l'ensemble des certifications en attente destinées à l'identité courante // récupérer l'ensemble des certifications en attente destinées à l'identité courante
let tmpQueryPendingCertifsList = await duniterServer.dal.peerDAL.query( let tmpQueryPendingCertifsList = await dataFinder.findPendingCertsToTarget(resultQueryIdtys[i].pubkey, resultQueryIdtys[i].hash);
'SELECT `from`,`block_number`,`block_hash`,`expires_on` FROM certifications_pending WHERE `to`=\''+resultQueryIdtys[i].pubkey+'\' AND `target`=\''+resultQueryIdtys[i].hash+'\' ORDER BY `expires_on` DESC');
// Récupérer les uid des émetteurs des certifications reçus par l'utilisateur // Récupérer les uid des émetteurs des certifications reçus par l'utilisateur
// Et stocker les uid et dates d'expiration dans un tableau // Et stocker les uid et dates d'expiration dans un tableau
for (let j=0;j<tmpQueryPendingCertifsList.length;j++) for (let j=0;j<tmpQueryPendingCertifsList.length;j++)
{ {
// Récupérer le medianTime et le hash du bloc d'émission de la certification // Récupérer le medianTime et le hash du bloc d'émission de la certification
let emittedBlock = await duniterServer.dal.peerDAL.query('SELECT `hash`,`medianTime` FROM block WHERE `number`=\''+tmpQueryPendingCertifsList[j].block_number+'\' AND `fork`=0 LIMIT 1'); let emittedBlock = await dataFinder.getBlockMedianTimeAndHash2(tmpQueryPendingCertifsList[j].block_number)
// Vérifier que l'émetteur de la certification correspond à une identité inscrite en blockchain // Vérifier que l'émetteur de la certification correspond à une identité inscrite en blockchain
let tmpQueryGetUidIssuerPendingCert = await duniterServer.dal.peerDAL.query('SELECT `uid` FROM i_index WHERE `pub`=\''+tmpQueryPendingCertifsList[j].from+'\' LIMIT 1'); let tmpQueryGetUidIssuerPendingCert = await dataFinder.getUidByFrom(tmpQueryPendingCertifsList[j].from)
if ( tmpQueryGetUidIssuerPendingCert.length > 0 ) if ( tmpQueryGetUidIssuerPendingCert.length > 0 )
{ {
// Récupérer la pubkey de l'émetteur // Récupérer la pubkey de l'émetteur
...@@ -163,7 +162,7 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -163,7 +162,7 @@ module.exports = async (req: any, res: any, next: any) => {
let wotb_id = 0; let wotb_id = 0;
if (typeof(wotbIdIndex[issuerPubkey]) == 'undefined') if (typeof(wotbIdIndex[issuerPubkey]) == 'undefined')
{ {
wotb_id = (await duniterServer.dal.iindexDAL.query('SELECT wotb_id FROM i_index WHERE pub = ? AND wotb_id IS NOT NULL', [issuerPubkey]))[0].wotb_id; wotb_id = await dataFinder.getWotbIdByIssuerPubkey(issuerPubkey)
wotbIdIndex[issuerPubkey] = wotb_id; wotbIdIndex[issuerPubkey] = wotb_id;
} }
else { wotb_id = wotbIdIndex[issuerPubkey]; } else { wotb_id = wotbIdIndex[issuerPubkey]; }
...@@ -191,7 +190,7 @@ module.exports = async (req: any, res: any, next: any) => { ...@@ -191,7 +190,7 @@ module.exports = async (req: any, res: any, next: any) => {
{ validBlockStamp = true; } { validBlockStamp = true; }
// récupérer le timestamp d'enchainement de la dernière certification écrite par l'émetteur // récupérer le timestamp d'enchainement de la dernière certification écrite par l'émetteur
let tmpQueryLastIssuerCert = await duniterServer.dal.peerDAL.query('SELECT `chainable_on` FROM c_index WHERE `issuer`=\''+issuerPubkey+'\' ORDER BY `chainable_on` DESC LIMIT 1'); let tmpQueryLastIssuerCert = await dataFinder.getChainableOnByIssuerPubkey(issuerPubkey)
let certTimestampWritable = 0; let certTimestampWritable = 0;
if ( typeof(tmpQueryLastIssuerCert[0]) != 'undefined' && typeof(tmpQueryLastIssuerCert[0].chainable_on) != 'undefined' ) if ( typeof(tmpQueryLastIssuerCert[0]) != 'undefined' && typeof(tmpQueryLastIssuerCert[0].chainable_on) != 'undefined' )
{ certTimestampWritable = tmpQueryLastIssuerCert[0].chainable_on; } { certTimestampWritable = tmpQueryLastIssuerCert[0].chainable_on; }
...@@ -562,3 +561,48 @@ interface WillMemberIdentity { ...@@ -562,3 +561,48 @@ interface WillMemberIdentity {
interface WillMemberIdentityWithPendingCerts extends WillMemberIdentity { interface WillMemberIdentityWithPendingCerts extends WillMemberIdentity {
pendingCertifications: PendingCert[] pendingCertifications: PendingCert[]
} }
class DataFinder {
constructor(protected duniterServer: Server) {
}
findPendingMembers() {
return this.duniterServer.dal.peerDAL.query('SELECT `buid`,`pubkey`,`uid`,`hash`,`expires_on`,`revocation_sig` FROM identities_pending WHERE `member`=0')
}
findPendingCertsToTarget(toPubkey: string, hash: string) {
return this.duniterServer.dal.peerDAL.query(
'SELECT `from`,`block_number`,`block_hash`,`expires_on` FROM certifications_pending WHERE `to`=\''+toPubkey+'\' AND `target`=\''+hash+'\' ORDER BY `expires_on` DESC')
}
getBlockMedianTimeAndHash(idtyBlockNumber: string) {
return this.duniterServer.dal.peerDAL.query('SELECT `medianTime`,`hash` FROM block WHERE `number`=\''+idtyBlockNumber+'\' AND fork=0 LIMIT 1')
}
getWotexInfos(uid: string) {
return this.duniterServer.dal.idtyDAL.query('' +
'SELECT hash, uid, pub, wotb_id FROM i_index WHERE uid = ? ' +
'UNION ALL ' + 'SELECT hash, uid, pubkey as pub, (SELECT NULL) AS wotb_id FROM idty WHERE uid = ?', [uid, uid])
}
getBlockMedianTimeAndHash2(block_number: number) {
return this.duniterServer.dal.peerDAL.query('SELECT `hash`,`medianTime` FROM block WHERE `number`=\''+block_number+'\' AND `fork`=0 LIMIT 1')
}
getUidByFrom(from: string) {
return this.duniterServer.dal.peerDAL.query('SELECT `uid` FROM i_index WHERE `pub`=\''+from+'\' LIMIT 1')
}
async getWotbIdByIssuerPubkey(issuerPubkey: string) {
return (await this.duniterServer.dal.iindexDAL.query('SELECT wotb_id FROM i_index WHERE pub = ? AND wotb_id IS NOT NULL', [issuerPubkey]))[0].wotb_id
}
getChainableOnByIssuerPubkey(issuerPubkey: string) {
return this.duniterServer.dal.peerDAL.query('SELECT `chainable_on` FROM c_index WHERE `issuer`=\''+issuerPubkey+'\' ORDER BY `chainable_on` DESC LIMIT 1')
}
getCurrentBlockOrNull() {
return this.duniterServer.dal.peerDAL.query('SELECT `medianTime`,`number`,`hash`,`membersCount` FROM block ORDER BY `medianTime` DESC LIMIT 1 ')
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment