mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-16 03:38:45 +00:00
Search and or and not
This commit is contained in:
@@ -45,7 +45,12 @@ const VaultPage = (props)=>{
|
|||||||
const v3Ref = useRef(null);
|
const v3Ref = useRef(null);
|
||||||
const legacyRef = useRef(null);
|
const legacyRef = useRef(null);
|
||||||
const submitButtonRef = useRef(null);
|
const submitButtonRef = useRef(null);
|
||||||
const [tagsList, setTagList] = useState(props.query.tags.split(',') || []);
|
|
||||||
|
const parseTags = (value)=>value?.split(',').filter(Boolean) || [];
|
||||||
|
|
||||||
|
const [tagsListAnd, setTagListAnd] = useState(parseTags(props.query.tagsAnd));
|
||||||
|
const [tagsListOr, setTagListOr] = useState(parseTags(props.query.tagsOr));
|
||||||
|
const [tagsListNot, setTagListNot] = useState(parseTags(props.query.tagsNot));
|
||||||
|
|
||||||
useEffect(()=>{
|
useEffect(()=>{
|
||||||
disableSubmitIfFormInvalid();
|
disableSubmitIfFormInvalid();
|
||||||
@@ -65,54 +70,88 @@ const VaultPage = (props)=>{
|
|||||||
setSearching(false);
|
setSearching(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateUrl = (titleValue, authorValue, countValue, v3Value, legacyValue, tagsValue, page, sort, dir)=>{
|
|
||||||
|
const buildQueryParams = (entries)=>{
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
|
||||||
|
entries.forEach(([key, value])=>{
|
||||||
|
if(value === undefined || value === null || value === '') return;
|
||||||
|
if(Array.isArray(value) && value.length === 0) return;
|
||||||
|
|
||||||
|
params.set(key, Array.isArray(value) ? value.join(',') : value);
|
||||||
|
});
|
||||||
|
|
||||||
|
return params.toString();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const updateUrl = (params)=>{
|
||||||
const url = new URL(window.location.href);
|
const url = new URL(window.location.href);
|
||||||
const urlParams = new URLSearchParams(url.search);
|
|
||||||
|
|
||||||
urlParams.set('title', titleValue);
|
url.search = params;
|
||||||
urlParams.set('author', authorValue);
|
|
||||||
urlParams.set('count', countValue);
|
|
||||||
urlParams.set('v3', v3Value);
|
|
||||||
urlParams.set('legacy', legacyValue);
|
|
||||||
urlParams.set('tags', tagsValue);
|
|
||||||
urlParams.set('page', page);
|
|
||||||
urlParams.set('sort', sort);
|
|
||||||
urlParams.set('dir', dir);
|
|
||||||
|
|
||||||
|
|
||||||
console.log(urlParams.toString());
|
|
||||||
url.search = urlParams.toString();
|
|
||||||
window.history.replaceState(null, '', url.toString());
|
window.history.replaceState(null, '', url.toString());
|
||||||
};
|
};
|
||||||
|
|
||||||
const performSearch = async (title, author, count, v3, legacy, tags, page, sort, dir)=>{
|
|
||||||
updateUrl(title, author, count, v3, legacy, tags, page, sort, dir);
|
|
||||||
|
|
||||||
const response = await request
|
const performSearch = async (formContents, page, sort, dir)=>{
|
||||||
.get(`/api/vault?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&tags=${tags}&count=${count}&page=${page}&sort=${sort}&dir=${dir}`)
|
const { title, author, count, v3, legacy, tagsAnd, tagsOr, tagsNot } = formContents;
|
||||||
.catch((error)=>{
|
|
||||||
console.log('error at loadPage: ', error);
|
|
||||||
setError(error);
|
|
||||||
updateStateWithBrews([], 1);
|
|
||||||
});
|
|
||||||
|
|
||||||
if(response?.ok)
|
|
||||||
|
const params = buildQueryParams([
|
||||||
|
['title', title],
|
||||||
|
['author', author],
|
||||||
|
['v3', v3],
|
||||||
|
['legacy', legacy],
|
||||||
|
['tagsAnd', tagsAnd],
|
||||||
|
['tagsOr', tagsOr],
|
||||||
|
['tagsNot', tagsNot],
|
||||||
|
['count', count],
|
||||||
|
['page', page],
|
||||||
|
['sort', sort],
|
||||||
|
['dir', dir]
|
||||||
|
]);
|
||||||
|
|
||||||
|
updateUrl(params);
|
||||||
|
|
||||||
|
const response = await request.get(`/api/vault?${params}`)
|
||||||
|
.catch((error)=>{
|
||||||
|
console.log('error at loadPage: ', error);
|
||||||
|
setError(error);
|
||||||
|
updateStateWithBrews([], 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
if(response?.ok) {
|
||||||
updateStateWithBrews(response.body.brews, page);
|
updateStateWithBrews(response.body.brews, page);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadTotal = async (title, author, v3, legacy, tags)=>{
|
const loadTotal = async (formContents)=>{
|
||||||
|
const { title, author, count, v3, legacy, tagsAnd, tagsOr, tagsNot } = formContents;
|
||||||
|
|
||||||
setTotalBrews(null);
|
setTotalBrews(null);
|
||||||
|
|
||||||
const response = await request.get(`/api/vault/total?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&tags=${tags}`)
|
const params = buildQueryParams([
|
||||||
.catch((error)=>{
|
['title', title],
|
||||||
console.log('error at loadTotal: ');
|
['author', author],
|
||||||
console.error(error);
|
['v3', v3],
|
||||||
setError(error);
|
['legacy', legacy],
|
||||||
updateStateWithBrews([], 1);
|
['tagsAnd', tagsAnd],
|
||||||
});
|
['tagsOr', tagsOr],
|
||||||
|
['tagsNot', tagsNot]
|
||||||
|
]);
|
||||||
|
|
||||||
if(response.ok)
|
const response = await request.get(`/api/vault/total?${params}`)
|
||||||
|
.catch((error)=>{
|
||||||
|
console.log('error at loadTotal: ');
|
||||||
|
console.error(error);
|
||||||
|
setError(error);
|
||||||
|
updateStateWithBrews([], 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
if(response?.ok) {
|
||||||
setTotalBrews(response.body.totalBrews);
|
setTotalBrews(response.body.totalBrews);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const loadPage = async (page, updateTotal, sort, dir)=>{
|
const loadPage = async (page, updateTotal, sort, dir)=>{
|
||||||
@@ -126,7 +165,14 @@ const VaultPage = (props)=>{
|
|||||||
const count = countRef.current.value || 20;
|
const count = countRef.current.value || 20;
|
||||||
const v3 = v3Ref.current.checked != false;
|
const v3 = v3Ref.current.checked != false;
|
||||||
const legacy = legacyRef.current.checked != false;
|
const legacy = legacyRef.current.checked != false;
|
||||||
const tags = tagsList;
|
const tagsAnd = tagsListAnd;
|
||||||
|
const tagsOr = tagsListOr;
|
||||||
|
const tagsNot = tagsListNot;
|
||||||
|
|
||||||
|
const formContents = {
|
||||||
|
title, author, count, v3, legacy, tagsAnd, tagsOr, tagsNot
|
||||||
|
};
|
||||||
|
|
||||||
const sortOption = sort || 'title';
|
const sortOption = sort || 'title';
|
||||||
const dirOption = dir || 'asc';
|
const dirOption = dir || 'asc';
|
||||||
const pageProp = page || 1;
|
const pageProp = page || 1;
|
||||||
@@ -134,10 +180,10 @@ const VaultPage = (props)=>{
|
|||||||
setSort(sortOption);
|
setSort(sortOption);
|
||||||
setdir(dirOption);
|
setdir(dirOption);
|
||||||
|
|
||||||
performSearch(title, author, count, v3, legacy, tags, pageProp, sortOption, dirOption);
|
performSearch(formContents, pageProp, sortOption, dirOption);
|
||||||
|
|
||||||
if(updateTotal)
|
if(updateTotal)
|
||||||
loadTotal(title, author, v3, legacy, tags);
|
loadTotal(formContents);
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderNavItems = ()=>(
|
const renderNavItems = ()=>(
|
||||||
@@ -161,8 +207,9 @@ const VaultPage = (props)=>{
|
|||||||
const isTitleValid = titleRef.current.validity.valid && titleRef.current.value;
|
const isTitleValid = titleRef.current.validity.valid && titleRef.current.value;
|
||||||
const isAuthorValid = authorRef.current.validity.valid && authorRef.current.value;
|
const isAuthorValid = authorRef.current.validity.valid && authorRef.current.value;
|
||||||
const isCheckboxChecked = legacyRef.current.checked || v3Ref.current.checked;
|
const isCheckboxChecked = legacyRef.current.checked || v3Ref.current.checked;
|
||||||
|
const isTagsValid = tagsListAnd.length >= 1 || tagsListOr.length >= 1;
|
||||||
|
|
||||||
const isFormValid = (isTitleValid || isAuthorValid) && isCheckboxChecked;
|
const isFormValid = (isTitleValid || isAuthorValid || isTagsValid) && isCheckboxChecked;
|
||||||
|
|
||||||
return isFormValid;
|
return isFormValid;
|
||||||
};
|
};
|
||||||
@@ -173,7 +220,7 @@ const VaultPage = (props)=>{
|
|||||||
|
|
||||||
const renderForm = ()=>(
|
const renderForm = ()=>(
|
||||||
<div className='brewLookup'>
|
<div className='brewLookup'>
|
||||||
<h2 className='formTitle'>Brew Lookup</h2>
|
<h1 className='formTitle'>Brew Lookup</h1>
|
||||||
<div className='formContents'>
|
<div className='formContents'>
|
||||||
<label>
|
<label>
|
||||||
Title of the brew
|
Title of the brew
|
||||||
@@ -210,19 +257,50 @@ const VaultPage = (props)=>{
|
|||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<h3>Tag Search</h3>
|
||||||
Tags
|
<fieldset className='tags'>
|
||||||
<TagInput
|
<label>
|
||||||
id='combobox-tags'
|
Must include
|
||||||
label='tags'
|
<TagInput
|
||||||
valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
|
id='combobox-tags-and'
|
||||||
placeholder='add tag'
|
label='tags'
|
||||||
unique={true}
|
valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
|
||||||
values={tagsList}
|
placeholder='add tag'
|
||||||
onChange={(e)=>setTagList(e.target.value)}
|
unique={true}
|
||||||
tooltip='You may start tags with "type", "system", "group" or "meta" followed by a colon ":", these will be colored in your userpage.'
|
values={tagsListAnd}
|
||||||
/>
|
onChange={(e)=>setTagListAnd(e.target.value)}
|
||||||
</label>
|
tooltip='You may start tags with "type", "system", "group" or "meta" followed by a colon ":", these will be colored in your userpage.'
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
Match any
|
||||||
|
<TagInput
|
||||||
|
id='combobox-tags-or'
|
||||||
|
label='tags'
|
||||||
|
valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
|
||||||
|
placeholder='add tag'
|
||||||
|
unique={true}
|
||||||
|
values={tagsListOr}
|
||||||
|
onChange={(e)=>setTagListOr(e.target.value)}
|
||||||
|
tooltip='You may start tags with "type", "system", "group" or "meta" followed by a colon ":", these will be colored in your userpage.'
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
Must exclude
|
||||||
|
<TagInput
|
||||||
|
id='combobox-tags-not'
|
||||||
|
label='tags'
|
||||||
|
valuePatterns={/^\s*(?:(?:group|meta|system|type)\s*:\s*)?[A-Za-z0-9][A-Za-z0-9 \/\\.&_\-]{0,40}\s*$/}
|
||||||
|
placeholder='add tag'
|
||||||
|
unique={true}
|
||||||
|
values={tagsListNot}
|
||||||
|
onChange={(e)=>setTagListNot(e.target.value)}
|
||||||
|
tooltip='You may start tags with "type", "system", "group" or "meta" followed by a colon ":", these will be colored in your userpage.'
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
Results per page
|
Results per page
|
||||||
@@ -270,7 +348,7 @@ const VaultPage = (props)=>{
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<legend>
|
<legend>
|
||||||
<h3>Tips and tricks</h3>
|
<h2>Tips and tricks</h2>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
Only <b>published</b> brews are searchable via this tool
|
Only <b>published</b> brews are searchable via this tool
|
||||||
@@ -332,8 +410,8 @@ const VaultPage = (props)=>{
|
|||||||
<div className='radio-toggle layout-container'>
|
<div className='radio-toggle layout-container'>
|
||||||
<h6>View:</h6>
|
<h6>View:</h6>
|
||||||
<label className='option' title='grid'>
|
<label className='option' title='grid'>
|
||||||
<input name='layout-mode' type='radio' onChange={(e)=>handleLayoutChange(e, 'grid')} checked={layoutMode === 'grid'} />
|
<input name='layout-mode' type='radio' onChange={(e)=>handleLayoutChange(e, 'grid')} checked={layoutMode === 'grid'} />
|
||||||
<i className='fac compressed-grid'></i>
|
<i className='fac compressed-grid'></i>
|
||||||
</label>
|
</label>
|
||||||
<label className='option' title='list'>
|
<label className='option' title='list'>
|
||||||
<input name='layout-mode' type='radio' onChange={(e)=>handleLayoutChange(e, 'list')} checked={layoutMode === 'list'} />
|
<input name='layout-mode' type='radio' onChange={(e)=>handleLayoutChange(e, 'list')} checked={layoutMode === 'list'} />
|
||||||
@@ -354,31 +432,31 @@ const VaultPage = (props)=>{
|
|||||||
|
|
||||||
const renderThemePicker = ()=>{
|
const renderThemePicker = ()=>{
|
||||||
return (
|
return (
|
||||||
<div className="radio-toggle theme-container">
|
<div className='radio-toggle theme-container'>
|
||||||
<h6>Theme:</h6>
|
<h6>Theme:</h6>
|
||||||
<label className="option">
|
<label className='option'>
|
||||||
<input type="radio" name="theme" onChange={(e)=>handleThemeChange(e, 'light')} checked={themeMode === 'light'}/>
|
<input type='radio' name='theme' onChange={(e)=>handleThemeChange(e, 'light')} checked={themeMode === 'light'}/>
|
||||||
<i className="fas fa-sun"/>
|
<i className='fas fa-sun'/>
|
||||||
</label>
|
</label>
|
||||||
<label className="option">
|
<label className='option'>
|
||||||
<input type="radio" name="theme" onChange={(e)=>handleThemeChange(e, 'dark')} checked={themeMode === 'dark'}/>
|
<input type='radio' name='theme' onChange={(e)=>handleThemeChange(e, 'dark')} checked={themeMode === 'dark'}/>
|
||||||
<i className="fas fa-moon"/>
|
<i className='fas fa-moon'/>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
)
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const renderNav = () =>{
|
const renderNav = ()=>{
|
||||||
return (
|
return (
|
||||||
<div className="listPageNav">
|
<div className='listPageNav'>
|
||||||
{renderLayoutModeOptions()}
|
{renderLayoutModeOptions()}
|
||||||
{renderThemePicker()}
|
{renderThemePicker()}
|
||||||
{renderSortOptions()}
|
{renderSortOptions()}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
};
|
||||||
|
|
||||||
const renderPaginationControls = ()=>{
|
const renderPaginationControls = ()=>{
|
||||||
if(!totalBrews || totalBrews < 10) return null;
|
if(!totalBrews || totalBrews < 10) return null;
|
||||||
@@ -460,19 +538,19 @@ const VaultPage = (props)=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(error) {
|
if(error) {
|
||||||
if(error.HBErrorCode === undefined) {
|
if(error.HBErrorCode === undefined) {
|
||||||
return (
|
return (
|
||||||
<div className='foundBrews noBrews'>
|
<div className='foundBrews noBrews'>
|
||||||
<h3>Error: Unknown error</h3>
|
<h3>Error: Unknown error</h3>
|
||||||
</div>
|
</div>
|
||||||
)
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
const errorText = ErrorIndex()[error.HBErrorCode.toString()] || '';
|
const errorText = ErrorIndex()[error.HBErrorCode.toString()] || '';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='foundBrews noBrews'>
|
<div className='foundBrews noBrews'>
|
||||||
<h3>Error: {errorText}</h3>
|
<h3>Error: {errorText}</h3>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -496,7 +574,7 @@ const VaultPage = (props)=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`foundBrews ${themeMode + 'Mode'}`}>
|
<div className={`foundBrews ${`${themeMode}Mode`}`}>
|
||||||
<span className='totalBrews'>
|
<span className='totalBrews'>
|
||||||
{`Brews found: `}
|
{`Brews found: `}
|
||||||
<span>{totalBrews}</span>
|
<span>{totalBrews}</span>
|
||||||
|
|||||||
@@ -53,14 +53,31 @@
|
|||||||
letter-spacing : 2px;
|
letter-spacing : 2px;
|
||||||
color : var(--h1-clr);
|
color : var(--h1-clr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin : 20px 0;
|
||||||
|
font-size : 30px;
|
||||||
|
text-align : center;
|
||||||
|
border-bottom : 3px solid;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
margin-block : 30px 20px;
|
||||||
|
font-size : 18px;
|
||||||
|
text-align : center;
|
||||||
|
border-bottom : 2px solid;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
margin-block: 20px 5px;
|
||||||
|
border-bottom:1px solid;
|
||||||
|
}
|
||||||
|
|
||||||
|
fieldset {
|
||||||
|
padding-left:5px;
|
||||||
|
}
|
||||||
|
|
||||||
legend {
|
legend {
|
||||||
h3 {
|
|
||||||
margin-block : 30px 20px;
|
|
||||||
font-size : 20px;
|
|
||||||
text-align : center;
|
|
||||||
border-bottom : 2px solid;
|
|
||||||
}
|
|
||||||
ul {
|
ul {
|
||||||
padding-inline : 30px 10px;
|
padding-inline : 30px 10px;
|
||||||
li {
|
li {
|
||||||
@@ -88,14 +105,6 @@
|
|||||||
}
|
}
|
||||||
&:not(:has(input[type='checkbox']:checked))::after { opacity : 1; }
|
&:not(:has(input[type='checkbox']:checked))::after { opacity : 1; }
|
||||||
|
|
||||||
.formTitle {
|
|
||||||
margin : 20px 0;
|
|
||||||
font-size : 30px;
|
|
||||||
color : black;
|
|
||||||
text-align : center;
|
|
||||||
border-bottom : 2px solid;
|
|
||||||
}
|
|
||||||
|
|
||||||
.formContents {
|
.formContents {
|
||||||
position : relative;
|
position : relative;
|
||||||
display : flex;
|
display : flex;
|
||||||
@@ -127,12 +136,12 @@
|
|||||||
display: grid;
|
display: grid;
|
||||||
|
|
||||||
.tagInput-dropdown {
|
.tagInput-dropdown {
|
||||||
z-index: 400;
|
z-index: unset;
|
||||||
max-width: 200px;
|
max-width: 200px;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.list {
|
.list {
|
||||||
display : flex;
|
display : flex;
|
||||||
flex : 1 0;
|
flex : 1 0;
|
||||||
flex-wrap : wrap;
|
flex-wrap : wrap;
|
||||||
|
|||||||
+32
-10
@@ -29,14 +29,30 @@ const rendererConditions = (legacy, v3)=>{
|
|||||||
return {}; // If all renderers selected, renderer field not needed in query for speed
|
return {}; // If all renderers selected, renderer field not needed in query for speed
|
||||||
};
|
};
|
||||||
|
|
||||||
const tagConditions = (tags) => {
|
const tagConditions = (tagsAnd, tagsOr, tagsNot) => {
|
||||||
if (!tags || tags.length === 0) return {};
|
const conditions = {};
|
||||||
|
|
||||||
return {
|
console.log(tagsAnd.length, tagsOr.length, tagsNot.length);
|
||||||
$or: tags.map(tag => ({
|
|
||||||
|
if (tagsAnd.length > 0) {
|
||||||
|
conditions.$and = tagsAnd.map(tag => ({
|
||||||
tags: tag.trim()
|
tags: tag.trim()
|
||||||
}))
|
}));
|
||||||
};
|
}
|
||||||
|
|
||||||
|
if (tagsOr.length > 0) {
|
||||||
|
conditions.$or = tagsOr.map(tag => ({
|
||||||
|
tags: tag.trim()
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tagsNot.length > 0) {
|
||||||
|
conditions.$nor = tagsNot.map(tag => ({
|
||||||
|
tags: tag.trim()
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
return conditions;
|
||||||
};
|
};
|
||||||
|
|
||||||
const sortConditions = (sort, dir) => {
|
const sortConditions = (sort, dir) => {
|
||||||
@@ -51,16 +67,20 @@ const findBrews = async (req, res)=>{
|
|||||||
const page = Math.max(parseInt(req.query.page) || 1, 1);
|
const page = Math.max(parseInt(req.query.page) || 1, 1);
|
||||||
const count = Math.max(parseInt(req.query.count) || 20, 10);
|
const count = Math.max(parseInt(req.query.count) || 20, 10);
|
||||||
const skip = (page - 1) * count;
|
const skip = (page - 1) * count;
|
||||||
const tags = req.query.tags.split(',') || [];
|
const tagsAnd = req.query.tagsAnd?.split(',') || [];
|
||||||
|
const tagsOr = req.query.tagsOr?.split(',') || [];
|
||||||
|
const tagsNot = req.query.tagsNot?.split(',') || [];
|
||||||
const sort = req.query.sort || 'title';
|
const sort = req.query.sort || 'title';
|
||||||
const dir = req.query.dir || 'asc';
|
const dir = req.query.dir || 'asc';
|
||||||
|
|
||||||
|
console.log(`Title: ${title}, Author: ${author}, page: ${page}, count: ${count}, tagsAnd: ${tagsAnd}, tagsOr: ${tagsOr} tagsNot: ${tagsNot}`);
|
||||||
|
|
||||||
const combinedQuery = {
|
const combinedQuery = {
|
||||||
$and : [
|
$and : [
|
||||||
{ published: true },
|
{ published: true },
|
||||||
rendererConditions(req.query.legacy, req.query.v3),
|
rendererConditions(req.query.legacy, req.query.v3),
|
||||||
titleConditions(title),
|
titleConditions(title),
|
||||||
tagConditions(tags),
|
tagConditions(tagsAnd, tagsOr, tagsNot),
|
||||||
authorConditions(author)
|
authorConditions(author)
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
@@ -97,7 +117,9 @@ const findBrews = async (req, res)=>{
|
|||||||
const findTotal = async (req, res)=>{
|
const findTotal = async (req, res)=>{
|
||||||
const title = req.query.title || '';
|
const title = req.query.title || '';
|
||||||
const author = req.query.author || '';
|
const author = req.query.author || '';
|
||||||
const tags = req.query.tags.split(',') || [];
|
const tagsAnd = req.query.tagsAnd?.split(',') || [];
|
||||||
|
const tagsOr = req.query.tagsOr?.split(',') || [];
|
||||||
|
const tagsNot = req.query.tagsNot?.split(',') || [];
|
||||||
|
|
||||||
const combinedQuery = {
|
const combinedQuery = {
|
||||||
$and : [
|
$and : [
|
||||||
@@ -105,7 +127,7 @@ const findTotal = async (req, res)=>{
|
|||||||
rendererConditions(req.query.legacy, req.query.v3),
|
rendererConditions(req.query.legacy, req.query.v3),
|
||||||
titleConditions(title),
|
titleConditions(title),
|
||||||
authorConditions(author),
|
authorConditions(author),
|
||||||
tagConditions(tags)
|
tagConditions(tagsAnd, tagsOr, tagsNot)
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user