PeL/force-orange-2022
PeL/force-orange-2022
1
1
Fork 0
mirror of https://github.com/Paris-est-Ludique/intranet.git synced 2025-06-09 00:54:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makes all gSheet calls sequential

Browse Source
This commit is contained in:
forceoranj 2021-11-16 16:33:01 +01:00
parent bf62510d0a
commit db3dba7a40
2 changed files with 142 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
src/gsheets/accessors.ts
View File

@ -3,6 +3,10 @@ import _ from "lodash"
import { promises as fs } from "fs" import { promises as fs } from "fs"
import { GoogleSpreadsheet, GoogleSpreadsheetWorksheet } from "google-spreadsheet" import { GoogleSpreadsheet, GoogleSpreadsheetWorksheet } from "google-spreadsheet"
import sequentialDBOperations from "./sequentialDBOperations"
const addDBOperation = sequentialDBOperations()
const SCOPES = ["https://www.googleapis.com/auth/spreadsheets"] const SCOPES = ["https://www.googleapis.com/auth/spreadsheets"]
const CRED_PATH = path.resolve(process.cwd(), "access/gsheets.json") const CRED_PATH = path.resolve(process.cwd(), "access/gsheets.json")
@ -13,28 +17,30 @@ export async function listGet<Element extends ElementWithId>(
specimen: Element specimen: Element
): Promise<Element[]> { ): Promise<Element[]> {
type StringifiedElement = Record<keyof Element, string> type StringifiedElement = Record<keyof Element, string>
const sheet = await getGSheet(sheetName) return addDBOperation(async () => {
const sheet = await getGSheet(sheetName)
// Load sheet into an array of objects // Load sheet into an array of objects
const rows = (await sheet.getRows()) as StringifiedElement[] const rows = (await sheet.getRows()) as StringifiedElement[]
const elements: Element[] = [] const elements: Element[] = []
if (!rows[0]) { if (!rows[0]) {
throw new Error(`No column types defined in sheet ${sheetName}`) throw new Error(`No column types defined in sheet ${sheetName}`)
}
const types = _.pick(rows[0], Object.keys(specimen)) as Record<keyof Element, string>
rows.shift()
rows.forEach((row) => {
const stringifiedElement = _.pick(row, Object.keys(specimen)) as Record<
keyof Element,
string
>
const element = parseElement<Element>(stringifiedElement, types, specimen)
if (element !== undefined) {
elements.push(element)
} }
}) const types = _.pick(rows[0], Object.keys(specimen)) as Record<keyof Element, string>
rows.shift()
rows.forEach((row) => {
const stringifiedElement = _.pick(row, Object.keys(specimen)) as Record<
keyof Element,
string
>
const element = parseElement<Element>(stringifiedElement, types, specimen)
if (element !== undefined) {
elements.push(element)
}
})
return elements return elements
})
} }
export async function get<Element extends ElementWithId>( export async function get<Element extends ElementWithId>(
@ -42,6 +48,7 @@ export async function get<Element extends ElementWithId>(
membreId: number, membreId: number,
specimen: Element specimen: Element
): Promise<Element | undefined> { ): Promise<Element | undefined> {
// No need to addDBOperation here, since listGet does it already
const list = await listGet<Element>(sheetName, specimen) const list = await listGet<Element>(sheetName, specimen)
return list.find((element) => element.id === membreId) return list.find((element) => element.id === membreId)
} }
@ -50,52 +57,57 @@ export async function setList<Element extends ElementWithId>(
sheetName: string, sheetName: string,
elements: Element[] elements: Element[]
): Promise<true | undefined> { ): Promise<true | undefined> {
const sheet = await getGSheet(sheetName) return addDBOperation(async () => {
const sheet = await getGSheet(sheetName)
// Load sheet into an array of objects // Load sheet into an array of objects
const rows = await sheet.getRows() const rows = await sheet.getRows()
if (!rows[0]) { if (!rows[0]) {
throw new Error(`No column types defined in sheet ${sheetName}`) throw new Error(`No column types defined in sheet ${sheetName}`)
} }
const types = _.pick(rows[0], Object.keys(elements[0] || {})) as Record<keyof Element, string> const types = _.pick(rows[0], Object.keys(elements[0] || {})) as Record<
keyof Element,
string
>
// Update received rows // Update received rows
let rowid = 1 let rowid = 1
// eslint-disable-next-line no-restricted-syntax // eslint-disable-next-line no-restricted-syntax
for (const element of elements) { for (const element of elements) {
const row = rows[rowid] const row = rows[rowid]
const stringifiedRow = stringifyElement(element, types) const stringifiedRow = stringifyElement(element, types)
if (!row) { if (!row) {
// eslint-disable-next-line no-await-in-loop
await sheet.addRow(stringifiedRow)
} else {
const keys = Object.keys(stringifiedRow)
const sameCells = _.every(
keys,
(key: keyof Element) => row[key as string] === stringifiedRow[key]
)
if (!sameCells) {
keys.forEach((key) => {
row[key] = stringifiedRow[key as keyof Element]
})
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await row.save() await sheet.addRow(stringifiedRow)
} else {
const keys = Object.keys(stringifiedRow)
const sameCells = _.every(
keys,
(key: keyof Element) => row[key as string] === stringifiedRow[key]
)
if (!sameCells) {
keys.forEach((key) => {
row[key] = stringifiedRow[key as keyof Element]
})
// eslint-disable-next-line no-await-in-loop
await row.save()
}
}
rowid += 1
}
// Delete all following rows
for (let rowToDelete = sheet.rowCount - 1; rowToDelete >= rowid; rowToDelete -= 1) {
if (rows[rowToDelete]) {
// eslint-disable-next-line no-await-in-loop
await rows[rowToDelete].delete()
} }
} }
rowid += 1 return true
} })
// Delete all following rows
for (let rowToDelete = sheet.rowCount - 1; rowToDelete >= rowid; rowToDelete -= 1) {
if (rows[rowToDelete]) {
// eslint-disable-next-line no-await-in-loop
await rows[rowToDelete].delete()
}
}
return true
} }
export async function set<Element extends ElementWithId>( export async function set<Element extends ElementWithId>(
@ -105,25 +117,27 @@ export async function set<Element extends ElementWithId>(
if (!element) { if (!element) {
return undefined return undefined
} }
const sheet = await getGSheet(sheetName) return addDBOperation(async () => {
const sheet = await getGSheet(sheetName)
// Load sheet into an array of objects // Load sheet into an array of objects
const rows = await sheet.getRows() const rows = await sheet.getRows()
if (!rows[0]) { if (!rows[0]) {
throw new Error(`No column types defined in sheet ${sheetName}`) throw new Error(`No column types defined in sheet ${sheetName}`)
} }
const types = _.pick(rows[0], Object.keys(element || {})) as Record<keyof Element, string> const types = _.pick(rows[0], Object.keys(element || {})) as Record<keyof Element, string>
rows.shift() rows.shift()
// Replace previous row // Replace previous row
const stringifiedRow = stringifyElement(element, types) const stringifiedRow = stringifyElement(element, types)
const row = rows.find((rowItem) => +rowItem.id === element.id) const row = rows.find((rowItem) => +rowItem.id === element.id)
if (!row) { if (!row) {
return undefined return undefined
} }
Object.assign(row, stringifiedRow) Object.assign(row, stringifiedRow)
await row.save() await row.save()
return element return element
})
} }
// eslint-disable-next-line @typescript-eslint/ban-types // eslint-disable-next-line @typescript-eslint/ban-types
@ -134,31 +148,33 @@ export async function add<ElementNoId extends object, Element extends ElementNoI
if (!partialElement) { if (!partialElement) {
return undefined return undefined
} }
const sheet = await getGSheet(sheetName) return addDBOperation(async () => {
const sheet = await getGSheet(sheetName)
// Load sheet into an array of objects // Load sheet into an array of objects
const rows = await sheet.getRows() const rows = await sheet.getRows()
if (!rows[0]) { if (!rows[0]) {
throw new Error(`No column types defined in sheet ${sheetName}`) throw new Error(`No column types defined in sheet ${sheetName}`)
} }
const types = { const types = {
id: "number", id: "number",
...(_.pick(rows[0], Object.keys(partialElement || {})) as Record< ...(_.pick(rows[0], Object.keys(partialElement || {})) as Record<
keyof ElementNoId, keyof ElementNoId,
string string
>), >),
} }
// Create full element // Create full element
rows.shift() rows.shift()
const highestId = rows.reduce((id: number, row) => Math.max(id, +row.id || 0), 0) const highestId = rows.reduce((id: number, row) => Math.max(id, +row.id || 0), 0)
const element = { id: highestId + 1, ...partialElement } as Element const element = { id: highestId + 1, ...partialElement } as Element
// Add element // Add element
const stringifiedRow = stringifyElement(element, types) const stringifiedRow = stringifyElement(element, types)
await sheet.addRow(stringifiedRow) await sheet.addRow(stringifiedRow)
return element return element
})
} }
async function getGSheet(sheetName: string): Promise<GoogleSpreadsheetWorksheet> { async function getGSheet(sheetName: string): Promise<GoogleSpreadsheetWorksheet> {

30
src/gsheets/sequentialDBOperations.ts Normal file
View File

@ -0,0 +1,30 @@
export default function sequentialDBOperations<OperationReturn>(): any {
interface Operation {
task: () => Promise<OperationReturn>
resolve: (value: OperationReturn) => void
reject: (reason: unknown) => void
}
const operations: Operation[] = []
async function addDBOperation(task: () => Promise<OperationReturn>) {
return new Promise(
(resolve: (value: OperationReturn) => void, reject: (reason: unknown) => void) => {
operations.push({ task, resolve, reject })
if (operations.length === 1) {
task().then(resolve).catch(reject).finally(runNextDBOperation)
}
}
)
}
function runNextDBOperation(): void {
operations.shift()
if (operations[0]) {
const { task, resolve, reject } = operations[0]
task().then(resolve).catch(reject).finally(runNextDBOperation)
}
}
return addDBOperation
}